diff --git a/schema/all-spec.json b/schema/all-spec.json
index 71ce4ff6..089ac8ef 100644
--- a/schema/all-spec.json
+++ b/schema/all-spec.json
@@ -54,7 +54,6 @@
         }
       },
       "minProperties": 1,
-      "maxProperties": 64,
       "additionalProperties": false
     },
     "Mapping": {
@@ -65,7 +64,6 @@
         }
       },
       "minProperties": 1,
-      "maxProperties": 64,
       "additionalProperties": false
     },
     "CommonParams": {
@@ -623,9 +621,6 @@
           "MaintenanceWindowStartTime" : {
             "$ref" : "#/definitions/AWS_AmazonMQ_Broker_MaintenanceWindow"
           },
-          "LdapMetadata" : {
-            "$ref" : "#/definitions/AWS_AmazonMQ_Broker_LdapMetadata"
-          },
           "HostInstanceType" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-hostinstancetype",
             "type" : [ "string", "object" ]
@@ -4941,6 +4936,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html#cfn-appsync-apikey-description",
             "type" : [ "string", "object" ]
           },
+          "ApiKeyId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html#cfn-appsync-apikey-apikeyid",
+            "type" : [ "string", "object" ]
+          },
           "Expires" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html#cfn-appsync-apikey-expires",
             "type" : [ "number", "object" ]
@@ -5088,6 +5087,9 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-functionversion",
             "type" : [ "string", "object" ]
           },
+          "SyncConfig" : {
+            "$ref" : "#/definitions/AWS_AppSync_FunctionConfiguration_SyncConfig"
+          },
           "RequestMappingTemplateS3Location" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-requestmappingtemplates3location",
             "type" : [ "string", "object" ]
@@ -5661,6 +5663,10 @@
           "QueryString" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring",
             "type" : [ "string", "object" ]
+          },
+          "WorkGroup" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-workgroup",
+            "type" : [ "string", "object" ]
           }
         },
         "required" : [ "Database", "QueryString" ],
@@ -5779,6 +5785,10 @@
             },
             "minItems" : 0
           },
+          "CapacityRebalance" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-capacityrebalance",
+            "type" : [ "boolean", "object" ]
+          },
           "Cooldown" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-cooldown",
             "type" : [ "string", "object" ]
@@ -6001,6 +6011,9 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-autoscaling-launchconfig-launchconfigurationname",
             "type" : [ "string", "object" ]
           },
+          "MetadataOptions" : {
+            "$ref" : "#/definitions/AWS_AutoScaling_LaunchConfiguration_MetadataOption"
+          },
           "PlacementTenancy" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-placementtenancy",
             "type" : [ "string", "object" ]
@@ -6511,6 +6524,10 @@
           "State" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-state",
             "type" : [ "string", "object" ]
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-tags",
+            "type" : [ "object" ]
           }
         },
         "required" : [ "Type", "ServiceRole" ],
@@ -6575,6 +6592,10 @@
           },
           "RetryStrategy" : {
             "$ref" : "#/definitions/AWS_Batch_JobDefinition_RetryStrategy"
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-tags",
+            "type" : [ "object" ]
           }
         },
         "required" : [ "Type" ],
@@ -6635,6 +6656,10 @@
           "JobQueueName" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-jobqueuename",
             "type" : [ "string", "object" ]
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-tags",
+            "type" : [ "object" ]
           }
         },
         "required" : [ "ComputeEnvironmentOrder", "Priority" ],
@@ -14419,6 +14444,10 @@
       "Properties" : {
         "type" : "object",
         "properties" : {
+          "CarrierGatewayId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-carriergatewayid",
+            "type" : [ "string", "object" ]
+          },
           "DestinationCidrBlock" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-destinationcidrblock",
             "type" : [ "string", "object" ]
@@ -14439,6 +14468,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-instanceid",
             "type" : [ "string", "object" ]
           },
+          "LocalGatewayId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-localgatewayid",
+            "type" : [ "string", "object" ]
+          },
           "NatGatewayId" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-natgatewayid",
             "type" : [ "string", "object" ]
@@ -14455,6 +14488,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-transitgatewayid",
             "type" : [ "string", "object" ]
           },
+          "VpcEndpointId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-vpcendpointid",
+            "type" : [ "string", "object" ]
+          },
           "VpcPeeringConnectionId" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-vpcpeeringconnectionid",
             "type" : [ "string", "object" ]
@@ -14853,6 +14890,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-mappubliciponlaunch",
             "type" : [ "boolean", "object" ]
           },
+          "OutpostArn" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-outpostarn",
+            "type" : [ "string", "object" ]
+          },
           "Tags" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-tags",
             "type" : "array",
@@ -17702,10 +17743,17 @@
           "KerberosAttributes" : {
             "$ref" : "#/definitions/AWS_EMR_Cluster_KerberosAttributes"
           },
+          "LogEncryptionKmsKeyId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-logencryptionkmskeyid",
+            "type" : [ "string", "object" ]
+          },
           "LogUri" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-loguri",
             "type" : [ "string", "object" ]
           },
+          "ManagedScalingPolicy" : {
+            "$ref" : "#/definitions/AWS_EMR_Cluster_ManagedScalingPolicy"
+          },
           "Name" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-name",
             "type" : [ "string", "object" ]
@@ -17726,6 +17774,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-servicerole",
             "type" : [ "string", "object" ]
           },
+          "StepConcurrencyLevel" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-stepconcurrencylevel",
+            "type" : [ "integer", "object" ]
+          },
           "Steps" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-steps",
             "type" : "array",
@@ -18293,6 +18345,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-engineversion",
             "type" : [ "string", "object" ]
           },
+          "GlobalReplicationGroupId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-globalreplicationgroupid",
+            "type" : [ "string", "object" ]
+          },
           "KmsKeyId" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-kmskeyid",
             "type" : [ "string", "object" ]
@@ -19044,7 +19100,7 @@
             "type" : [ "string", "object" ]
           }
         },
-        "required" : [ "DefaultActions", "LoadBalancerArn", "Port", "Protocol" ],
+        "required" : [ "DefaultActions", "LoadBalancerArn" ],
         "additionalProperties" : false
       },
       "DependsOn" : {
@@ -20607,6 +20663,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-acceptancerequired",
             "type" : [ "boolean", "object" ]
           },
+          "FlexMatchMode" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-flexmatchmode",
+            "type" : [ "string", "object" ]
+          },
           "RuleSetName" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-rulesetname",
             "type" : [ "string", "object" ]
