Skip to content

Commit fad1edb

Browse files
me2reshShreya
authored andcommitted
fix: amend provisioned concurrency examples and templates to work for false condition (#1288)
1 parent 8bbe812 commit fad1edb

File tree

7 files changed

+48
-39
lines changed

7 files changed

+48
-39
lines changed

examples/2016-10-31/lambda_edge/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ LambdaEdgeFunctionSample:
3030
Timeout: 5
3131
# More info at https://github.com/awslabs/serverless-application-model/blob/master/docs/safe_lambda_deployments.rst
3232
AutoPublishAlias: live
33-
ProvisionedConcurrencyConfig:
34-
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
33+
ProvisionedConcurrencyConfig: !If
34+
- AliasProvisionedConcurrencyEnabled
35+
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
36+
- !Ref 'AWS::NoValue'
3537
```
3638

3739
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.

examples/2016-10-31/lambda_edge/template.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ Parameters:
1212
- true
1313
- false
1414
Default: true
15-
15+
Conditions:
16+
AliasProvisionedConcurrencyEnabled: !Equals [!Ref EnableAliasProvisionedConcurrency, true]
1617
Globals:
1718

1819
Function:
19-
ProvisionedConcurrencyConfig:
20-
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
20+
ProvisionedConcurrencyConfig: !If
21+
- AliasProvisionedConcurrencyEnabled
22+
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
23+
- !Ref 'AWS::NoValue'
2124

2225
Resources:
2326

tests/translator/input/error_function_with_no_alias_provisioned_concurrency.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ Resources:
2121
Runtime: python2.7
2222
DeploymentPreference:
2323
Type: Linear10PercentEvery3Minutes
24-
ProvisionedConcurrencyConfig:
25-
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
24+
ProvisionedConcurrencyConfig: !If
25+
- AliasProvisionedConcurrencyEnabled
26+
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
27+
- !Ref 'AWS::NoValue'

tests/translator/input/function_with_deployment_preference.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ Resources:
2222
AutoPublishAlias: live
2323
DeploymentPreference:
2424
Type: Linear10PercentEvery3Minutes
25-
ProvisionedConcurrencyConfig:
26-
ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']
25+
ProvisionedConcurrencyConfig: !If
26+
- AliasProvisionedConcurrencyEnabled
27+
- ProvisionedConcurrentExecutions: !Ref ProvisionedConcurrency
28+
- !Ref 'AWS::NoValue'

tests/translator/output/aws-cn/function_with_deployment_preference.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,18 @@
174174
]
175175
},
176176
"ProvisionedConcurrencyConfig": {
177-
"ProvisionedConcurrentExecutions": {
178-
"Fn::If": [
179-
"AliasProvisionedConcurrencyEnabled",
180-
{
177+
"Fn::If": [
178+
"AliasProvisionedConcurrencyEnabled",
179+
{
180+
"ProvisionedConcurrentExecutions": {
181181
"Ref": "ProvisionedConcurrency"
182-
},
183-
{
184-
"Ref": "AWS::NoValue"
185182
}
186-
]
187-
}
188-
},
183+
},
184+
{
185+
"Ref": "AWS::NoValue"
186+
}
187+
]
188+
},
189189
"FunctionName": {
190190
"Ref": "MinimalFunction"
191191
}

tests/translator/output/aws-us-gov/function_with_deployment_preference.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,18 @@
174174
]
175175
},
176176
"ProvisionedConcurrencyConfig": {
177-
"ProvisionedConcurrentExecutions": {
178-
"Fn::If": [
179-
"AliasProvisionedConcurrencyEnabled",
180-
{
177+
"Fn::If": [
178+
"AliasProvisionedConcurrencyEnabled",
179+
{
180+
"ProvisionedConcurrentExecutions": {
181181
"Ref": "ProvisionedConcurrency"
182-
},
183-
{
184-
"Ref": "AWS::NoValue"
185182
}
186-
]
187-
}
188-
},
183+
},
184+
{
185+
"Ref": "AWS::NoValue"
186+
}
187+
]
188+
},
189189
"FunctionName": {
190190
"Ref": "MinimalFunction"
191191
}

tests/translator/output/function_with_deployment_preference.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,18 @@
174174
]
175175
},
176176
"ProvisionedConcurrencyConfig": {
177-
"ProvisionedConcurrentExecutions": {
178-
"Fn::If": [
179-
"AliasProvisionedConcurrencyEnabled",
180-
{
177+
"Fn::If": [
178+
"AliasProvisionedConcurrencyEnabled",
179+
{
180+
"ProvisionedConcurrentExecutions": {
181181
"Ref": "ProvisionedConcurrency"
182-
},
183-
{
184-
"Ref": "AWS::NoValue"
185182
}
186-
]
187-
}
188-
},
183+
},
184+
{
185+
"Ref": "AWS::NoValue"
186+
}
187+
]
188+
},
189189
"FunctionName": {
190190
"Ref": "MinimalFunction"
191191
}

0 commit comments

Comments
 (0)