Skip to content

Feat/func/add ReservedConcurrentExecutions to globals #808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlhood merged 4 commits into from
Mar 22, 2019
Merged

Feat/func/add ReservedConcurrentExecutions to globals #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17fb631
add ReservedConcurrentExecutions to supported global properties list
merzwilliam Feb 11, 2019
ba854ce
add ReservedConcurrentExecutions to Globals support doc
merzwilliam Feb 11, 2019
9702703
append ReservedConcurrentExecutions to test output
merzwilliam Feb 11, 2019
d54e649
modify the globals_for_functions unittests
merzwilliam Mar 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/globals.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ Currently, the following resources and properties are being supported:
AutoPublishAlias:
DeploymentPreference:
PermissionsBoundary:
ReservedConcurrentExecutions:

Api:
# Properties of AWS::Serverless::Api
Expand Down
3 changes: 2 additions & 1 deletion samtranslator/plugins/globals/globals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class Globals(object):
"AutoPublishAlias",
"Layers",
"DeploymentPreference",
"PermissionsBoundary"
"PermissionsBoundary",
"ReservedConcurrentExecutions"
],

# Everything except
Expand Down
2 changes: 2 additions & 0 deletions tests/translator/input/globals_for_function.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

2 changes: 2 additions & 0 deletions tests/translator/output/aws-cn/globals_for_function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
}
],
"MemorySize": 512,
"ReservedConcurrentExecutions": 100,
"Environment": {
"Variables": {
"Var1": "value1",
Expand Down Expand Up @@ -146,6 +147,7 @@
}
],
"MemorySize": 1024,
"ReservedConcurrentExecutions": 50,
"Environment": {
"Variables": {
"Var1": "value1",
Expand Down
2 changes: 2 additions & 0 deletions tests/translator/output/aws-us-gov/globals_for_function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
}
],
"MemorySize": 512,
"ReservedConcurrentExecutions": 100,
"Environment": {
"Variables": {
"Var1": "value1",
Expand Down Expand Up @@ -146,6 +147,7 @@
}
],
"MemorySize": 1024,
"ReservedConcurrentExecutions": 50,
"Environment": {
"Variables": {
"Var1": "value1",
Expand Down
4 changes: 2 additions & 2 deletions tests/translator/output/error_globals_unsupported_property.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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']"
}
2 changes: 2 additions & 0 deletions tests/translator/output/globals_for_function.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
}
],
"MemorySize": 512,
"ReservedConcurrentExecutions": 100,
"Environment": {
"Variables": {
"Var1": "value1",
Expand Down Expand Up @@ -146,6 +147,7 @@
}
],
"MemorySize": 1024,
"ReservedConcurrentExecutions": 50,
"Environment": {
"Variables": {
"Var1": "value1",
Expand Down