@@ -20620,7 +20680,7 @@
             "minItems" : 0
           }
         },
-        "required" : [ "Name", "RequestTimeoutSeconds", "AcceptanceRequired", "RuleSetName", "GameSessionQueueArns" ],
+        "required" : [ "Name", "RequestTimeoutSeconds", "AcceptanceRequired", "RuleSetName" ],
         "additionalProperties" : false
       },
       "DependsOn" : {
@@ -26116,6 +26176,9 @@
       "Properties" : {
         "type" : "object",
         "properties" : {
+          "DeliveryStreamEncryptionConfigurationInput" : {
+            "$ref" : "#/definitions/AWS_KinesisFirehose_DeliveryStream_DeliveryStreamEncryptionConfigurationInput"
+          },
           "DeliveryStreamName" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-deliverystreamname",
             "type" : [ "string", "object" ]
@@ -26144,6 +26207,14 @@
           },
           "HttpEndpointDestinationConfiguration" : {
             "$ref" : "#/definitions/AWS_KinesisFirehose_DeliveryStream_HttpEndpointDestinationConfiguration"
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-tags",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/Tag"
+            },
+            "minItems" : 0
           }
         },
         "additionalProperties" : false
@@ -26511,6 +26582,24 @@
             },
             "uniqueItems" : true,
             "minItems" : 0
+          },
+          "Queues" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-queues",
+            "type" : "array",
+            "items" : {
+              "type" : [ "string", "object" ]
+            },
+            "uniqueItems" : true,
+            "minItems" : 0
+          },
+          "SourceAccessConfigurations" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-sourceaccessconfigurations",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/AWS_Lambda_EventSourceMapping_SourceAccessConfiguration"
+            },
+            "uniqueItems" : true,
+            "minItems" : 0
           }
         },
         "required" : [ "EventSourceArn", "FunctionName" ],
@@ -26963,11 +27052,15 @@
         "type" : "object",
         "properties" : {
           "LogGroupName" : {
-            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-cwl-loggroup-loggroupname",
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-loggroupname",
+            "type" : [ "string", "object" ]
+          },
+          "KmsKeyId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-kmskeyid",
             "type" : [ "string", "object" ]
           },
           "RetentionInDays" : {
-            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-cwl-loggroup-retentionindays",
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-retentionindays",
             "type" : [ "integer", "object" ]
           }
         },
@@ -27936,6 +28029,365 @@
     "required" : [ "Type" ],
     "additionalProperties" : false
   },
+  "AWS_MediaPackage_Asset" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html",
+    "properties" : {
+      "Type" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html",
+        "type" : "string",
+        "enum" : [ "AWS::MediaPackage::Asset" ]
+      },
+      "DeletionPolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "UpdateReplacePolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatereplacepolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "Metadata" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-metadata.html",
+        "type" : "object"
+      },
+      "Properties" : {
+        "type" : "object",
+        "properties" : {
+          "EgressEndpoints" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-egressendpoints",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/AWS_MediaPackage_Asset_EgressEndpoint"
+            },
+            "minItems" : 0
+          },
+          "Id" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-id",
+            "type" : [ "string", "object" ]
+          },
+          "PackagingGroupId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-packaginggroupid",
+            "type" : [ "string", "object" ]
+          },
+          "ResourceId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-resourceid",
+            "type" : [ "string", "object" ]
+          },
+          "SourceArn" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-sourcearn",
+            "type" : [ "string", "object" ]
+          },
+          "SourceRoleArn" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-sourcerolearn",
+            "type" : [ "string", "object" ]
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-tags",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/Tag"
+            },
+            "uniqueItems" : true,
+            "minItems" : 0
+          }
+        },
+        "required" : [ "Id", "PackagingGroupId", "SourceArn", "SourceRoleArn" ],
+        "additionalProperties" : false
+      },
+      "DependsOn" : {
+        "type" : [ "string", "array" ],
+        "items" : {
+          "type" : "string"
+        }
+      }
+    },
+    "required" : [ "Type", "Properties" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_Channel" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html",
+    "properties" : {
+      "Type" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html",
+        "type" : "string",
+        "enum" : [ "AWS::MediaPackage::Channel" ]
+      },
+      "DeletionPolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "UpdateReplacePolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatereplacepolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "Metadata" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-metadata.html",
+        "type" : "object"
+      },
+      "Properties" : {
+        "type" : "object",
+        "properties" : {
+          "Id" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-id",
+            "type" : [ "string", "object" ]
+          },
+          "Description" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-description",
+            "type" : [ "string", "object" ]
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-tags",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/Tag"
+            },
+            "uniqueItems" : true,
+            "minItems" : 0
+          }
+        },
+        "required" : [ "Id" ],
+        "additionalProperties" : false
+      },
+      "DependsOn" : {
+        "type" : [ "string", "array" ],
+        "items" : {
+          "type" : "string"
+        }
+      }
+    },
+    "required" : [ "Type", "Properties" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html",
+    "properties" : {
+      "Type" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html",
+        "type" : "string",
+        "enum" : [ "AWS::MediaPackage::OriginEndpoint" ]
+      },
+      "DeletionPolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "UpdateReplacePolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatereplacepolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "Metadata" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-metadata.html",
+        "type" : "object"
+      },
+      "Properties" : {
+        "type" : "object",
+        "properties" : {
+          "Id" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-id",
+            "type" : [ "string", "object" ]
+          },
+          "ChannelId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-channelid",
+            "type" : [ "string", "object" ]
+          },
+          "Description" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-description",
+            "type" : [ "string", "object" ]
+          },
+          "Whitelist" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-whitelist",
+            "type" : "array",
+            "items" : {
+              "type" : [ "string", "object" ]
+            },
+            "minItems" : 0
+          },
+          "StartoverWindowSeconds" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-startoverwindowseconds",
+            "type" : [ "integer", "object" ]
+          },
+          "TimeDelaySeconds" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-timedelayseconds",
+            "type" : [ "integer", "object" ]
+          },
+          "ManifestName" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-manifestname",
+            "type" : [ "string", "object" ]
+          },
+          "Origination" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-origination",
+            "type" : [ "string", "object" ]
+          },
+          "Authorization" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_Authorization"
+          },
+          "HlsPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_HlsPackage"
+          },
+          "DashPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_DashPackage"
+          },
+          "MssPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_MssPackage"
+          },
+          "CmafPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_CmafPackage"
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-tags",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/Tag"
+            },
+            "uniqueItems" : true,
+            "minItems" : 0
+          }
+        },
+        "required" : [ "Id", "ChannelId" ],
+        "additionalProperties" : false
+      },
+      "DependsOn" : {
+        "type" : [ "string", "array" ],
+        "items" : {
+          "type" : "string"
+        }
+      }
+    },
+    "required" : [ "Type", "Properties" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html",
+    "properties" : {
+      "Type" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html",
+        "type" : "string",
+        "enum" : [ "AWS::MediaPackage::PackagingConfiguration" ]
+      },
+      "DeletionPolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "UpdateReplacePolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatereplacepolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "Metadata" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-metadata.html",
+        "type" : "object"
+      },
+      "Properties" : {
+        "type" : "object",
+        "properties" : {
+          "Id" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-id",
+            "type" : [ "string", "object" ]
+          },
+          "PackagingGroupId" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-packaginggroupid",
+            "type" : [ "string", "object" ]
+          },
+          "CmafPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_CmafPackage"
+          },
+          "DashPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_DashPackage"
+          },
+          "HlsPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_HlsPackage"
+          },
+          "MssPackage" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_MssPackage"
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-tags",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/Tag"
+            },
+            "uniqueItems" : true,
+            "minItems" : 0
+          }
+        },
+        "required" : [ "Id", "PackagingGroupId" ],
+        "additionalProperties" : false
+      },
+      "DependsOn" : {
+        "type" : [ "string", "array" ],
+        "items" : {
+          "type" : "string"
+        }
+      }
+    },
+    "required" : [ "Type", "Properties" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingGroup" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html",
+    "properties" : {
+      "Type" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html",
+        "type" : "string",
+        "enum" : [ "AWS::MediaPackage::PackagingGroup" ]
+      },
+      "DeletionPolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "UpdateReplacePolicy" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatereplacepolicy.html",
+        "type" : "string",
+        "enum" : [ "Delete", "Retain", "Snapshot" ]
+      },
+      "Metadata" : {
+        "description" : "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-metadata.html",
+        "type" : "object"
+      },
+      "Properties" : {
+        "type" : "object",
+        "properties" : {
+          "Id" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html#cfn-mediapackage-packaginggroup-id",
+            "type" : [ "string", "object" ]
+          },
+          "Authorization" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingGroup_Authorization"
+          },
+          "Tags" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html#cfn-mediapackage-packaginggroup-tags",
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/definitions/Tag"
+            },
+            "uniqueItems" : true,
+            "minItems" : 0
+          }
+        },
+        "required" : [ "Id" ],
+        "additionalProperties" : false
+      },
+      "DependsOn" : {
+        "type" : [ "string", "array" ],
+        "items" : {
+          "type" : "string"
+        }
+      }
+    },
+    "required" : [ "Type", "Properties" ],
+    "additionalProperties" : false
+  },
   "AWS_MediaStore_Container" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html",
