From 17fb631f017d2cae997a3d92b8b27a267268fa8b Mon Sep 17 00:00:00 2001 From: William Merz Date: Sun, 10 Feb 2019 18:57:01 -0800 Subject: [PATCH 1/4] add ReservedConcurrentExecutions to supported global properties list --- samtranslator/plugins/globals/globals.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samtranslator/plugins/globals/globals.py b/samtranslator/plugins/globals/globals.py index b4cab7d7ed..e14154ca0e 100644 --- a/samtranslator/plugins/globals/globals.py +++ b/samtranslator/plugins/globals/globals.py @@ -30,7 +30,8 @@ class Globals(object): "AutoPublishAlias", "Layers", "DeploymentPreference", - "PermissionsBoundary" + "PermissionsBoundary", + "ReservedConcurrentExecutions" ], # Everything except From ba854ce961b30eafbb4f2c4870e14e43f4438266 Mon Sep 17 00:00:00 2001 From: William Merz Date: Sun, 10 Feb 2019 18:59:25 -0800 Subject: [PATCH 2/4] add ReservedConcurrentExecutions to Globals support doc --- docs/globals.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/globals.rst b/docs/globals.rst index 05f473be99..b4d12d1930 100644 --- a/docs/globals.rst +++ b/docs/globals.rst @@ -68,6 +68,7 @@ Currently, the following resources and properties are being supported: AutoPublishAlias: DeploymentPreference: PermissionsBoundary: + ReservedConcurrentExecutions: Api: # Properties of AWS::Serverless::Api From 97027039280172399d5e4175d415a5f3079b53e3 Mon Sep 17 00:00:00 2001 From: William Merz Date: Sun, 10 Feb 2019 20:07:16 -0800 Subject: [PATCH 3/4] append ReservedConcurrentExecutions to test output --- .../translator/output/error_globals_unsupported_property.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/translator/output/error_globals_unsupported_property.json b/tests/translator/output/error_globals_unsupported_property.json index 4805f3f4ee..c814d640a1 100644 --- a/tests/translator/output/error_globals_unsupported_property.json +++ b/tests/translator/output/error_globals_unsupported_property.json @@ -1,8 +1,8 @@ { "errors": [ { - "errorMessage": "'Globals' section is invalid. 'SomeKey' is not a supported property of 'Function'. Must be one of the following values - ['Handler', 'Runtime', 'CodeUri', 'DeadLetterQueue', 'Description', 'MemorySize', 'Timeout', 'VpcConfig', 'Environment', 'Tags', 'Tracing', 'KmsKeyArn', 'AutoPublishAlias', 'Layers', 'DeploymentPreference', 'PermissionsBoundary']" + "errorMessage": "'Globals' section is invalid. 'SomeKey' is not a supported property of 'Function'. Must be one of the following values - ['Handler', 'Runtime', 'CodeUri', 'DeadLetterQueue', 'Description', 'MemorySize', 'Timeout', 'VpcConfig', 'Environment', 'Tags', 'Tracing', 'KmsKeyArn', 'AutoPublishAlias', 'Layers', 'DeploymentPreference', 'PermissionsBoundary', 'ReservedConcurrentExecutions']" } ], - "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. 'Globals' section is invalid. 'SomeKey' is not a supported property of 'Function'. Must be one of the following values - ['Handler', 'Runtime', 'CodeUri', 'DeadLetterQueue', 'Description', 'MemorySize', 'Timeout', 'VpcConfig', 'Environment', 'Tags', 'Tracing', 'KmsKeyArn', 'AutoPublishAlias', 'Layers', 'DeploymentPreference', 'PermissionsBoundary']" + "errorMessage": "Invalid Serverless Application Specification document. Number of errors found: 1. 'Globals' section is invalid. 'SomeKey' is not a supported property of 'Function'. Must be one of the following values - ['Handler', 'Runtime', 'CodeUri', 'DeadLetterQueue', 'Description', 'MemorySize', 'Timeout', 'VpcConfig', 'Environment', 'Tags', 'Tracing', 'KmsKeyArn', 'AutoPublishAlias', 'Layers', 'DeploymentPreference', 'PermissionsBoundary', 'ReservedConcurrentExecutions']" } From d54e649a962136ccfe183f67fa4c12cd6cef0fe1 Mon Sep 17 00:00:00 2001 From: William Merz Date: Wed, 6 Mar 2019 22:24:33 -0800 Subject: [PATCH 4/4] modify the globals_for_functions unittests --- tests/translator/input/globals_for_function.yaml | 2 ++ tests/translator/output/aws-cn/globals_for_function.json | 2 ++ tests/translator/output/aws-us-gov/globals_for_function.json | 2 ++ tests/translator/output/globals_for_function.json | 2 ++ 4 files changed, 8 insertions(+) diff --git a/tests/translator/input/globals_for_function.yaml b/tests/translator/input/globals_for_function.yaml index 97fd5ae30c..1490bf2459 100644 --- a/tests/translator/input/globals_for_function.yaml +++ b/tests/translator/input/globals_for_function.yaml @@ -19,6 +19,7 @@ Globals: PermissionsBoundary: arn:aws:1234:iam:boundary/CustomerCreatedPermissionsBoundary Layers: - !Sub arn:${AWS:Partition}:lambda:${AWS:Region}:${AWS:AccountId}:layer:MyLayer:1 + ReservedConcurrentExecutions: 50 Resources: MinimalFunction: @@ -45,4 +46,5 @@ Resources: PermissionsBoundary: arn:aws:1234:iam:boundary/OverridePermissionsBoundary Layers: - !Sub arn:${AWS:Partition}:lambda:${AWS:Region}:${AWS:AccountId}:layer:MyLayer2:2 + ReservedConcurrentExecutions: 100 diff --git a/tests/translator/output/aws-cn/globals_for_function.json b/tests/translator/output/aws-cn/globals_for_function.json index e2115176f0..a84c1d288d 100644 --- a/tests/translator/output/aws-cn/globals_for_function.json +++ b/tests/translator/output/aws-cn/globals_for_function.json @@ -57,6 +57,7 @@ } ], "MemorySize": 512, + "ReservedConcurrentExecutions": 100, "Environment": { "Variables": { "Var1": "value1", @@ -146,6 +147,7 @@ } ], "MemorySize": 1024, + "ReservedConcurrentExecutions": 50, "Environment": { "Variables": { "Var1": "value1", diff --git a/tests/translator/output/aws-us-gov/globals_for_function.json b/tests/translator/output/aws-us-gov/globals_for_function.json index d001267095..bd87cc916a 100644 --- a/tests/translator/output/aws-us-gov/globals_for_function.json +++ b/tests/translator/output/aws-us-gov/globals_for_function.json @@ -57,6 +57,7 @@ } ], "MemorySize": 512, + "ReservedConcurrentExecutions": 100, "Environment": { "Variables": { "Var1": "value1", @@ -146,6 +147,7 @@ } ], "MemorySize": 1024, + "ReservedConcurrentExecutions": 50, "Environment": { "Variables": { "Var1": "value1", diff --git a/tests/translator/output/globals_for_function.json b/tests/translator/output/globals_for_function.json index 3006cce738..6d0e589313 100644 --- a/tests/translator/output/globals_for_function.json +++ b/tests/translator/output/globals_for_function.json @@ -57,6 +57,7 @@ } ], "MemorySize": 512, + "ReservedConcurrentExecutions": 100, "Environment": { "Variables": { "Var1": "value1", @@ -146,6 +147,7 @@ } ], "MemorySize": 1024, + "ReservedConcurrentExecutions": 50, "Environment": { "Variables": { "Var1": "value1",