From e1536bc28dd8e097fbadfe454683877f4967d93c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Thu, 17 May 2018 16:49:13 +0200 Subject: [PATCH 1/9] Fix SES --- tests/test_ses.py | 21 +++++++++++++++++++++ troposphere/ses.py | 7 +++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 tests/test_ses.py diff --git a/tests/test_ses.py b/tests/test_ses.py new file mode 100644 index 000000000..4842c8b02 --- /dev/null +++ b/tests/test_ses.py @@ -0,0 +1,21 @@ +from troposphere import Template, Ref, ses +from troposphere.ses import ( + Template as Temp, + EmailTemplate, +) +t = Template() +t.add_transform('AWS::Serverless-2016-10-31') + + +t.add_resource(Temp( + 'TemplateName', + Template=EmailTemplate( + 'EmailTemplateTest', + HtmlPart="

Hej

", + SubjectPart='test', + TemplateName='test', + TextPart='hej', + ) +)) + +print(t.to_json()) diff --git a/troposphere/ses.py b/troposphere/ses.py index abcb72483..45fb4f341 100644 --- a/troposphere/ses.py +++ b/troposphere/ses.py @@ -173,18 +173,17 @@ class ReceiptRule(AWSObject): } -class Template(AWSProperty): +class EmailTemplate(AWSProperty): props = { 'HtmlPart': (basestring, False), 'SubjectPart': (basestring, False), 'TemplateName': (basestring, False), 'TextPart': (basestring, False), } - - + class Template(AWSObject): resource_type = "AWS::SES::Template" props = { - 'Template': (Template, False), + 'Template': (EmailTemplate, False), } From 9a77f86a68ea553592e169193ffaecf9960206fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Thu, 17 May 2018 16:59:23 +0200 Subject: [PATCH 2/9] remove test file --- tests/test_ses.py | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 tests/test_ses.py diff --git a/tests/test_ses.py b/tests/test_ses.py deleted file mode 100644 index 4842c8b02..000000000 --- a/tests/test_ses.py +++ /dev/null @@ -1,21 +0,0 @@ -from troposphere import Template, Ref, ses -from troposphere.ses import ( - Template as Temp, - EmailTemplate, -) -t = Template() -t.add_transform('AWS::Serverless-2016-10-31') - - -t.add_resource(Temp( - 'TemplateName', - Template=EmailTemplate( - 'EmailTemplateTest', - HtmlPart="

Hej

", - SubjectPart='test', - TemplateName='test', - TextPart='hej', - ) -)) - -print(t.to_json()) From d0d04fafdb927ae0a033ebf322eb9488137d7f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Thu, 17 May 2018 17:02:53 +0200 Subject: [PATCH 3/9] Whitespace fix --- troposphere/ses.py | 1 + 1 file changed, 1 insertion(+) diff --git a/troposphere/ses.py b/troposphere/ses.py index 45fb4f341..0ccce9723 100644 --- a/troposphere/ses.py +++ b/troposphere/ses.py @@ -180,6 +180,7 @@ class EmailTemplate(AWSProperty): 'TemplateName': (basestring, False), 'TextPart': (basestring, False), } + class Template(AWSObject): resource_type = "AWS::SES::Template" From d26656a5210d9e535834508f35f55c26458ea400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Thu, 17 May 2018 17:06:12 +0200 Subject: [PATCH 4/9] more linting error --- troposphere/ses.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/troposphere/ses.py b/troposphere/ses.py index 0ccce9723..745046fd9 100644 --- a/troposphere/ses.py +++ b/troposphere/ses.py @@ -180,8 +180,8 @@ class EmailTemplate(AWSProperty): 'TemplateName': (basestring, False), 'TextPart': (basestring, False), } - - + + class Template(AWSObject): resource_type = "AWS::SES::Template" From 4a0296def21289a367a5b23d453a2368fbd2b9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Wed, 24 Jul 2019 15:43:15 +0200 Subject: [PATCH 5/9] updated ask.py to the latest AWS documentation --- troposphere/ask.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/troposphere/ask.py b/troposphere/ask.py index 63e512943..41f039d6f 100644 --- a/troposphere/ask.py +++ b/troposphere/ask.py @@ -6,21 +6,27 @@ from . import AWSObject, AWSProperty from .validators import json_checker - -class AuthenticationConfiguration(AWSProperty): +class Overides(AWSProperty): props = { - 'DefaultAttributes': (json_checker, False), - 'DeviceTemplates': (json_checker, False), + 'Manifest': (json_checker, False), } - -class SkillPackage(AWSProperty): +class AuthenticationConfiguration(AWSProperty): props = { 'ClientId': (basestring, True), 'ClientSecret': (basestring, True), 'RefreshToken': (basestring, True), } +class SkillPackage(AWSProperty): + props = { + 'Overides': (Overides, False), + 'S3Bucket': (basestring, True), + 'S3BucketRole': (basestring, False), + 'S3Key': (basestring, True), + 'S3ObjectVersion': (basestring, False), + } + class Skill(AWSObject): resource_type = "Alexa::ASK::Skill" From 485aa4beb291cd90c7fbf0255dca97c0e51532c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Wed, 24 Jul 2019 15:55:35 +0200 Subject: [PATCH 6/9] lint --- troposphere/ask.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/troposphere/ask.py b/troposphere/ask.py index 41f039d6f..eeb9cdee9 100644 --- a/troposphere/ask.py +++ b/troposphere/ask.py @@ -11,6 +11,7 @@ class Overides(AWSProperty): 'Manifest': (json_checker, False), } + class AuthenticationConfiguration(AWSProperty): props = { 'ClientId': (basestring, True), @@ -18,6 +19,7 @@ class AuthenticationConfiguration(AWSProperty): 'RefreshToken': (basestring, True), } + class SkillPackage(AWSProperty): props = { 'Overides': (Overides, False), From 8745b098540e0b71868888df15e4cdfc2fb728f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Wed, 24 Jul 2019 15:59:33 +0200 Subject: [PATCH 7/9] lint again --- troposphere/ask.py | 1 + 1 file changed, 1 insertion(+) diff --git a/troposphere/ask.py b/troposphere/ask.py index eeb9cdee9..8ea421cca 100644 --- a/troposphere/ask.py +++ b/troposphere/ask.py @@ -6,6 +6,7 @@ from . import AWSObject, AWSProperty from .validators import json_checker + class Overides(AWSProperty): props = { 'Manifest': (json_checker, False), From 78128094f24c6e805289b5a81bc80524f12286c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Dahlstr=C3=B6m?= Date: Fri, 26 Jul 2019 15:59:38 +0200 Subject: [PATCH 8/9] typo --- troposphere/ask.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/troposphere/ask.py b/troposphere/ask.py index 8ea421cca..0677d6310 100644 --- a/troposphere/ask.py +++ b/troposphere/ask.py @@ -7,9 +7,9 @@ from .validators import json_checker -class Overides(AWSProperty): +class Overrides(AWSProperty): props = { - 'Manifest': (json_checker, False), + 'Manifest': (dict, False), } @@ -23,7 +23,7 @@ class AuthenticationConfiguration(AWSProperty): class SkillPackage(AWSProperty): props = { - 'Overides': (Overides, False), + 'Overrides': (Overrides, False), 'S3Bucket': (basestring, True), 'S3BucketRole': (basestring, False), 'S3Key': (basestring, True), From deacf87ac179ee32bff5f07ee969d9c3dfebf10d Mon Sep 17 00:00:00 2001 From: Mark Peek Date: Fri, 26 Jul 2019 13:11:12 -0700 Subject: [PATCH 9/9] Remove unneeded import --- troposphere/ask.py | 1 - 1 file changed, 1 deletion(-) diff --git a/troposphere/ask.py b/troposphere/ask.py index 0677d6310..a40f65748 100644 --- a/troposphere/ask.py +++ b/troposphere/ask.py @@ -4,7 +4,6 @@ # See LICENSE file for full license. from . import AWSObject, AWSProperty -from .validators import json_checker class Overrides(AWSProperty):