@@ -31379,6 +31831,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-engineversion",
             "type" : [ "string", "object" ]
           },
+          "GlobalClusterIdentifier" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-globalclusteridentifier",
+            "type" : [ "string", "object" ]
+          },
           "KmsKeyId" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-kmskeyid",
             "type" : [ "string", "object" ]
@@ -34328,6 +34784,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-region",
             "type" : [ "string", "object" ]
           },
+          "SubscriptionRoleArn" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-subscriptionrolearn",
+            "type" : [ "string", "object" ]
+          },
           "TopicArn" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#topicarn",
             "type" : [ "string", "object" ]
@@ -34380,6 +34840,10 @@
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-displayname",
             "type" : [ "string", "object" ]
           },
+          "FifoTopic" : {
+            "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-fifotopic",
+            "type" : [ "boolean", "object" ]
+          },
           "KmsMasterKeyId" : {
             "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-kmsmasterkeyid",
             "type" : [ "string", "object" ]
@@ -39603,40 +40067,6 @@
     "required" : [ "UseAwsOwnedKey" ],
     "additionalProperties" : false
   },
-  "AWS_AmazonMQ_Broker_InterBrokerCred" : {
-    "type" : "object",
-    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-interbrokercred.html",
-    "properties" : {
-      "Username" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-interbrokercred.html#cfn-amazonmq-broker-interbrokercred-username",
-        "type" : [ "string", "object" ]
-      },
-      "Password" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-interbrokercred.html#cfn-amazonmq-broker-interbrokercred-password",
-        "type" : [ "string", "object" ]
-      }
-    },
-    "required" : [ "Username", "Password" ],
-    "additionalProperties" : false
-  },
-  "AWS_AmazonMQ_Broker_LdapMetadata" : {
-    "type" : "object",
-    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapmetadata.html",
-    "properties" : {
-      "InterBrokerCreds" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapmetadata.html#cfn-amazonmq-broker-ldapmetadata-interbrokercreds",
-        "type" : "array",
-        "items" : {
-          "$ref" : "#/definitions/AWS_AmazonMQ_Broker_InterBrokerCred"
-        },
-        "minItems" : 0
-      },
-      "ServerMetadata" : {
-        "$ref" : "#/definitions/AWS_AmazonMQ_Broker_ServerMetadata"
-      }
-    },
-    "additionalProperties" : false
-  },
   "AWS_AmazonMQ_Broker_LdapServerMetadata" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html",
@@ -39728,62 +40158,6 @@
     "required" : [ "DayOfWeek", "TimeOfDay", "TimeZone" ],
     "additionalProperties" : false
   },
-  "AWS_AmazonMQ_Broker_ServerMetadata" : {
-    "type" : "object",
-    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html",
-    "properties" : {
-      "Hosts" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-hosts",
-        "type" : "array",
-        "items" : {
-          "type" : [ "string", "object" ]
-        },
-        "minItems" : 0
-      },
-      "UserRoleName" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-userrolename",
-        "type" : [ "string", "object" ]
-      },
-      "UserSearchMatching" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-usersearchmatching",
-        "type" : [ "string", "object" ]
-      },
-      "RoleName" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-rolename",
-        "type" : [ "string", "object" ]
-      },
-      "UserBase" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-userbase",
-        "type" : [ "string", "object" ]
-      },
-      "UserSearchSubtree" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-usersearchsubtree",
-        "type" : [ "boolean", "object" ]
-      },
-      "RoleSearchMatching" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-rolesearchmatching",
-        "type" : [ "string", "object" ]
-      },
-      "ServiceAccountUsername" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-serviceaccountusername",
-        "type" : [ "string", "object" ]
-      },
-      "RoleBase" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-rolebase",
-        "type" : [ "string", "object" ]
-      },
-      "ServiceAccountPassword" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-serviceaccountpassword",
-        "type" : [ "string", "object" ]
-      },
-      "RoleSearchSubtree" : {
-        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-servermetadata.html#cfn-amazonmq-broker-servermetadata-rolesearchsubtree",
-        "type" : [ "boolean", "object" ]
-      }
-    },
-    "required" : [ "Hosts", "UserSearchMatching", "UserBase", "RoleSearchMatching", "ServiceAccountUsername", "RoleBase", "ServiceAccountPassword" ],
-    "additionalProperties" : false
-  },
   "AWS_AmazonMQ_Broker_TagsEntry" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-tagsentry.html",
