commit after updating to the latest CF spec

jpbarto · Aug 4, 2017 · 7e88eb0 · 7e88eb0
1 parent 83c0119
commit 7e88eb0
Show file tree

Hide file tree

Showing 98 changed files with 10,206 additions and 5,902 deletions.
diff --git a/CloudFormationResourceSpecification.json b/CloudFormationResourceSpecification.json
diff --git a/generate-snippets.py b/generate-snippets.py
@@ -61,38 +61,39 @@
     sfile.write ("      'prefix': '{0}'\n".format (key))
     sfile.write ("      'body':\"\"\"\n")
 
-    for pkey in sorted (snippet['spec']['Properties'].iterkeys ()):
-        sprop = snippet['spec']['Properties'][pkey]
-
-        ins_ctr += 1
-
-        req_descriptor = 'optional'
-        if sprop['Required']:
-            req_descriptor = 'required'
-
-        value_descriptor = 'value'
-        if 'PrimitiveType' in sprop:
-            value_descriptor = sprop['PrimitiveType']
-
-        if 'Type' in sprop:
-            if 'ItemType' in sprop:
-                value_descriptor = sprop['ItemType']
-            elif 'PrimitiveItemType' in sprop:
-                value_descriptor = sprop['PrimitiveItemType']
-            else:
-                value_descriptor = sprop['Type']
-
-            if sprop['Type'] == 'List':
-                sfile.write ("         {0}:                # {1}, list of {2}\n".format (pkey, req_descriptor, value_descriptor))
-                sfile.write ("         \t- ${{{0}:{1}}}\n".format (ins_ctr, value_descriptor))
-            elif sprop['Type'] == 'Map':
-                sfile.write ("         {0}:                # {1}, map of {2}\n".format (pkey, req_descriptor, value_descriptor))
-                sfile.write ("         \t${{{0}:{1}_key}}: ${{{2}:{1}_value}}\n".format (ins_ctr, value_descriptor, ins_ctr + 1))
-                ins_ctr += 1
+    if 'Properties' in snippet['spec']:
+        for pkey in sorted (snippet['spec']['Properties'].iterkeys ()):
+            sprop = snippet['spec']['Properties'][pkey]
+
+            ins_ctr += 1
+
+            req_descriptor = 'optional'
+            if sprop['Required']:
+                req_descriptor = 'required'
+
+            value_descriptor = 'value'
+            if 'PrimitiveType' in sprop:
+                value_descriptor = sprop['PrimitiveType']
+
+            if 'Type' in sprop:
+                if 'ItemType' in sprop:
+                    value_descriptor = sprop['ItemType']
+                elif 'PrimitiveItemType' in sprop:
+                    value_descriptor = sprop['PrimitiveItemType']
+                else:
+                    value_descriptor = sprop['Type']
+
+                if sprop['Type'] == 'List':
+                    sfile.write ("         {0}:                # {1}, list of {2}\n".format (pkey, req_descriptor, value_descriptor))
+                    sfile.write ("         \t- ${{{0}:{1}}}\n".format (ins_ctr, value_descriptor))
+                elif sprop['Type'] == 'Map':
+                    sfile.write ("         {0}:                # {1}, map of {2}\n".format (pkey, req_descriptor, value_descriptor))
+                    sfile.write ("         \t${{{0}:{1}_key}}: ${{{2}:{1}_value}}\n".format (ins_ctr, value_descriptor, ins_ctr + 1))
+                    ins_ctr += 1
+                else:
+                    sfile.write ("         {0}: ${{{1}:{2}}}     # {3}\n".format (pkey, ins_ctr, value_descriptor, req_descriptor))
             else:
                 sfile.write ("         {0}: ${{{1}:{2}}}     # {3}\n".format (pkey, ins_ctr, value_descriptor, req_descriptor))
-        else:
-            sfile.write ("         {0}: ${{{1}:{2}}}     # {3}\n".format (pkey, ins_ctr, value_descriptor, req_descriptor))
 
     sfile.write ("\"\"\"")
 

