Skip to content

Amend provisioned concurrency examples and templates to work for false condition #1288

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
merged 4 commits into from
Dec 13, 2019
Merged

Amend provisioned concurrency examples and templates to work for false condition #1288

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
bbec146
Add missing condition in example template
me2resh Dec 4, 2019
7e713a7
Amend readme to have the proper description for implementing Provisio…
me2resh Dec 4, 2019
a04b787
Amend lambda edge template to have the proper if condition for Provi…
me2resh Dec 4, 2019
0a4fe99
Amend fixtures for tests
me2resh Dec 4, 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
6 changes: 4 additions & 2 deletions examples/2016-10-31/lambda_edge/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ LambdaEdgeFunctionSample:
Timeout: 5
# More info at https://github.com/awslabs/serverless-application-model/blob/master/docs/safe_lambda_deployments.rst
AutoPublishAlias: live
ProvisionedConcurrencyConfig:
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
ProvisionedConcurrencyConfig: !If
- AliasProvisionedConcurrencyEnabled
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
- !Ref 'AWS::NoValue'
```

We must also create a custom IAM Role which allows `lambda.amazonaws.com` and `edgelambda.amazonaws.com` services to assume the role and execute the function.
Expand Down
9 changes: 6 additions & 3 deletions examples/2016-10-31/lambda_edge/template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ Parameters:
- true
- false
Default: true

Conditions:
AliasProvisionedConcurrencyEnabled: !Equals [!Ref EnableAliasProvisionedConcurrency, true]
Globals:

Function:
ProvisionedConcurrencyConfig:
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
ProvisionedConcurrencyConfig: !If
- AliasProvisionedConcurrencyEnabled
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
- !Ref 'AWS::NoValue'

Resources:

Expand Down
6 changes: 4 additions & 2 deletions tests/translator/input/error_function_with_no_alias_provisioned_concurrency.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ Resources:
Runtime: python2.7
DeploymentPreference:
Type: Linear10PercentEvery3Minutes
ProvisionedConcurrencyConfig:
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
ProvisionedConcurrencyConfig: !If
- AliasProvisionedConcurrencyEnabled
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
- !Ref 'AWS::NoValue'
6 changes: 4 additions & 2 deletions tests/translator/input/function_with_deployment_preference.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@ Resources:
AutoPublishAlias: live
DeploymentPreference:
Type: Linear10PercentEvery3Minutes
ProvisionedConcurrencyConfig:
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
ProvisionedConcurrencyConfig: !If
- AliasProvisionedConcurrencyEnabled
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
- !Ref 'AWS::NoValue'
20 changes: 10 additions & 10 deletions tests/translator/output/aws-cn/function_with_deployment_preference.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,18 @@
]
},
"ProvisionedConcurrencyConfig": {
"ProvisionedConcurrentExecutions": {
"Fn::If": [
"AliasProvisionedConcurrencyEnabled",
{
"Fn::If": [
"AliasProvisionedConcurrencyEnabled",
{
"ProvisionedConcurrentExecutions": {
"Ref": "ProvisionedConcurrency"
},
{
"Ref": "AWS::NoValue"
}
]
}
},
},
{
"Ref": "AWS::NoValue"
}
]
},
"FunctionName": {
"Ref": "MinimalFunction"
}
Expand Down
20 changes: 10 additions & 10 deletions tests/translator/output/aws-us-gov/function_with_deployment_preference.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,18 @@
]
},
"ProvisionedConcurrencyConfig": {
"ProvisionedConcurrentExecutions": {
"Fn::If": [
"AliasProvisionedConcurrencyEnabled",
{
"Fn::If": [
"AliasProvisionedConcurrencyEnabled",
{
"ProvisionedConcurrentExecutions": {
"Ref": "ProvisionedConcurrency"
},
{
"Ref": "AWS::NoValue"
}
]
}
},
},
{
"Ref": "AWS::NoValue"
}
]
},
"FunctionName": {
"Ref": "MinimalFunction"
}
Expand Down
20 changes: 10 additions & 10 deletions tests/translator/output/function_with_deployment_preference.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,18 @@
]
},
"ProvisionedConcurrencyConfig": {
"ProvisionedConcurrentExecutions": {
"Fn::If": [
"AliasProvisionedConcurrencyEnabled",
{
"Fn::If": [
"AliasProvisionedConcurrencyEnabled",
{
"ProvisionedConcurrentExecutions": {
"Ref": "ProvisionedConcurrency"
},
{
"Ref": "AWS::NoValue"
}
]
}
},
},
{
"Ref": "AWS::NoValue"
}
]
},
"FunctionName": {
"Ref": "MinimalFunction"
}
Expand Down