@@ -43953,6 +44327,36 @@
     "required" : [ "RelationalDatabaseSourceType" ],
     "additionalProperties" : false
   },
+  "AWS_AppSync_FunctionConfiguration_LambdaConflictHandlerConfig" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-lambdaconflicthandlerconfig.html",
+    "properties" : {
+      "LambdaConflictHandlerArn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-lambdaconflicthandlerconfig.html#cfn-appsync-functionconfiguration-lambdaconflicthandlerconfig-lambdaconflicthandlerarn",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_AppSync_FunctionConfiguration_SyncConfig" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-syncconfig.html",
+    "properties" : {
+      "ConflictHandler" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-syncconfig.html#cfn-appsync-functionconfiguration-syncconfig-conflicthandler",
+        "type" : [ "string", "object" ]
+      },
+      "ConflictDetection" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-syncconfig.html#cfn-appsync-functionconfiguration-syncconfig-conflictdetection",
+        "type" : [ "string", "object" ]
+      },
+      "LambdaConflictHandlerConfig" : {
+        "$ref" : "#/definitions/AWS_AppSync_FunctionConfiguration_LambdaConflictHandlerConfig"
+      }
+    },
+    "required" : [ "ConflictDetection" ],
+    "additionalProperties" : false
+  },
   "AWS_AppSync_GraphQLApi_AdditionalAuthenticationProvider" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html",
@@ -44811,6 +45215,9 @@
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html#cfn-autoscaling-autoscalinggroup-launchtemplateoverrides-instancetype",
         "type" : [ "string", "object" ]
       },
+      "LaunchTemplateSpecification" : {
+        "$ref" : "#/definitions/AWS_AutoScaling_AutoScalingGroup_LaunchTemplateSpecification"
+      },
       "WeightedCapacity" : {
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html#cfn-autoscaling-autoscalinggroup-launchtemplateoverrides-weightedcapacity",
         "type" : [ "string", "object" ]
@@ -45001,6 +45408,25 @@
     "required" : [ "DeviceName" ],
     "additionalProperties" : false
   },
+  "AWS_AutoScaling_LaunchConfiguration_MetadataOption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html",
+    "properties" : {
+      "HttpEndpoint" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html#cfn-autoscaling-launchconfig-metadataoption-httpendpoint",
+        "type" : [ "string", "object" ]
+      },
+      "HttpPutResponseHopLimit" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html#cfn-autoscaling-launchconfig-metadataoption-httpputresponsehoplimit",
+        "type" : [ "integer", "object" ]
+      },
+      "HttpTokens" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html#cfn-autoscaling-launchconfig-metadataoption-httptokens",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
   "AWS_AutoScaling_ScalingPolicy_CustomizedMetricSpecification" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html",
@@ -47027,6 +47453,9 @@
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-domainname",
         "type" : [ "string", "object" ]
       },
+      "OriginShield" : {
+        "$ref" : "#/definitions/AWS_CloudFront_Distribution_OriginShield"
+      },
       "S3OriginConfig" : {
         "$ref" : "#/definitions/AWS_CloudFront_Distribution_S3OriginConfig"
       },
@@ -47141,6 +47570,22 @@
     "required" : [ "Quantity" ],
     "additionalProperties" : false
   },
+  "AWS_CloudFront_Distribution_OriginShield" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-originshield.html",
+    "properties" : {
+      "OriginShieldRegion" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-originshield.html#cfn-cloudfront-distribution-originshield-originshieldregion",
+        "type" : [ "string", "object" ]
+      },
+      "Enabled" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-originshield.html#cfn-cloudfront-distribution-originshield-enabled",
+        "type" : [ "boolean", "object" ]
+      }
+    },
+    "required" : [ "Enabled" ],
+    "additionalProperties" : false
+  },
   "AWS_CloudFront_Distribution_Restrictions" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-restrictions.html",
@@ -54130,6 +54575,34 @@
     "required" : [ "ComparisonOperator", "MetricName", "Period", "Threshold" ],
     "additionalProperties" : false
   },
+  "AWS_EMR_Cluster_ComputeLimits" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html",
+    "properties" : {
+      "MaximumCapacityUnits" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-maximumcapacityunits",
+        "type" : [ "integer", "object" ]
+      },
+      "MaximumCoreCapacityUnits" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-maximumcorecapacityunits",
+        "type" : [ "integer", "object" ]
+      },
+      "MaximumOnDemandCapacityUnits" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-maximumondemandcapacityunits",
+        "type" : [ "integer", "object" ]
+      },
+      "MinimumCapacityUnits" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-minimumcapacityunits",
+        "type" : [ "integer", "object" ]
+      },
+      "UnitType" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-unittype",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "MaximumCapacityUnits", "MinimumCapacityUnits", "UnitType" ],
+    "additionalProperties" : false
+  },
   "AWS_EMR_Cluster_Configuration" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html",
@@ -54262,6 +54735,9 @@
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetprovisioningspecifications.html",
     "properties" : {
+      "OnDemandSpecification" : {
+        "$ref" : "#/definitions/AWS_EMR_Cluster_OnDemandProvisioningSpecification"
+      },
       "SpotSpecification" : {
         "$ref" : "#/definitions/AWS_EMR_Cluster_SpotProvisioningSpecification"
       }
@@ -54471,6 +54947,16 @@
     },
     "additionalProperties" : false
   },
+  "AWS_EMR_Cluster_ManagedScalingPolicy" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-managedscalingpolicy.html",
+    "properties" : {
+      "ComputeLimits" : {
+        "$ref" : "#/definitions/AWS_EMR_Cluster_ComputeLimits"
+      }
+    },
+    "additionalProperties" : false
+  },
   "AWS_EMR_Cluster_MetricDimension" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-metricdimension.html",
@@ -54487,6 +54973,18 @@
     "required" : [ "Key", "Value" ],
     "additionalProperties" : false
   },