diff --git a/snippets/alarm.cson b/snippets/alarm.cson
@@ -13,15 +13,18 @@
          		ComparisonOperator: ${6:String}     # required
          		Dimensions:                # optional, list of Dimension
          			- ${7:Dimension}
-         		EvaluationPeriods: ${8:Double}     # required
+         		EvaluateLowSampleCountPercentile: ${8:String}     # optional
+         		EvaluationPeriods: ${9:Integer}     # required
+         		ExtendedStatistic: ${10:String}     # optional
          		InsufficientDataActions:                # optional, list of String
-         			- ${9:String}
-         		MetricName: ${10:String}     # required
-         		Namespace: ${11:String}     # required
+         			- ${11:String}
+         		MetricName: ${12:String}     # required
+         		Namespace: ${13:String}     # required
          		OKActions:                # optional, list of String
-         			- ${12:String}
-         		Period: ${13:Integer}     # required
-         		Statistic: ${14:String}     # required
-         		Threshold: ${15:Double}     # required
-         		Unit: ${16:String}     # optional
+         			- ${14:String}
+         		Period: ${15:Integer}     # required
+         		Statistic: ${16:String}     # optional
+         		Threshold: ${17:Double}     # required
+         		TreatMissingData: ${18:String}     # optional
+         		Unit: ${19:String}     # optional
 """
diff --git a/snippets/applicationautoscaling-scalingpolicy.cson b/snippets/applicationautoscaling-scalingpolicy.cson
@@ -12,4 +12,5 @@
          		ScalingTargetId: ${6:String}     # optional
          		ServiceNamespace: ${7:String}     # optional
          		StepScalingPolicyConfiguration: ${8:StepScalingPolicyConfiguration}     # optional
+         		TargetTrackingScalingPolicyConfiguration: ${9:TargetTrackingScalingPolicyConfiguration}     # optional
 """
diff --git a/snippets/artifacts.cson b/snippets/artifacts.cson
@@ -7,5 +7,5 @@
          NamespaceType: ${4:String}     # optional
          Packaging: ${5:String}     # optional
          Path: ${6:String}     # optional
-         Type: ${7:String}     # optional
+         Type: ${7:String}     # required
 """
diff --git a/snippets/authorizer.cson b/snippets/authorizer.cson
@@ -13,6 +13,6 @@
          		Name: ${7:String}     # optional
          		ProviderARNs:                # optional, list of String
          			- ${8:String}
-         		RestApiId: ${9:String}     # optional
+         		RestApiId: ${9:String}     # required
          		Type: ${10:String}     # optional
 """
diff --git a/snippets/autoscaling-scalingpolicy.cson b/snippets/autoscaling-scalingpolicy.cson
@@ -5,7 +5,7 @@
          ${1:autoscaling-scalingpolicy_name}:
          	Type: AWS::AutoScaling::ScalingPolicy
          	Properties:
-         		AdjustmentType: ${2:String}     # required
+         		AdjustmentType: ${2:String}     # optional
          		AutoScalingGroupName: ${3:String}     # required
          		Cooldown: ${4:String}     # optional
          		EstimatedInstanceWarmup: ${5:Integer}     # optional
@@ -15,4 +15,5 @@
          		ScalingAdjustment: ${9:Integer}     # optional
          		StepAdjustments:                # optional, list of StepAdjustment
          			- ${10:StepAdjustment}
