Merge pull request awslabs#166 from sam-goodwin/master

[Fix] Add Application.Location and fix SSEEnabled
claytonbrown · Feb 5, 2019 · 638b5bd · 638b5bd
2 parents 47fc002 + 59e9d47
commit 638b5bd
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/generate/sam-2016-10-31.json b/generate/sam-2016-10-31.json
@@ -237,6 +237,7 @@
                     "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
                     "Required": true,
                     "PrimitiveType": "String",
+                    "Types": [ "ApplicationLocation" ],
                     "UpdateType": "Immutable"
                 },
                 "Parameters": {
@@ -348,6 +349,23 @@
         }
     },
     "PropertyTypes": {
+        "AWS::Serverless::Application.ApplicationLocation": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+            "Properties": {
+                "ApplicationId": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "PrimitiveType": "String",
+                    "Required": true,
+                    "UpdateType": "Immutable"
+                },
+                "SemanticVersion": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "PrimitiveType": "String",
+                    "Required": true,
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
         "AWS::Serverless::Function.S3Location": {
             "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object",
             "Properties": {
@@ -777,12 +795,10 @@
             "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html",
             "Properties": {
                 "SSEEnabled": {
-                    "Enabled": {
-                        "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html",
-                        "Required": false,
-                        "PrimitiveType": "Boolean",
-                        "UpdateType": "Immutable"
-                    }
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
                 }
             }
         }