feat(cfnspec): cloudformation spec v11.3.0 (#6598)

see CHANGELOG
aws · Mar 9, 2020 · 0a9c6db · 0a9c6db
1 parent dd3c511
commit 0a9c6db
Show file tree

Hide file tree

Showing 9 changed files with 477 additions and 7 deletions.
diff --git a/packages/@aws-cdk/cfnspec/CHANGELOG.md b/packages/@aws-cdk/cfnspec/CHANGELOG.md
@@ -1,3 +1,65 @@
+# CloudFormation Resource Specification v11.3.0
+
+## New Resource Types
+
+* AWS::CloudWatch::CompositeAlarm
+
+## Attribute Changes
+
+* AWS::AppMesh::Mesh MeshOwner (__added__)
+* AWS::AppMesh::Mesh ResourceOwner (__added__)
+* AWS::AppMesh::Route MeshOwner (__added__)
+* AWS::AppMesh::Route ResourceOwner (__added__)
+* AWS::AppMesh::VirtualNode MeshOwner (__added__)
+* AWS::AppMesh::VirtualNode ResourceOwner (__added__)
+* AWS::AppMesh::VirtualRouter MeshOwner (__added__)
+* AWS::AppMesh::VirtualRouter ResourceOwner (__added__)
+* AWS::AppMesh::VirtualService MeshOwner (__added__)
+* AWS::AppMesh::VirtualService ResourceOwner (__added__)
+
+## Property Changes
+
+
+## Property Type Changes
+
+* AWS::AppMesh::VirtualNode.BackendDefaults (__added__)
+* AWS::AppMesh::VirtualNode.ClientPolicy (__added__)
+* AWS::AppMesh::VirtualNode.ClientPolicyTls (__added__)
+* AWS::AppMesh::VirtualNode.ListenerTls (__added__)
+* AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate (__added__)
+* AWS::AppMesh::VirtualNode.ListenerTlsCertificate (__added__)
+* AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate (__added__)
+* AWS::AppMesh::VirtualNode.TlsValidationContext (__added__)
+* AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust (__added__)
+* AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust (__added__)
+* AWS::AppMesh::VirtualNode.TlsValidationContextTrust (__added__)
+* AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting (__added__)
+* AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting (__added__)
+* AWS::AppMesh::VirtualNode.Listener TLS (__added__)
+* AWS::AppMesh::VirtualNode.VirtualNodeSpec BackendDefaults (__added__)
+* AWS::AppMesh::VirtualNode.VirtualServiceBackend ClientPolicy (__added__)
+* AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData OwnerSetting (__added__)
+* AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData OwnerSetting (__added__)
+* AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData OwnerSetting (__added__)
+* AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData OwnerSetting (__added__)
+
+# Serverless Application Model (SAM) Resource Specification v2016-10-31
+
+## New Resource Types
+
+
+## Attribute Changes
+
+
+## Property Changes
+
+
+## Property Type Changes
+
+* AWS::Serverless::Function.CloudWatchLogsEvent (__added__)
+* AWS::Serverless::Function.EventSource Properties.Types (__changed__)
+  * Added CloudWatchLogsEvent
+
 # CloudFormation Resource Specification v11.1.0
 
 ## New Resource Types

diff --git a/packages/@aws-cdk/cfnspec/build-tools/build.ts b/packages/@aws-cdk/cfnspec/build-tools/build.ts
@@ -26,8 +26,7 @@ async function main() {
     }
   }
 
-  detectScrutinyTypes(spec);
-  replaceIncompleteTypes(spec);
+  massageSpec(spec);
 
   spec.Fingerprint = md5(JSON.stringify(normalize(spec)));
 
@@ -36,6 +35,12 @@ async function main() {
   await fs.writeJson(path.join(outDir, 'specification.json'), spec, { spaces: 2 });
 }
 
+export function massageSpec(spec: schema.Specification) {
+  detectScrutinyTypes(spec);
+  replaceIncompleteTypes(spec);
+  dropTypelessAttributes(spec);
+}
+
 function forEachSection(spec: schema.Specification, data: any, cb: (spec: any, fragment: any, path: string[]) => void) {
   cb(spec.PropertyTypes, data.PropertyTypes, ['PropertyTypes']);
   cb(spec.ResourceTypes, data.ResourceTypes, ['ResourceTypes']);
@@ -74,6 +79,23 @@ function replaceIncompleteTypes(spec: schema.Specification) {
   }
 }
 
+/**
+ * Drop Attributes specified with the different ResourceTypes that have
+ * no type specified.
+ */
+function dropTypelessAttributes(spec: schema.Specification) {
+  const resourceTypes = spec.ResourceTypes;
+  Object.values(resourceTypes).forEach((resourceType) => {
+    const attributes = resourceType.Attributes ?? {};
+    Object.keys(attributes).forEach((attrKey) => {
+      const attrVal = attributes[attrKey];
+      if (Object.keys(attrVal).length === 0) {
+        delete attributes[attrKey];
+      }
+    });
+  });
+}
+
 function merge(spec: any, fragment: any, jsonPath: string[]) {
   if (!fragment) { return; }
   for (const key of Object.keys(fragment)) {

diff --git a/packages/@aws-cdk/cfnspec/cfn.version b/packages/@aws-cdk/cfnspec/cfn.version
@@ -1 +1 @@
-11.1.0
+11.3.0