+         		TargetTrackingConfiguration: ${11:TargetTrackingConfiguration}     # optional
 """
diff --git a/snippets/autoscalinggroup.cson b/snippets/autoscalinggroup.cson
@@ -5,23 +5,25 @@
          ${1:autoscalinggroup_name}:
          	Type: AWS::AutoScaling::AutoScalingGroup
          	Properties:
-         		AsTags:                # optional, list of TagProperty
-         			- ${2:TagProperty}
          		AvailabilityZones:                # optional, list of String
-         			- ${3:String}
-         		Cooldown: ${4:String}     # optional
-         		DesiredCapacity: ${5:String}     # optional
-         		HealthCheckGracePeriod: ${6:Integer}     # optional
-         		HealthCheckType: ${7:String}     # optional
-         		InstanceId: ${8:String}     # optional
-         		LaunchConfigurationName: ${9:String}     # optional
+         			- ${2:String}
+         		Cooldown: ${3:String}     # optional
+         		DesiredCapacity: ${4:String}     # optional
+         		HealthCheckGracePeriod: ${5:Integer}     # optional
+         		HealthCheckType: ${6:String}     # optional
+         		InstanceId: ${7:String}     # optional
+         		LaunchConfigurationName: ${8:String}     # optional
          		LoadBalancerNames:                # optional, list of String
-         			- ${10:String}
-         		MaxSize: ${11:String}     # required
-         		MetricsCollection: ${12:MetricsCollection}     # optional
-         		MinSize: ${13:String}     # required
-         		NotificationConfigurations: ${14:NotificationConfigurations}     # optional
-         		PlacementGroup: ${15:String}     # optional
+         			- ${9:String}
+         		MaxSize: ${10:String}     # required
+         		MetricsCollection:                # optional, list of MetricsCollection
+         			- ${11:MetricsCollection}
+         		MinSize: ${12:String}     # required
+         		NotificationConfigurations:                # optional, list of NotificationConfiguration
+         			- ${13:NotificationConfiguration}
+         		PlacementGroup: ${14:String}     # optional
+         		Tags:                # optional, list of TagProperty
+         			- ${15:TagProperty}
          		TargetGroupARNs:                # optional, list of String
          			- ${16:String}
          		TerminationPolicies:                # optional, list of String

diff --git a/snippets/basepathmapping.cson b/snippets/basepathmapping.cson
@@ -6,7 +6,7 @@
          	Type: AWS::ApiGateway::BasePathMapping
          	Properties:
          		BasePath: ${2:String}     # optional
-         		DomainName: ${3:String}     # optional
+         		DomainName: ${3:String}     # required
          		RestApiId: ${4:String}     # optional
          		Stage: ${5:String}     # optional
 """
diff --git a/snippets/blockdevice.cson b/snippets/blockdevice.cson
@@ -6,6 +6,6 @@
          Encrypted: ${3:Boolean}     # optional
          Iops: ${4:Integer}     # optional
          SnapshotId: ${5:String}     # optional
-         VolumeSize: ${6:String}     # optional
+         VolumeSize: ${6:Integer}     # optional
          VolumeType: ${7:String}     # optional
 """
diff --git a/snippets/blockdevicemappings.cson b/snippets/blockdevicemappings.cson
diff --git a/snippets/bucket-rule.cson b/snippets/bucket-rule.cson
@@ -2,14 +2,19 @@
   'bucket-rule':
       'prefix': 'bucket-rule'
       'body':"""