+  "AWS_EMR_Cluster_OnDemandProvisioningSpecification" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandprovisioningspecification.html",
+    "properties" : {
+      "AllocationStrategy" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandprovisioningspecification.html#cfn-elasticmapreduce-cluster-ondemandprovisioningspecification-allocationstrategy",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "AllocationStrategy" ],
+    "additionalProperties" : false
+  },
   "AWS_EMR_Cluster_PlacementType" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-placementtype.html",
@@ -54606,6 +55104,10 @@
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html",
     "properties" : {
+      "AllocationStrategy" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-allocationstrategy",
+        "type" : [ "string", "object" ]
+      },
       "BlockDurationMinutes" : {
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-blockdurationminutes",
         "type" : [ "integer", "object" ]
@@ -54728,6 +55230,9 @@
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications.html",
     "properties" : {
+      "OnDemandSpecification" : {
+        "$ref" : "#/definitions/AWS_EMR_InstanceFleetConfig_OnDemandProvisioningSpecification"
+      },
       "SpotSpecification" : {
         "$ref" : "#/definitions/AWS_EMR_InstanceFleetConfig_SpotProvisioningSpecification"
       }
@@ -54770,10 +55275,26 @@
     "required" : [ "InstanceType" ],
     "additionalProperties" : false
   },
+  "AWS_EMR_InstanceFleetConfig_OnDemandProvisioningSpecification" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification.html",
+    "properties" : {
+      "AllocationStrategy" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification-allocationstrategy",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "AllocationStrategy" ],
+    "additionalProperties" : false
+  },
   "AWS_EMR_InstanceFleetConfig_SpotProvisioningSpecification" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html",
     "properties" : {
+      "AllocationStrategy" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-allocationstrategy",
+        "type" : [ "string", "object" ]
+      },
       "BlockDurationMinutes" : {
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-blockdurationminutes",
         "type" : [ "integer", "object" ]
@@ -56170,6 +56691,10 @@
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-allocationid",
         "type" : [ "string", "object" ]
       },
+      "IPv6Address" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-ipv6address",
+        "type" : [ "string", "object" ]
+      },
       "PrivateIPv4Address" : {
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-privateipv4address",
         "type" : [ "string", "object" ]
@@ -56191,7 +56716,6 @@
         "type" : [ "string", "object" ]
       }
     },
-    "required" : [ "HttpCode" ],
     "additionalProperties" : false
   },
   "AWS_ElasticLoadBalancingV2_TargetGroup_TargetDescription" : {
@@ -56332,6 +56856,18 @@
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-instnacetype",
         "type" : [ "string", "object" ]
       },
+      "WarmCount" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-warmcount",
+        "type" : [ "integer", "object" ]
+      },
+      "WarmEnabled" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-warmenabled",
+        "type" : [ "boolean", "object" ]
+      },
+      "WarmType" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-warmtype",
+        "type" : [ "string", "object" ]
+      },
       "ZoneAwarenessConfig" : {
         "$ref" : "#/definitions/AWS_Elasticsearch_Domain_ZoneAwarenessConfig"
       },
@@ -56590,6 +57126,17 @@
     },
     "additionalProperties" : false
   },
+  "AWS_Events_Rule_DeadLetterConfig" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-deadletterconfig.html",
+    "properties" : {
+      "Arn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-deadletterconfig.html#cfn-events-rule-deadletterconfig-arn",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
   "AWS_Events_Rule_EcsParameters" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html",
@@ -56698,6 +57245,53 @@
     },
     "additionalProperties" : false
   },
+  "AWS_Events_Rule_RedshiftDataParameters" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html",
+    "properties" : {
+      "Database" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-database",
+        "type" : [ "string", "object" ]
+      },
+      "DbUser" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-dbuser",
+        "type" : [ "string", "object" ]
+      },
+      "SecretManagerArn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-secretmanagerarn",
+        "type" : [ "string", "object" ]
+      },
+      "Sql" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-sql",
+        "type" : [ "string", "object" ]
+      },
+      "StatementName" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-statementname",
+        "type" : [ "string", "object" ]
+      },
+      "WithEvent" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-withevent",
+        "type" : [ "boolean", "object" ]
+      }
+    },
+    "required" : [ "Database", "Sql" ],
+    "additionalProperties" : false
+  },
+  "AWS_Events_Rule_RetryPolicy" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-retrypolicy.html",
+    "properties" : {
+      "MaximumEventAgeInSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-retrypolicy.html#cfn-events-rule-retrypolicy-maximumeventageinseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "MaximumRetryAttempts" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-retrypolicy.html#cfn-events-rule-retrypolicy-maximumretryattempts",
+        "type" : [ "integer", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
   "AWS_Events_Rule_RunCommandParameters" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandparameters.html",
@@ -56759,6 +57353,9 @@
       "BatchParameters" : {
         "$ref" : "#/definitions/AWS_Events_Rule_BatchParameters"
       },
+      "DeadLetterConfig" : {
+        "$ref" : "#/definitions/AWS_Events_Rule_DeadLetterConfig"
+      },
       "EcsParameters" : {
         "$ref" : "#/definitions/AWS_Events_Rule_EcsParameters"
       },
@@ -56783,6 +57380,12 @@
       "KinesisParameters" : {
         "$ref" : "#/definitions/AWS_Events_Rule_KinesisParameters"
       },
+      "RedshiftDataParameters" : {
+        "$ref" : "#/definitions/AWS_Events_Rule_RedshiftDataParameters"
+      },
+      "RetryPolicy" : {
+        "$ref" : "#/definitions/AWS_Events_Rule_RetryPolicy"
+      },
       "RoleArn" : {
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-rolearn",
         "type" : [ "string", "object" ]
@@ -63545,6 +64148,22 @@
     },
     "additionalProperties" : false
   },
+  "AWS_KinesisFirehose_DeliveryStream_DeliveryStreamEncryptionConfigurationInput" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput.html",
+    "properties" : {
+      "KeyARN" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput.html#cfn-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput-keyarn",
+        "type" : [ "string", "object" ]
+      },
+      "KeyType" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput.html#cfn-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput-keytype",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "KeyType" ],
+    "additionalProperties" : false
+  },
   "AWS_KinesisFirehose_DeliveryStream_Deserializer" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deserializer.html",
@@ -64505,6 +65124,21 @@
     },
     "additionalProperties" : false
   },
