fix: Stop html encoding of options for generate-event (#824)

In mustache all variables ({{name}}) are HTML escaped, which is not what we want for the generate-event command. To force unescaped HTML, you need to use the triple mustache: {{{name}}}
aws · Dec 5, 2018 · 1e8bd0b · 1e8bd0b
1 parent ac9b842
commit 1e8bd0b
Show file tree

Hide file tree

Showing 42 changed files with 150 additions and 150 deletions.
diff --git a/...i/commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaEndSession.json b/...i/commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaEndSession.json
@@ -2,22 +2,22 @@
   "version": "1.0",
   "session": {
     "new": false,
-    "sessionId": "amzn1.echo-api.session.{{session_id}}",
+    "sessionId": "amzn1.echo-api.session.{{{session_id}}}",
     "application": {
-      "applicationId": "amzn1.ask.skill.{{application_id}}"
+      "applicationId": "amzn1.ask.skill.{{{application_id}}}"
     },
     "attributes": {},
     "user": {
-      "userId": "amzn1.ask.account.{{user_id}}"
+      "userId": "amzn1.ask.account.{{{user_id}}}"
     }
   },
   "context": {
     "System": {
       "application": {
-        "applicationId": "amzn1.ask.skill.{{application_id}}"
+        "applicationId": "amzn1.ask.skill.{{{application_id}}}"
       },
       "user": {
-        "userId": "amzn1.ask.account.{{user_id}}"
+        "userId": "amzn1.ask.account.{{{user_id}}}"
       },
       "device": {
         "supportedInterfaces": {
@@ -28,7 +28,7 @@
   },
   "request": {
     "type": "SessionEndedRequest",
-    "requestId": "amzn1.echo-api.request.{{request_id}}",
+    "requestId": "amzn1.echo-api.request.{{{request_id}}}",
     "timestamp": "2016-10-27T21:11:41Z",
     "locale": "en-US",
     "reason": "USER_INITIATED"

diff --git a/...commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentAnswer.json b/...commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentAnswer.json
@@ -2,9 +2,9 @@
   "version": "1.0",
   "session": {
     "new": false,
-    "sessionId": "amzn1.echo-api.session.{{session_id}}",
+    "sessionId": "amzn1.echo-api.session.{{{session_id}}}",
     "application": {
-        "applicationId": "amzn1.ask.skill.{{application_id}}"
+        "applicationId": "amzn1.ask.skill.{{{application_id}}}"
     },
     "attributes": {
       "score": 0,
@@ -23,7 +23,7 @@
       "correctAnswerIndex": 3
     },
     "user": {
-      "userId": "amzn1.ask.account.{{user_id}}"
+      "userId": "amzn1.ask.account.{{{user_id}}}"
     }
   },
   "context": {
@@ -32,10 +32,10 @@
     },
     "System": {
       "application": {
-      "applicationId": "amzn1.ask.skill.{{application_id}}"
+      "applicationId": "amzn1.ask.skill.{{{application_id}}}"
       },
       "user": {
-        "userId": "amzn1.ask.account.{{user_id}}"
+        "userId": "amzn1.ask.account.{{{user_id}}}"
       },
       "device": {
         "supportedInterfaces": {
@@ -46,7 +46,7 @@
   },
   "request": {
     "type": "IntentRequest",
-    "requestId": "amzn1.echo-api.request.{{request_id}}",
+    "requestId": "amzn1.echo-api.request.{{{request_id}}}",
     "timestamp": "2016-10-27T21:06:28Z",
     "locale": "en-US",
     "intent": {

diff --git a/...ands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentGetNewFact.json b/...ands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentGetNewFact.json
@@ -2,13 +2,13 @@
   "version": "1.0",
   "session": {
     "new": false,
-    "sessionId": "amzn1.echo-api.session.{{session_id}}",
+    "sessionId": "amzn1.echo-api.session.{{{session_id}}}",
     "application": {
-        "applicationId": "amzn1.ask.skill.{{application_id}}"
+        "applicationId": "amzn1.ask.skill.{{{application_id}}}"
     },
     "attributes": {},
     "user": {
-      "userId": "amzn1.ask.account.{{user_id}}"
+      "userId": "amzn1.ask.account.{{{user_id}}}"
     }
   },
   "context": {
@@ -17,10 +17,10 @@
     },
     "System": {
       "application": {
-          "applicationId": "amzn1.ask.skill.{{application_id}}"
+          "applicationId": "amzn1.ask.skill.{{{application_id}}}"
       },
       "user": {
-        "userId": "amzn1.ask.account.{{user_id}}"
+        "userId": "amzn1.ask.account.{{{user_id}}}"
       },
       "device": {
         "supportedInterfaces": {
@@ -31,7 +31,7 @@
   },
   "request": {
     "type": "IntentRequest",
-    "requestId": "amzn1.echo-api.request.{{request_id}}",
+    "requestId": "amzn1.echo-api.request.{{{request_id}}}",
     "timestamp": "2016-10-27T21:06:28Z",
     "locale": "en-US",
     "intent": {

diff --git a/...mands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentMyColorIs.json b/...mands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentMyColorIs.json
@@ -2,13 +2,13 @@
   "version": "1.0",
   "session": {
     "new": false,
-    "sessionId": "amzn1.echo-api.session.{{session_id}}",
+    "sessionId": "amzn1.echo-api.session.{{{session_id}}}",
     "application": {
-        "applicationId": "amzn1.ask.skill.{{application_id}}"
+        "applicationId": "amzn1.ask.skill.{{{application_id}}}"
     },
     "attributes": {},
     "user": {
-        "userId": "amzn1.ask.account.{{user_id}}"
+        "userId": "amzn1.ask.account.{{{user_id}}}"
 
     }
   },
@@ -18,10 +18,10 @@
     },
     "System": {
       "application": {
-          "applicationId": "amzn1.ask.skill.{{application_id}}"
+          "applicationId": "amzn1.ask.skill.{{{application_id}}}"
       },
       "user": {
-          "userId": "amzn1.ask.account.{{user_id}}"
+          "userId": "amzn1.ask.account.{{{user_id}}}"
       },
       "device": {
         "supportedInterfaces": {
@@ -32,7 +32,7 @@
   },
   "request": {
     "type": "IntentRequest",
-    "requestId": "amzn1.echo-api.request.{{request_id}}",
+    "requestId": "amzn1.echo-api.request.{{{request_id}}}",
     "timestamp": "2016-10-27T21:06:28Z",
     "locale": "en-US",
     "intent": {

diff --git a/...commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentRecipe.json b/...commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaIntentRecipe.json
@@ -2,13 +2,13 @@
   "version": "1.0",
   "session": {
     "new": false,
-    "sessionId": "amzn1.echo-api.session.{{session_id}}",
+    "sessionId": "amzn1.echo-api.session.{{{session_id}}}",
     "application": {
-        "applicationId": "amzn1.ask.skill.{{application_id}}"
+        "applicationId": "amzn1.ask.skill.{{{application_id}}}"
     },
     "attributes": {},
     "user": {
-        "userId": "amzn1.ask.account.{{user_id}}"
+        "userId": "amzn1.ask.account.{{{user_id}}}"
     }
   },
   "context": {
@@ -17,7 +17,7 @@
     },
     "System": {
       "application": {
-          "applicationId": "amzn1.ask.skill.{{application_id}}"
+          "applicationId": "amzn1.ask.skill.{{{application_id}}}"
       },
       "user": {
       "userId": "amzn1.ask.account.userId"
@@ -31,7 +31,7 @@
   },
   "request": {
     "type": "IntentRequest",
-    "requestId": "amzn1.echo-api.request.{{request_id}}",
+    "requestId": "amzn1.echo-api.request.{{{request_id}}}",
     "timestamp": "2016-10-27T21:06:28Z",
     "locale": "en-US",
     "intent": {

diff --git a/...commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaStartSession.json b/...commands/local/lib/generated_sample_events/events/alexa-skills-kit/AlexaStartSession.json
@@ -2,12 +2,12 @@
   "version": "1.0",
   "session": {
     "new": true,
-    "sessionId": "amzn1.echo-api.session.{{session_id}}",
+    "sessionId": "amzn1.echo-api.session.{{{session_id}}}",
     "application": {
-        "applicationId": "amzn1.ask.skill.{{application_id}}"
+        "applicationId": "amzn1.ask.skill.{{{application_id}}}"
     },
     "user": {
-        "userId": "amzn1.ask.account.{{user_id}}"
+        "userId": "amzn1.ask.account.{{{user_id}}}"
     },
     "attributes": {}
   },
@@ -17,10 +17,10 @@
     },
     "System": {
       "application": {
-          "applicationId": "amzn1.ask.skill.{{application_id}}"
+          "applicationId": "amzn1.ask.skill.{{{application_id}}}"
       },
       "user": {
-        "userId": "amzn1.ask.account.{{user_id}}"
+        "userId": "amzn1.ask.account.{{{user_id}}}"
       },
       "device": {
         "supportedInterfaces": {
@@ -31,7 +31,7 @@
   },
   "request": {
     "type": "LaunchRequest",
-    "requestId": "amzn1.echo-api.request.{{request_id}}",
+    "requestId": "amzn1.echo-api.request.{{{request_id}}}",
     "timestamp": "2016-10-27T18:21:44Z",
     "locale": "en-US"
   }

diff --git a/...li/commands/local/lib/generated_sample_events/events/apigateway/ApiGatewayAuthorizer.json b/...li/commands/local/lib/generated_sample_events/events/apigateway/ApiGatewayAuthorizer.json
@@ -1,5 +1,5 @@
 {
   "type": "TOKEN",
   "authorizationToken": "incoming-client-token",
-  "methodArn": "arn:{{partition}}:execute-api:{{region}}:{{account_id}}:{{restApiId}}/{{stage}}/{{method}}/{{resource}}"
+  "methodArn": "arn:{{{partition}}}:execute-api:{{{region}}}:{{{account_id}}}:{{{restApiId}}}/{{{stage}}}/{{{method}}}/{{{resource}}}"
 }
diff --git a/samcli/commands/local/lib/generated_sample_events/events/apigateway/AwsProxy.json b/samcli/commands/local/lib/generated_sample_events/events/apigateway/AwsProxy.json
@@ -1,14 +1,14 @@
 {
-  "body": "{{body}}",
-  "resource": "{{resource}}",
-  "path": "/{{path}}",
-  "httpMethod": "{{method}}",
+  "body": "{{{body}}}",
+  "resource": "{{{resource}}}",
+  "path": "/{{{path}}}",
+  "httpMethod": "{{{method}}}",
   "isBase64Encoded": true,
   "queryStringParameters": {
     "foo": "bar"
   },
   "pathParameters": {
-    "proxy": "/{{path}}"
+    "proxy": "/{{{path}}}"
   },
   "stageVariables": {
     "baz": "qux"
@@ -24,7 +24,7 @@
     "CloudFront-Is-SmartTV-Viewer": "false",
     "CloudFront-Is-Tablet-Viewer": "false",
     "CloudFront-Viewer-Country": "US",
-    "Host": "1234567890.execute-api.{{dns_suffix}}",
+    "Host": "1234567890.execute-api.{{{dns_suffix}}}",
     "Upgrade-Insecure-Requests": "1",
     "User-Agent": "Custom User Agent String",
     "Via": "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)",
@@ -34,9 +34,9 @@
     "X-Forwarded-Proto": "https"
   },
   "requestContext": {
-    "accountId": "{{account_id}}",
+    "accountId": "{{{account_id}}}",
     "resourceId": "123456",
-    "stage": "{{stage}}",
+    "stage": "{{{stage}}}",
     "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
     "requestTime": "09/Apr/2015:12:34:56 +0000",
     "requestTimeEpoch": 1428582896000,
@@ -53,9 +53,9 @@
       "userAgent": "Custom User Agent String",
       "user": null
     },
-    "path": "/{{stage}}/{{path}}",
-    "resourcePath": "{{resource}}",
-    "httpMethod": "{{method}}",
+    "path": "/{{{stage}}}/{{{path}}}",
+    "resourcePath": "{{{resource}}}",
+    "httpMethod": "{{{method}}}",
     "apiId": "1234567890",
     "protocol": "HTTP/1.1"
   }

diff --git a/...li/commands/local/lib/generated_sample_events/events/cloudformation/CfnCreateRequest.json b/...li/commands/local/lib/generated_sample_events/events/cloudformation/CfnCreateRequest.json
@@ -1,12 +1,12 @@
 {
   "RequestType": "Create",
   "ResponseURL": "http://pre-signed-S3-url-for-response",
-  "StackId": "arn:{{partition}}:cloudformation:{{region}}:{{account_id}}:stack/{{stack}}/guid",
+  "StackId": "arn:{{{partition}}}:cloudformation:{{{region}}}:{{{account_id}}}:stack/{{{stack}}}/guid",
   "RequestId": "unique id for this create request",
   "ResourceType": "Custom::TestResource",
   "LogicalResourceId": "MyTestResource",
   "ResourceProperties": {
-    "StackName": "{{stack}}",
+    "StackName": "{{{stack}}}",
     "List": [
       "1",
       "2",

diff --git a/samcli/commands/local/lib/generated_sample_events/events/cloudfront/CloudFrontABTest.json b/samcli/commands/local/lib/generated_sample_events/events/cloudfront/CloudFrontABTest.json
@@ -6,8 +6,8 @@
           "distributionId": "EXAMPLE"
         },
         "request": {
-          "uri": "{{uri}}",
-          "method": "{{method}}",
+          "uri": "{{{uri}}}",
+          "method": "{{{method}}}",
           "clientIp": "2001:cdba::3257:9652",
           "headers": {
             "user-agent": [

diff --git a/...ocal/lib/generated_sample_events/events/cloudfront/CloudFrontAccessRequestInResponse.json b/...ocal/lib/generated_sample_events/events/cloudfront/CloudFrontAccessRequestInResponse.json
@@ -21,8 +21,8 @@
             ]
           },
           "clientIp": "2001:cdba::3257:9652",
-          "uri": "{{uri}}",
-          "method": "{{method}}"
+          "uri": "{{{uri}}}",
+          "method": "{{{method}}}"
         },
         "response": {
           "status": "200",

diff --git a/.../commands/local/lib/generated_sample_events/events/cloudfront/CloudFrontHttpRedirect.json b/.../commands/local/lib/generated_sample_events/events/cloudfront/CloudFrontHttpRedirect.json
@@ -6,8 +6,8 @@
           "distributionId": "EXAMPLE"
         },
         "request": {
-          "uri": "{{uri}}",
-          "method": "{{method}}",
+          "uri": "{{{uri}}}",
+          "method": "{{{method}}}",
           "clientIp": "2001:cdba::3257:9652",
           "headers": {
             "user-agent": [

diff --git a/...ands/local/lib/generated_sample_events/events/cloudfront/CloudFrontModifyQueryString.json b/...ands/local/lib/generated_sample_events/events/cloudfront/CloudFrontModifyQueryString.json
@@ -6,9 +6,9 @@
           "distributionId": "EXAMPLE"
         },
         "request": {
-          "uri": "{{uri}}",
+          "uri": "{{{uri}}}",
           "querystring": "auth=test&foo=bar",
-          "method": "{{method}}",
+          "method": "{{{method}}}",
           "clientIp": "2001:cdba::3257:9652",
           "headers": {
             "host": [

diff --git a/...rated_sample_events/events/cloudfront/CloudFrontMultipleRemoteCallsAggregateResponse.json b/...rated_sample_events/events/cloudfront/CloudFrontMultipleRemoteCallsAggregateResponse.json
@@ -6,8 +6,8 @@
           "distributionId": "EXAMPLE"
         },
         "request": {
-          "uri": "{{uri}}",
-          "method": "{{method}}",
+          "uri": "{{{uri}}}",
+          "method": "{{{method}}}",
           "clientIp": "2001:cdba::3257:9652",
           "headers": {
             "host": [

diff --git a/...ated_sample_events/events/cloudfront/CloudFrontNormalizeQuerystringToImproveCacheHit.json b/...ated_sample_events/events/cloudfront/CloudFrontNormalizeQuerystringToImproveCacheHit.json
@@ -6,9 +6,9 @@
           "distributionId": "EXAMPLE"
         },
         "request": {
-          "uri": "{{uri}}",
+          "uri": "{{{uri}}}",
           "querystring": "size=LARGE&color=RED",
-          "method": "{{method}}",
+          "method": "{{{method}}}",
           "clientIp": "2001:cdba::3257:9652",
           "headers": {
             "host": [

diff --git a/...ocal/lib/generated_sample_events/events/cloudfront/CloudFrontRedirectOnViewerCountry.json b/...ocal/lib/generated_sample_events/events/cloudfront/CloudFrontRedirectOnViewerCountry.json
@@ -6,8 +6,8 @@
           "distributionId": "EXAMPLE"
         },
         "request": {
-          "uri": "{{uri}}",
-          "method": "{{method}}",
+          "uri": "{{{uri}}}",
+          "method": "{{{method}}}",
           "clientIp": "2001:cdba::3257:9652",
           "headers": {
             "host": [

diff --git a/...lib/generated_sample_events/events/cloudfront/CloudFrontRedirectUnauthenticatedUsers.json b/...lib/generated_sample_events/events/cloudfront/CloudFrontRedirectUnauthenticatedUsers.json
@@ -6,8 +6,8 @@
           "distributionId": "EXAMPLE"
         },
         "request": {
-          "uri": "{{uri}}",
-          "method": "{{method}}",
+          "uri": "{{{uri}}}",
+          "method": "{{{method}}}",
           "querystring": "foo=bar",
           "headers": {
             "host": [