-         ExpirationDate: ${2:Timestamp}     # optional
-         ExpirationInDays: ${3:Integer}     # optional
-         Id: ${4:String}     # optional
-         NoncurrentVersionExpirationInDays: ${5:Integer}     # optional
-         NoncurrentVersionTransition: ${6:NoncurrentVersionTransition}     # optional
-         NoncurrentVersionTransitions: ${7:NoncurrentVersionTransition}     # optional
-         Prefix: ${8:String}     # optional
-         Status: ${9:String}     # required
-         Transition: ${10:Transition}     # optional
-         Transitions: ${11:Transition}     # optional
+         AbortIncompleteMultipartUpload: ${2:AbortIncompleteMultipartUpload}     # optional
+         ExpirationDate: ${3:Timestamp}     # optional
+         ExpirationInDays: ${4:Integer}     # optional
+         Id: ${5:String}     # optional
+         NoncurrentVersionExpirationInDays: ${6:Integer}     # optional
+         NoncurrentVersionTransition: ${7:NoncurrentVersionTransition}     # optional
+         NoncurrentVersionTransitions:                # optional, list of NoncurrentVersionTransition
+         	- ${8:NoncurrentVersionTransition}
+         Prefix: ${9:String}     # optional
+         Status: ${10:String}     # required
+         TagFilters:                # optional, list of TagFilter
+         	- ${11:TagFilter}
+         Transition: ${12:Transition}     # optional
+         Transitions:                # optional, list of Transition
+         	- ${13:Transition}
 """
diff --git a/snippets/bucket.cson b/snippets/bucket.cson
@@ -5,15 +5,16 @@
          ${1:bucket_name}:
          	Type: AWS::S3::Bucket
          	Properties:
-         		AccessControl: ${2:String}     # optional
-         		BucketName: ${3:String}     # optional
-         		CorsConfiguration: ${4:CorsConfiguration}     # optional
-         		LifecycleConfiguration: ${5:LifecycleConfiguration}     # optional
-         		LoggingConfiguration: ${6:LoggingConfiguration}     # optional
-         		NotificationConfiguration: ${7:NotificationConfiguration}     # optional
-         		ReplicationConfiguration: ${8:ReplicationConfiguration}     # optional
+         		AccelerateConfiguration: ${2:AccelerateConfiguration}     # optional
+         		AccessControl: ${3:String}     # optional
+         		BucketName: ${4:String}     # optional
+         		CorsConfiguration: ${5:CorsConfiguration}     # optional
+         		LifecycleConfiguration: ${6:LifecycleConfiguration}     # optional
+         		LoggingConfiguration: ${7:LoggingConfiguration}     # optional
+         		NotificationConfiguration: ${8:NotificationConfiguration}     # optional
+         		ReplicationConfiguration: ${9:ReplicationConfiguration}     # optional
          		Tags:                # optional, list of Tag
-         			- ${9:Tag}
-         		VersioningConfiguration: ${10:VersioningConfiguration}     # optional
-         		WebsiteConfiguration: ${11:WebsiteConfiguration}     # optional
+         			- ${10:Tag}
+         		VersioningConfiguration: ${11:VersioningConfiguration}     # optional
+         		WebsiteConfiguration: ${12:WebsiteConfiguration}     # optional
 """
diff --git a/snippets/bytematchset.cson b/snippets/bytematchset.cson
diff --git a/snippets/bytematchtuple.cson b/snippets/bytematchtuple.cson
diff --git a/snippets/clusterparametergroup.cson b/snippets/clusterparametergroup.cson
@@ -9,4 +9,6 @@
          		ParameterGroupFamily: ${3:String}     # required
          		Parameters:                # optional, list of Parameter
          			- ${4:Parameter}
+         		Tags:                # optional, list of Tag
+         			- ${5:Tag}
 """
diff --git a/snippets/clustersecuritygroup.cson b/snippets/clustersecuritygroup.cson
@@ -6,4 +6,6 @@
          	Type: AWS::Redshift::ClusterSecurityGroup
          	Properties:
          		Description: ${2:String}     # required
+         		Tags:                # optional, list of Tag
+         			- ${3:Tag}
 """
diff --git a/snippets/clustersubnetgroup.cson b/snippets/clustersubnetgroup.cson
@@ -8,4 +8,6 @@
          		Description: ${2:String}     # required
          		SubnetIds:                # required, list of String
          			- ${3:String}
+         		Tags:                # optional, list of Tag
+         			- ${4:Tag}
 """
diff --git a/snippets/configurationrecorder.cson b/snippets/configurationrecorder.cson
@@ -7,5 +7,5 @@
          	Properties:
          		Name: ${2:String}     # optional
          		RecordingGroup: ${3:RecordingGroup}     # optional
-         		RoleArn: ${4:String}     # required
+         		RoleARN: ${4:String}     # required
 """
diff --git a/snippets/dbcluster.cson b/snippets/dbcluster.cson
@@ -18,10 +18,11 @@
          		Port: ${12:Integer}     # optional
          		PreferredBackupWindow: ${13:String}     # optional
          		PreferredMaintenanceWindow: ${14:String}     # optional
-         		SnapshotIdentifier: ${15:String}     # optional
-         		StorageEncrypted: ${16:Boolean}     # optional
+         		ReplicationSourceIdentifier: ${15:String}     # optional
+         		SnapshotIdentifier: ${16:String}     # optional
+         		StorageEncrypted: ${17:Boolean}     # optional
          		Tags:                # optional, list of Tag
-         			- ${17:Tag}
+         			- ${18:Tag}
          		VpcSecurityGroupIds:                # optional, list of String
-         			- ${18:String}
+         			- ${19:String}
 """