Merge pull request #1633 from awslabs/develop

aws · Dec 3, 2019 · 71e5959 · 71e5959
2 parents 69daba3 + 882d68b
commit 71e5959
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -5,7 +5,7 @@ boto3~=1.10, >=1.10.29
 jmespath~=0.9.4
 PyYAML~=5.1
 cookiecutter~=1.6.0
-aws-sam-translator==1.17.0
+aws-sam-translator==1.18.0
 docker~=4.0
 dateparser~=0.7
 python-dateutil~=2.6, <2.8.1

diff --git a/samcli/__init__.py b/samcli/__init__.py
@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "0.35.0"
+__version__ = "0.36.0"
diff --git a/tests/functional/commands/validate/lib/models/function_with_deployment_preference.yaml b/tests/functional/commands/validate/lib/models/function_with_deployment_preference.yaml
@@ -1,3 +1,17 @@
+Parameters:
+  FnName:
+    Type: String
+  ProvisionedConcurrency:
+    Type: String
+    Default: 10
+  EnableAliasProvisionedConcurrency:
+    Type: String
+    AllowedValues:
+      - true
+      - false
+    Default: true
+Conditions:
+  AliasProvisionedConcurrencyEnabled: !Equals [!Ref EnableAliasProvisionedConcurrency, true]
 Resources:
   MinimalFunction:
     Type: 'AWS::Serverless::Function'
@@ -7,4 +21,6 @@ Resources:
       Runtime: python2.7
       AutoPublishAlias: live
       DeploymentPreference:
-        Type: Linear10PercentEvery3Minutes
+        Type: Linear10PercentEvery3Minutes
+      ProvisionedConcurrencyConfig:
+        ProvisionedConcurrentExecutions: !If [AliasProvisionedConcurrencyEnabled, !Ref ProvisionedConcurrency, !Ref 'AWS::NoValue']