chore: merge Release/v1.12.0 into master

DEVELOPMENT_GUIDE.rst

@@ -80,7 +80,7 @@ Install snakeviz `pip install snakeviz`
 
 .. code-block:: shell
 
-   python -m cProfile -o sam_profile_results bin/sam-translate.py translate --input-file=tests/translator/input/alexa_skill.yaml --output-file=cfn-template.json
+   python -m cProfile -o sam_profile_results bin/sam-translate.py translate --template-file=tests/translator/input/alexa_skill.yaml --output-template=cfn-template.json
    snakeviz sam_profile_results
 
 Verifying transforms
@@ -96,7 +96,7 @@ If you make changes to the transformer and want to verify the resulting CloudFor
 
    # Transform your SAM template into a CloudFormation template
    # Replace "output-template.yaml" if you didn't run the package command above or specified a different path for --output-template-file
-   bin/sam-translate.py --input-file=output-template.yaml
+   bin/sam-translate.py --template-file=output-template.yaml
 
    # Deploy your transformed CloudFormation template
    # Replace MY_STACK_NAME with a unique name each time you deploy

docs/cloudformation_compatibility.rst

@@ -182,7 +182,7 @@ AWS::Serverless::Application
 ================================== ======================== ========================
 Location                            None                     SAM expects exact values for the Location property
 Parameters                          All
-NotificationArns                    All
+NotificationARNs                    All
 Tags                                All
 TimeoutInMinutes                    All
 ================================== ======================== ========================

docs/globals.rst

@@ -73,6 +73,7 @@ Currently, the following resources and properties are being supported:
     Api:
       # Properties of AWS::Serverless::Api
       # Also works with Implicit APIs
+      Auth:
       Name:
       DefinitionUri:
       CacheClusterEnabled:
@@ -90,7 +91,7 @@ Currently, the following resources and properties are being supported:
 
     SimpleTable:
       # Properties of AWS::Serverless::SimpleTable
-      SSESpecification
+      SSESpecification:
 
 Implicit APIs
 ~~~~~~~~~~~~~

docs/internals/generated_resources.rst

@@ -5,7 +5,7 @@ CloudFormation Resources Generated By SAM
   :local:
   :backlinks: none
 
-When you create a Serverless Function or a Serverlesss API, SAM will create additional AWS resources wire everything up.
+When you create a Serverless Function or a Serverlesss API, SAM will create additional AWS resources to wire everything up.
 For example, when you create a ``AWS::Serverless::Function``, SAM will create a Lambda Function resource
 along with an IAM Role resource to give appropriate permissions for your function. This document describes all 
 such generated resources, how they are named, and how to refer to them in your SAM template.

docs/safe_lambda_deployments.rst

@@ -223,7 +223,8 @@ They work as follows:
 - **AllAtOnce**: This is an instant shifting of 100% of traffic to new version. This is useful if you want to run
   run pre/post hooks but don't want a gradual deployment. If you have a pipeline, you can set Beta/Gamma stages to 
   deploy instantly because the speed of deployments matter more than safety here.
-
+- **Custom**: Aside from Above mentioned Configurations, Custom Codedeploy configuration are also supported.
+  (Example. Type: CustomCodeDeployConfiguration)
 
 PreTraffic & PostTraffic Hooks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/website/requirements.txt

@@ -6,7 +6,7 @@ CommonMark==0.5.4
 docutils==0.14
 idna==2.6
 imagesize==0.7.1
-Jinja2==2.10
+Jinja2>=2.10.1
 MarkupSafe==1.0
 Pygments==2.2.0
 pytz==2017.3

examples/2016-10-31/lambda_safe_deployments/src/preTrafficHook.js

@@ -1,47 +1,44 @@
+// @ts-check
 'use strict';
 
 const aws = require('aws-sdk');
 const codedeploy = new aws.CodeDeploy({apiVersion: '2014-10-06'});
 