+  "AWS_Lambda_EventSourceMapping_SourceAccessConfiguration" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html",
+    "properties" : {
+      "Type" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html#cfn-lambda-eventsourcemapping-sourceaccessconfiguration-type",
+        "type" : [ "string", "object" ]
+      },
+      "URI" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html#cfn-lambda-eventsourcemapping-sourceaccessconfiguration-uri",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
   "AWS_Lambda_Function_Code" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html",
@@ -68302,6 +68936,724 @@
     },
     "additionalProperties" : false
   },
+  "AWS_MediaPackage_Asset_EgressEndpoint" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-asset-egressendpoint.html",
+    "properties" : {
+      "PackagingConfigurationId" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-asset-egressendpoint.html#cfn-mediapackage-asset-egressendpoint-packagingconfigurationid",
+        "type" : [ "string", "object" ]
+      },
+      "Url" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-asset-egressendpoint.html#cfn-mediapackage-asset-egressendpoint-url",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "PackagingConfigurationId", "Url" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_Channel_HlsIngest" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-hlsingest.html",
+    "properties" : {
+      "ingestEndpoints" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-hlsingest.html#cfn-mediapackage-channel-hlsingest-ingestendpoints",
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/definitions/AWS_MediaPackage_Channel_IngestEndpoint"
+        },
+        "minItems" : 0
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_Channel_IngestEndpoint" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html",
+    "properties" : {
+      "Id" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-id",
+        "type" : [ "string", "object" ]
+      },
+      "Username" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-username",
+        "type" : [ "string", "object" ]
+      },
+      "Password" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-password",
+        "type" : [ "string", "object" ]
+      },
+      "Url" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-url",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_AdTriggers" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-adtriggers.html",
+    "properties" : {
+      "AdTriggers" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-adtriggers.html#cfn-mediapackage-originendpoint-adtriggers-adtriggers",
+        "type" : "array",
+        "items" : {
+          "type" : [ "string", "object" ]
+        },
+        "minItems" : 0
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_Authorization" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-authorization.html",
+    "properties" : {
+      "SecretsRoleArn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-authorization.html#cfn-mediapackage-originendpoint-authorization-secretsrolearn",
+        "type" : [ "string", "object" ]
+      },
+      "CdnIdentifierSecret" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-authorization.html#cfn-mediapackage-originendpoint-authorization-cdnidentifiersecret",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "SecretsRoleArn", "CdnIdentifierSecret" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_CmafEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafencryption.html",
+    "properties" : {
+      "KeyRotationIntervalSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafencryption.html#cfn-mediapackage-originendpoint-cmafencryption-keyrotationintervalseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "SpekeKeyProvider" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_SpekeKeyProvider"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_CmafPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html",
+    "properties" : {
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "SegmentPrefix" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-segmentprefix",
+        "type" : [ "string", "object" ]
+      },
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_CmafEncryption"
+      },
+      "StreamSelection" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_StreamSelection"
+      },
+      "HlsManifests" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-hlsmanifests",
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_HlsManifest"
+        },
+        "minItems" : 0
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_DashEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashencryption.html",
+    "properties" : {
+      "KeyRotationIntervalSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashencryption.html#cfn-mediapackage-originendpoint-dashencryption-keyrotationintervalseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "SpekeKeyProvider" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_SpekeKeyProvider"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_DashPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html",
+    "properties" : {
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "ManifestWindowSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-manifestwindowseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "Profile" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-profile",
+        "type" : [ "string", "object" ]
+      },
+      "MinUpdatePeriodSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-minupdateperiodseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "MinBufferTimeSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-minbuffertimeseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "SuggestedPresentationDelaySeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-suggestedpresentationdelayseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "PeriodTriggers" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-periodtriggers",
+        "type" : "array",
+        "items" : {
+          "type" : [ "string", "object" ]
+        },
+        "minItems" : 0
+      },
+      "ManifestLayout" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-manifestlayout",
+        "type" : [ "string", "object" ]
+      },
+      "SegmentTemplateFormat" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-segmenttemplateformat",
+        "type" : [ "string", "object" ]
+      },
+      "AdTriggers" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_AdTriggers"
+      },
+      "AdsOnDeliveryRestrictions" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-adsondeliveryrestrictions",
+        "type" : [ "string", "object" ]
+      },
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_DashEncryption"
+      },
+      "StreamSelection" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_StreamSelection"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_HlsEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html",
+    "properties" : {
+      "EncryptionMethod" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-encryptionmethod",
+        "type" : [ "string", "object" ]
+      },
+      "ConstantInitializationVector" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-constantinitializationvector",
+        "type" : [ "string", "object" ]
+      },
+      "KeyRotationIntervalSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-keyrotationintervalseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "RepeatExtXKey" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-repeatextxkey",
+        "type" : [ "boolean", "object" ]
+      },
+      "SpekeKeyProvider" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_SpekeKeyProvider"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_HlsManifest" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html",
+    "properties" : {
+      "Id" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-id",
+        "type" : [ "string", "object" ]
+      },
+      "ManifestName" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-manifestname",
+        "type" : [ "string", "object" ]
+      },
+      "Url" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-url",
+        "type" : [ "string", "object" ]
+      },
+      "PlaylistWindowSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-playlistwindowseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "PlaylistType" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-playlisttype",
+        "type" : [ "string", "object" ]
+      },
+      "AdMarkers" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-admarkers",
+        "type" : [ "string", "object" ]
+      },
+      "ProgramDateTimeIntervalSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-programdatetimeintervalseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "IncludeIframeOnlyStream" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-includeiframeonlystream",
+        "type" : [ "boolean", "object" ]
+      },
+      "AdTriggers" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_AdTriggers"
+      },
+      "AdsOnDeliveryRestrictions" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-adsondeliveryrestrictions",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "Id" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_HlsPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html",
+    "properties" : {
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "PlaylistWindowSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-playlistwindowseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "PlaylistType" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-playlisttype",
+        "type" : [ "string", "object" ]
+      },
+      "AdMarkers" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-admarkers",
+        "type" : [ "string", "object" ]
+      },
+      "AdTriggers" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_AdTriggers"
+      },
+      "AdsOnDeliveryRestrictions" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-adsondeliveryrestrictions",
+        "type" : [ "string", "object" ]
+      },
+      "ProgramDateTimeIntervalSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-programdatetimeintervalseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "IncludeIframeOnlyStream" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-includeiframeonlystream",
+        "type" : [ "boolean", "object" ]
+      },
+      "UseAudioRenditionGroup" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-useaudiorenditiongroup",
+        "type" : [ "boolean", "object" ]
+      },
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_HlsEncryption"
+      },
+      "StreamSelection" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_StreamSelection"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_MssEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-mssencryption.html",
+    "properties" : {
+      "SpekeKeyProvider" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_SpekeKeyProvider"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_MssPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html",
+    "properties" : {
+      "ManifestWindowSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html#cfn-mediapackage-originendpoint-msspackage-manifestwindowseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html#cfn-mediapackage-originendpoint-msspackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_MssEncryption"
+      },
+      "StreamSelection" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint_StreamSelection"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_SpekeKeyProvider" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html",
+    "properties" : {
+      "ResourceId" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-resourceid",
+        "type" : [ "string", "object" ]
+      },
+      "SystemIds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-systemids",
+        "type" : "array",
+        "items" : {
+          "type" : [ "string", "object" ]
+        },
+        "minItems" : 0
+      },
+      "Url" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-url",
+        "type" : [ "string", "object" ]
+      },
+      "RoleArn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-rolearn",
+        "type" : [ "string", "object" ]
+      },
+      "CertificateArn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-certificatearn",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "ResourceId", "SystemIds", "Url", "RoleArn" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_OriginEndpoint_StreamSelection" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html",
+    "properties" : {
+      "MinVideoBitsPerSecond" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html#cfn-mediapackage-originendpoint-streamselection-minvideobitspersecond",
+        "type" : [ "integer", "object" ]
+      },
+      "MaxVideoBitsPerSecond" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html#cfn-mediapackage-originendpoint-streamselection-maxvideobitspersecond",
+        "type" : [ "integer", "object" ]
+      },
+      "StreamOrder" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html#cfn-mediapackage-originendpoint-streamselection-streamorder",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_CmafEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafencryption.html",
+    "properties" : {
+      "SpekeKeyProvider" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafencryption.html#cfn-mediapackage-packagingconfiguration-cmafencryption-spekekeyprovider",
+        "type" : "object",
+        "patternProperties" : {
+          "[a-zA-Z0-9]+" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_null"
+          }
+        }
+      }
+    },
+    "required" : [ "SpekeKeyProvider" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_CmafPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html",
+    "properties" : {
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_CmafEncryption"
+      },
+      "HlsManifests" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html#cfn-mediapackage-packagingconfiguration-cmafpackage-hlsmanifests",
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_HlsManifest"
+        },
+        "minItems" : 0
+      },
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html#cfn-mediapackage-packagingconfiguration-cmafpackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      }
+    },
+    "required" : [ "HlsManifests" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_DashEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashencryption.html",
+    "properties" : {
+      "SpekeKeyProvider" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashencryption.html#cfn-mediapackage-packagingconfiguration-dashencryption-spekekeyprovider",
+        "type" : "object",
+        "patternProperties" : {
+          "[a-zA-Z0-9]+" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_null"
+          }
+        }
+      }
+    },
+    "required" : [ "SpekeKeyProvider" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_DashManifest" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html",
+    "properties" : {
+      "ManifestLayout" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-manifestlayout",
+        "type" : [ "string", "object" ]
+      },
+      "ManifestName" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-manifestname",
+        "type" : [ "string", "object" ]
+      },
+      "MinBufferTimeSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-minbuffertimeseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "Profile" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-profile",
+        "type" : [ "string", "object" ]
+      },
+      "StreamSelection" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_StreamSelection"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_DashPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html",
+    "properties" : {
+      "DashManifests" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-dashmanifests",
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_DashManifest"
+        },
+        "minItems" : 0
+      },
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_DashEncryption"
+      },
+      "PeriodTriggers" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-periodtriggers",
+        "type" : "array",
+        "items" : {
+          "type" : [ "string", "object" ]
+        },
+        "minItems" : 0
+      },
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "SegmentTemplateFormat" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-segmenttemplateformat",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "DashManifests" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_HlsEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html",
+    "properties" : {
+      "ConstantInitializationVector" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html#cfn-mediapackage-packagingconfiguration-hlsencryption-constantinitializationvector",
+        "type" : [ "string", "object" ]
+      },
+      "EncryptionMethod" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html#cfn-mediapackage-packagingconfiguration-hlsencryption-encryptionmethod",
+        "type" : [ "string", "object" ]
+      },
+      "SpekeKeyProvider" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html#cfn-mediapackage-packagingconfiguration-hlsencryption-spekekeyprovider",
+        "type" : "object",
+        "patternProperties" : {
+          "[a-zA-Z0-9]+" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_null"
+          }
+        }
+      }
+    },
+    "required" : [ "SpekeKeyProvider" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_HlsManifest" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html",
+    "properties" : {
+      "AdMarkers" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-admarkers",
+        "type" : [ "string", "object" ]
+      },
+      "IncludeIframeOnlyStream" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-includeiframeonlystream",
+        "type" : [ "boolean", "object" ]
+      },
+      "ManifestName" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-manifestname",
+        "type" : [ "string", "object" ]
+      },
+      "ProgramDateTimeIntervalSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-programdatetimeintervalseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "RepeatExtXKey" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-repeatextxkey",
+        "type" : [ "boolean", "object" ]
+      },
+      "StreamSelection" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_StreamSelection"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_HlsPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html",
+    "properties" : {
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_HlsEncryption"
+      },
+      "HlsManifests" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html#cfn-mediapackage-packagingconfiguration-hlspackage-hlsmanifests",
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_HlsManifest"
+        },
+        "minItems" : 0
+      },
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html#cfn-mediapackage-packagingconfiguration-hlspackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      },
+      "UseAudioRenditionGroup" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html#cfn-mediapackage-packagingconfiguration-hlspackage-useaudiorenditiongroup",
+        "type" : [ "boolean", "object" ]
+      }
+    },
+    "required" : [ "HlsManifests" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_MssEncryption" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssencryption.html",
+    "properties" : {
+      "SpekeKeyProvider" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssencryption.html#cfn-mediapackage-packagingconfiguration-mssencryption-spekekeyprovider",
+        "type" : "object",
+        "patternProperties" : {
+          "[a-zA-Z0-9]+" : {
+            "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_null"
+          }
+        }
+      }
+    },
+    "required" : [ "SpekeKeyProvider" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_MssManifest" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssmanifest.html",
+    "properties" : {
+      "ManifestName" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssmanifest.html#cfn-mediapackage-packagingconfiguration-mssmanifest-manifestname",
+        "type" : [ "string", "object" ]
+      },
+      "StreamSelection" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_StreamSelection"
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_MssPackage" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-msspackage.html",
+    "properties" : {
+      "Encryption" : {
+        "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_MssEncryption"
+      },
+      "MssManifests" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-msspackage.html#cfn-mediapackage-packagingconfiguration-msspackage-mssmanifests",
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration_MssManifest"
+        },
+        "minItems" : 0
+      },
+      "SegmentDurationSeconds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-msspackage.html#cfn-mediapackage-packagingconfiguration-msspackage-segmentdurationseconds",
+        "type" : [ "integer", "object" ]
+      }
+    },
+    "required" : [ "MssManifests" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_SpekeKeyProvider" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html",
+    "properties" : {
+      "RoleArn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html#cfn-mediapackage-packagingconfiguration-spekekeyprovider-rolearn",
+        "type" : [ "string", "object" ]
+      },
+      "SystemIds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html#cfn-mediapackage-packagingconfiguration-spekekeyprovider-systemids",
+        "type" : "array",
+        "items" : {
+          "type" : [ "string", "object" ]
+        },
+        "minItems" : 0
+      },
+      "Url" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html#cfn-mediapackage-packagingconfiguration-spekekeyprovider-url",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "RoleArn", "SystemIds", "Url" ],
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingConfiguration_StreamSelection" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html",
+    "properties" : {
+      "MaxVideoBitsPerSecond" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html#cfn-mediapackage-packagingconfiguration-streamselection-maxvideobitspersecond",
+        "type" : [ "integer", "object" ]
+      },
+      "MinVideoBitsPerSecond" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html#cfn-mediapackage-packagingconfiguration-streamselection-minvideobitspersecond",
+        "type" : [ "integer", "object" ]
+      },
+      "StreamOrder" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html#cfn-mediapackage-packagingconfiguration-streamselection-streamorder",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "additionalProperties" : false
+  },
+  "AWS_MediaPackage_PackagingGroup_Authorization" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-authorization.html",
+    "properties" : {
+      "CdnIdentifierSecret" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-authorization.html#cfn-mediapackage-packaginggroup-authorization-cdnidentifiersecret",
+        "type" : [ "string", "object" ]
+      },
+      "SecretsRoleArn" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-authorization.html#cfn-mediapackage-packaginggroup-authorization-secretsrolearn",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "CdnIdentifierSecret", "SecretsRoleArn" ],
+    "additionalProperties" : false
+  },
   "AWS_MediaStore_Container_CorsRule" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html",