-exports.handler = (event, context, callback) => {
+exports.handler = async (event, context, callback) => {
 
-	console.log("Entering PreTraffic Hook!");
-	console.log(JSON.stringify(event));
-	
-	//Read the DeploymentId from the event payload.
-    var deploymentId = event.DeploymentId;
-	console.log(deploymentId);
+    console.log("Entering PreTraffic Hook!");
+    console.log(JSON.stringify(event));
+
+    //Read the DeploymentId from the event payload.
+    let deploymentId = event.DeploymentId;
+    console.log("deploymentId=" + deploymentId);
 
     //Read the LifecycleEventHookExecutionId from the event payload
-	var lifecycleEventHookExecutionId = event.LifecycleEventHookExecutionId;
-	console.log(lifecycleEventHookExecutionId);
-
-	/*
-		[Perform validation or prewarming steps here]
-	*/
-	
-	// Prepare the validation test results with the deploymentId and
+    let lifecycleEventHookExecutionId = event.LifecycleEventHookExecutionId;
+    console.log("lifecycleEventHookExecutionId=" + lifecycleEventHookExecutionId);
+
+    /*
+      [Perform validation or prewarming steps here]
+    */
+
+    // Prepare the validation test results with the deploymentId and
     // the lifecycleEventHookExecutionId for AWS CodeDeploy.
-    var params = {
+    let params = {
         deploymentId: deploymentId,
         lifecycleEventHookExecutionId: lifecycleEventHookExecutionId,
         status: 'Succeeded' // status can be 'Succeeded' or 'Failed'
     };
-
-	// Pass AWS CodeDeploy the prepared validation test results.
-    codedeploy.putLifecycleEventHookExecutionStatus(params, function(err, data) {
-        if (err) {
-			// Validation failed.
-			console.log('Validation test failed');
-			console.log(err);
-			console.log(data);
-            callback('Validation test failed');
-        } else {
-			// Validation succeeded.
-			console.log('Validation test succeeded');
-            callback(null, 'Validation test succeeded');
-        }
-	});
+
+    try {
+      await codedeploy.putLifecycleEventHookExecutionStatus(params).promise();
+      console.log("putLifecycleEventHookExecutionStatus done. executionStatus=[" + params.status + "]");
+      return 'Validation test succeeded'
+    }
+    catch (err) {
+      console.log("putLifecycleEventHookExecutionStatus ERROR: " + err);
+      throw new Error('Validation test failed')
+    }
+
 }
 
-// See more: https://docs.aws.amazon.com/codedeploy/latest/userguide/reference-appspec-file-structure-hooks.html#reference-appspec-file-structure-hooks-section-structure-lambda-sample-function
+// See more: https://docs.aws.amazon.com/codedeploy/latest/userguide/reference-appspec-file-structure-hooks.html#reference-appspec-file-structure-hooks-section-structure-lambda-sample-function

examples/2016-10-31/lambda_safe_deployments/src/safeTest.js

@@ -1,8 +1,9 @@
 'use strict';
 
 
-exports.handler = (event, context, callback) => {
+exports.handler = async (event, context, callback) => {
+
 	console.log("Function loaded! " + context.functionName  +  ":"  +  context.functionVersion);
 
 	callback(null, "Success");
-}
+}

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

@@ -9,7 +9,7 @@ Resources:
     Properties:
       Handler: safeTest.handler
       CodeUri: src/
-      Runtime: nodejs6.10
+      Runtime: nodejs8.10
       AutoPublishAlias: live
       DeploymentPreference:
           Type: Linear10PercentEvery1Minute
@@ -35,10 +35,10 @@ Resources:
             Action:
               - "lambda:InvokeFunction"
             Resource: !Ref safeTest.Version
-      Runtime: nodejs6.10
+      Runtime: nodejs8.10
       FunctionName: 'CodeDeployHook_preTrafficHook'
       DeploymentPreference:
         Enabled: false
       Environment:
         Variables:
-          CurrentVersion: !Ref safeTest.Version
+          CurrentVersion: !Ref safeTest.Version

examples/2016-10-31/policy_templates/all_policy_templates.yaml

@@ -87,3 +87,6 @@ Resources:
 
         - FilterLogEventsPolicy:
             LogGroupName: name
+
+        - StepFunctionsExecutionPolicy:
+            StateMachineName: name

examples/apps/alexa-skills-kit-color-expert/template.yaml

@@ -9,7 +9,7 @@ Resources:
     Type: 'AWS::Serverless::Function'
     Properties:
       Handler: index.handler
-      Runtime: nodejs6.10
+      Runtime: nodejs8.10
       CodeUri: .
       Description: Demonstrates a basic skill built with the Amazon Alexa Skills Kit.
       MemorySize: 128

examples/apps/alexa-skills-kit-color-expert/testEvent.json

@@ -0,0 +1,47 @@
+{
+  "version": "1.0",
+  "session": {
+    "new": false,
+    "sessionId": "amzn1.echo-api.session.123456789012",
+    "application": {
+      "applicationId": "amzn1.ask.skill.987654321"
+    },
+    "attributes": {},
+    "user": {
+      "userId": "amzn1.ask.account.testUser"
+    }
+  },
+  "context": {
+    "AudioPlayer": {
+      "playerActivity": "IDLE"
+    },
+    "System": {
+      "application": {
+        "applicationId": "amzn1.ask.skill.987654321"
+      },
+      "user": {
+        "userId": "amzn1.ask.account.testUser"
+      },
+      "device": {
+        "supportedInterfaces": {
+          "AudioPlayer": {}
+        }
+      }
+    }
+  },
+  "request": {
+    "type": "IntentRequest",
+    "requestId": "amzn1.echo-api.request.1234",
+    "timestamp": "2016-10-27T21:06:28Z",
+    "locale": "en-US",
+    "intent": {
+      "name": "MyColorIsIntent",
+      "slots": {
+        "Color": {
+          "name": "Color",
+          "value": "blue"
+        }
+      }
+    }
+  }
+}

examples/apps/cloudfront-ab-test/template.yaml

@@ -9,7 +9,7 @@ Resources:
     Type: 'AWS::Serverless::Function'
     Properties:
       Handler: index.handler
-      Runtime: nodejs6.10
+      Runtime: nodejs8.10
       CodeUri: .
       Description: 'Blueprint for CloudFront ab testing, implemented in NodeJS.'
       MemorySize: 128

examples/apps/cloudfront-ab-test/testEvent.json

@@ -0,0 +1,36 @@
+{
+  "Records": [
+    {
+      "cf": {
+        "config": {
+          "distributionId": "EXAMPLE"
+        },
+        "request": {
+          "uri": "/experiment-pixel.jpg",
+          "method": "GET",
+          "clientIp": "2001:cdba::3257:9652",
+          "headers": {
+            "user-agent": [
+              {
+                "key": "User-Agent",
+                "value": "Test Agent"
+              }
+            ],
+            "host": [
+              {
+                "key": "Host",
+                "value": "d123.cf.net"
+              }
+            ],
+            "cookie": [
+              {
+                "key": "Cookie",
+                "value": "SomeCookie=1; AnotherOne=A;"
+              }
+            ]
+          }
+        }
+      }
+    }
+  ]
+}

examples/apps/cloudfront-access-request-in-response/template.yaml

@@ -10,7 +10,7 @@ Resources:
     Type: 'AWS::Serverless::Function'
     Properties:
       Handler: index.handler
-      Runtime: nodejs6.10
+      Runtime: nodejs8.10
       CodeUri: .
       Description: >-
         Blueprint for setting CloudFront response header based on value in the request header implemented in NodeJS.

examples/apps/cloudfront-access-request-in-response/testEvent.json

@@ -0,0 +1,42 @@
+{
+  "Records": [
+    {
+      "cf": {
+        "config": {
+          "distributionId": "EXAMPLE"
+        },
+        "request": {
+          "headers": {
+            "host": [
+              {
+                "key": "Host",
+                "value": "d123.cf.net"
+              }
+            ],
+            "user-name": [
+              {
+                "key": "User-Name",
+                "value": "CloudFront"
+              }
+            ]
+          },
+          "clientIp": "2001:cdba::3257:9652",
+          "uri": "/test",
+          "method": "GET"
+        },
+        "response": {
+          "status": "200",
+          "statusDescription": "OK",
+          "headers": {
+            "x-cache": [
+              {
+                "key": "X-Cache",
+                "value": "Hello from Cloudfront"
+              }
+            ]
+          }
+        }
+      }
+    }
+  ]
+}

examples/apps/cloudfront-http-redirect/template.yaml

@@ -9,7 +9,7 @@ Resources:
     Type: 'AWS::Serverless::Function'
     Properties:
       Handler: index.handler
-      Runtime: nodejs6.10
+      Runtime: nodejs8.10
       CodeUri: .
       Description: Blueprint for returning HTTP redirect implemented in NodeJS.
       MemorySize: 128