@@ -71118,6 +72470,18 @@
     },
     "additionalProperties" : false
   },
+  "AWS_S3_Bucket_ReplicaModifications" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicamodifications.html",
+    "properties" : {
+      "Status" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicamodifications.html#cfn-s3-bucket-replicamodifications-status",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "Status" ],
+    "additionalProperties" : false
+  },
   "AWS_S3_Bucket_ReplicationConfiguration" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration.html",
@@ -71414,6 +72778,9 @@
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-sourceselectioncriteria.html",
     "properties" : {
+      "ReplicaModifications" : {
+        "$ref" : "#/definitions/AWS_S3_Bucket_ReplicaModifications"
+      },
       "SseKmsEncryptedObjects" : {
         "$ref" : "#/definitions/AWS_S3_Bucket_SseKmsEncryptedObjects"
       }
@@ -72461,6 +73828,9 @@
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html",
     "properties" : {
+      "ImageConfig" : {
+        "$ref" : "#/definitions/AWS_SageMaker_Model_ImageConfig"
+      },
       "ContainerHostname" : {
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-containerhostname",
         "type" : [ "string", "object" ]
@@ -72488,6 +73858,18 @@
     },
     "additionalProperties" : false
   },
+  "AWS_SageMaker_Model_ImageConfig" : {
+    "type" : "object",
+    "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-imageconfig.html",
+    "properties" : {
+      "RepositoryAccessMode" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-imageconfig.html#cfn-sagemaker-model-containerdefinition-imageconfig-repositoryaccessmode",
+        "type" : [ "string", "object" ]
+      }
+    },
+    "required" : [ "RepositoryAccessMode" ],
+    "additionalProperties" : false
+  },
   "AWS_SageMaker_Model_VpcConfig" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-vpcconfig.html",
@@ -73404,6 +74786,14 @@
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-vpcendpointid",
         "type" : [ "string", "object" ]
       },
+      "SecurityGroupIds" : {
+        "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-securitygroupids",
+        "type" : "array",
+        "items" : {
+          "$ref" : "#/definitions/AWS_Transfer_Server_SecurityGroupId"
+        },
+        "minItems" : 0
+      },
       "SubnetIds" : {
         "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-subnetids",
         "type" : "array",
@@ -73437,6 +74827,12 @@
     "properties" : { },
     "additionalProperties" : false
   },
+  "AWS_Transfer_Server_SecurityGroupId" : {
+    "type" : "object",
+    "description" : null,
+    "properties" : { },
+    "additionalProperties" : false
+  },
   "AWS_Transfer_User_HomeDirectoryMapEntry" : {
     "type" : "object",
     "description" : "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-homedirectorymapentry.html",
@@ -75192,7 +76588,6 @@
   "resources" : {
     "type" : "object",
     "additionalProperties" : false,
-    "maxProperties" : 200,
     "minProperties" : 1,
     "patternProperties" : {
       "^[a-zA-Z0-9]{1,255}$" : {
@@ -76008,6 +77403,16 @@
           "$ref" : "#/definitions/AWS_MediaLive_Input"
         }, {
           "$ref" : "#/definitions/AWS_MediaLive_InputSecurityGroup"
+        }, {
+          "$ref" : "#/definitions/AWS_MediaPackage_Asset"
+        }, {
+          "$ref" : "#/definitions/AWS_MediaPackage_Channel"
+        }, {
+          "$ref" : "#/definitions/AWS_MediaPackage_OriginEndpoint"
+        }, {
+          "$ref" : "#/definitions/AWS_MediaPackage_PackagingConfiguration"
+        }, {
+          "$ref" : "#/definitions/AWS_MediaPackage_PackagingGroup"
         }, {
           "$ref" : "#/definitions/AWS_MediaStore_Container"
         }, {
@@ -76378,7 +77783,6 @@
           "$ref": "#/definitions/Mapping"
         }
       },
-      "maxProperties": 100,
       "additionalProperties": false
     },
     "Conditions": {
@@ -76406,7 +77810,7 @@
       "type": "object"
     }
   },
-  "description": "CFN JSON specification generated from version 18.7.0",
+  "description": "CFN JSON specification generated from version 19.0.0",
   "required": [
     "Resources"
   ]