From 50ae4c5849e3b50a30b91200ca27765eb5c7f45f Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Mon, 1 Jul 2019 13:31:09 -0500 Subject: [PATCH] Update specs from weird 4.1.0 release and patches to 2019.06.28 (#994) --- .../data/AdditionalSpecs/Policies.json | 1042 +++++++++- src/cfnlint/data/CloudSpecs/ap-east-1.json | 16 +- .../data/CloudSpecs/ap-northeast-1.json | 24 +- .../data/CloudSpecs/ap-northeast-2.json | 16 +- .../data/CloudSpecs/ap-northeast-3.json | 16 +- src/cfnlint/data/CloudSpecs/ap-south-1.json | 16 +- .../data/CloudSpecs/ap-southeast-1.json | 24 +- .../data/CloudSpecs/ap-southeast-2.json | 24 +- src/cfnlint/data/CloudSpecs/ca-central-1.json | 16 +- src/cfnlint/data/CloudSpecs/eu-central-1.json | 24 +- src/cfnlint/data/CloudSpecs/eu-north-1.json | 441 ++++- src/cfnlint/data/CloudSpecs/eu-west-1.json | 588 +++++- src/cfnlint/data/CloudSpecs/eu-west-2.json | 16 +- src/cfnlint/data/CloudSpecs/eu-west-3.json | 16 +- src/cfnlint/data/CloudSpecs/sa-east-1.json | 4 +- src/cfnlint/data/CloudSpecs/us-east-1.json | 588 +++++- src/cfnlint/data/CloudSpecs/us-east-2.json | 24 +- .../data/CloudSpecs/us-gov-east-1.json | 16 +- .../data/CloudSpecs/us-gov-west-1.json | 16 +- src/cfnlint/data/CloudSpecs/us-west-1.json | 16 +- src/cfnlint/data/CloudSpecs/us-west-2.json | 588 +++++- .../ap-east-1/05_pricing_property_values.json | 16 +- .../ap-east-1/07_ssm_service_addition.json | 1370 ++++++------- .../05_pricing_property_values.json | 24 +- .../05_pricing_property_values.json | 16 +- .../07_ssm_service_addition.json | 198 +- .../05_pricing_property_values.json | 16 +- .../05_pricing_property_values.json | 16 +- .../ap-south-1/07_ssm_service_addition.json | 478 ++--- .../05_pricing_property_values.json | 24 +- .../07_ssm_service_addition.json | 228 +-- .../05_pricing_property_values.json | 24 +- .../07_ssm_service_addition.json | 228 +-- .../05_pricing_property_values.json | 16 +- .../ca-central-1/07_ssm_service_addition.json | 198 +- .../05_pricing_property_values.json | 24 +- .../eu-central-1/07_ssm_service_addition.json | 304 +-- .../05_pricing_property_values.json | 27 +- .../eu-north-1/07_ssm_service_addition.json | 886 +++++++-- .../eu-west-1/05_pricing_property_values.json | 24 +- .../eu-west-2/05_pricing_property_values.json | 16 +- .../eu-west-2/07_ssm_service_addition.json | 132 +- .../eu-west-3/05_pricing_property_values.json | 16 +- .../eu-west-3/07_ssm_service_addition.json | 832 ++++---- .../sa-east-1/05_pricing_property_values.json | 4 +- .../sa-east-1/07_ssm_service_addition.json | 424 ++-- .../us-east-1/05_pricing_property_values.json | 24 +- .../us-east-2/05_pricing_property_values.json | 24 +- .../05_pricing_property_values.json | 16 +- .../07_ssm_service_addition.json | 1216 ++++++------ .../05_pricing_property_values.json | 16 +- .../07_ssm_service_addition.json | 1714 ++++++++--------- .../us-west-1/05_pricing_property_values.json | 16 +- .../us-west-1/07_ssm_service_addition.json | 132 +- .../us-west-2/05_pricing_property_values.json | 24 +- 55 files changed, 7856 insertions(+), 4398 deletions(-) diff --git a/src/cfnlint/data/AdditionalSpecs/Policies.json b/src/cfnlint/data/AdditionalSpecs/Policies.json index 5c026856a2..43d7fac9a7 100644 --- a/src/cfnlint/data/AdditionalSpecs/Policies.json +++ b/src/cfnlint/data/AdditionalSpecs/Policies.json @@ -31,6 +31,7 @@ "aws:EpochTime", "aws:MultiFactorAuthAge", "aws:MultiFactorAuthPresent", + "aws:PrincipalArn", "aws:PrincipalOrgID", "aws:PrincipalTag/${TagKey}", "aws:PrincipalType", @@ -140,6 +141,18 @@ } }, "serviceMap": { + "AWS Accounts": { + "Actions": [ + "DisableRegion", + "EnableRegion", + "ListRegions" + ], + "HasResource": false, + "StringPrefix": "account", + "conditionKeys": [ + "account:TargetRegion" + ] + }, "AWS Amplify": { "ARNFormat": "arn:aws:amplify:::/", "ARNRegex": "^arn:aws:amplify:.+:.+:.+", @@ -168,6 +181,47 @@ "HasResource": true, "StringPrefix": "amplify" }, + "AWS App Mesh": { + "ARNFormat": "arn:aws:appmesh:::/", + "ARNRegex": "^arn:aws:appmesh:.+:.+:.+", + "Actions": [ + "CreateMesh", + "CreateRoute", + "CreateVirtualNode", + "CreateVirtualRouter", + "CreateVirtualService", + "DeleteMesh", + "DeleteRoute", + "DeleteVirtualNode", + "DeleteVirtualRouter", + "DeleteVirtualService", + "DescribeMesh", + "DescribeRoute", + "DescribeVirtualNode", + "DescribeVirtualRouter", + "DescribeVirtualService", + "ListMeshes", + "ListRoutes", + "ListTagsForResource", + "ListVirtualNodes", + "ListVirtualRouters", + "ListVirtualServices", + "TagResource", + "UntagResource", + "UpdateMesh", + "UpdateRoute", + "UpdateVirtualNode", + "UpdateVirtualRouter", + "UpdateVirtualService" + ], + "HasResource": true, + "StringPrefix": "appmesh", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] + }, "AWS AppSync": { "ARNFormat": "arn:aws:appsync:::/", "ARNRegex": "^arn:aws:appsync:.+", @@ -412,11 +466,17 @@ "ListOperations", "ListServices", "RegisterInstance", - "UpdateInstanceHeartbeatStatus", + "UpdateInstanceCustomHealthStatus", "UpdateService" ], "HasResource": true, - "StringPrefix": "servicediscovery" + "StringPrefix": "servicediscovery", + "conditionKeys": [ + "servicediscovery:NamespaceArn", + "servicediscovery:NamespaceName", + "servicediscovery:ServiceArn", + "servicediscovery:ServiceName" + ] }, "AWS Cloud9": { "ARNFormat": "arn:aws:cloud9::::", @@ -590,6 +650,7 @@ "BatchGetProjects", "CreateProject", "CreateWebhook", + "DeleteOAuthToken", "DeleteProject", "DeleteSourceCredentials", "DeleteWebhook", @@ -615,7 +676,6 @@ "ARNFormat": "arn:aws:codecommit:::", "ARNRegex": "^arn:aws:codecommit:.+", "Actions": [ - "BatchGetPullRequests", "BatchGetRepositories", "CancelUploadArchive", "CreateBranch", @@ -651,13 +711,16 @@ "ListBranches", "ListPullRequests", "ListRepositories", + "ListTagsForResource", "MergePullRequestByFastForward", "PostCommentForComparedCommit", "PostCommentForPullRequest", "PostCommentReply", "PutFile", "PutRepositoryTriggers", + "TagResource", "TestRepositoryTriggers", + "UntagResource", "UpdateComment", "UpdateDefaultBranch", "UpdatePullRequestDescription", @@ -670,6 +733,9 @@ "HasResource": true, "StringPrefix": "codecommit", "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys", "codecommit:References" ] }, @@ -737,9 +803,11 @@ "GetPipelineExecution", "GetPipelineState", "GetThirdPartyJobDetails", + "ListActionExecutions", "ListActionTypes", "ListPipelineExecutions", "ListPipelines", + "ListTagsForResource", "ListWebhooks", "PollForJobs", "PollForThirdPartyJobs", @@ -753,10 +821,17 @@ "RegisterWebhookWithThirdParty", "RetryStageExecution", "StartPipelineExecution", + "TagResource", + "UntagResource", "UpdatePipeline" ], "HasResource": true, - "StringPrefix": "codepipeline" + "StringPrefix": "codepipeline", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "AWS CodeStar": { "ARNFormat": "arn:aws:codestar:::/", @@ -798,6 +873,7 @@ "DeleteDeliveryChannel", "DeleteEvaluationResults", "DeletePendingAggregationRequest", + "DeleteRemediationConfiguration", "DeleteRetentionConfiguration", "DeliverConfigSnapshot", "DescribeAggregateComplianceByConfigRules", @@ -813,6 +889,8 @@ "DescribeDeliveryChannelStatus", "DescribeDeliveryChannels", "DescribePendingAggregationRequests", + "DescribeRemediationConfigurations", + "DescribeRemediationExecutionStatus", "DescribeRetentionConfigurations", "GetAggregateComplianceDetailsByConfigRule", "GetAggregateConfigRuleComplianceSummary", @@ -828,19 +906,30 @@ "GetTagKeys", "ListAggregateDiscoveredResources", "ListDiscoveredResources", + "ListTagsForResource", "PutAggregationAuthorization", "PutConfigRule", "PutConfigurationAggregator", "PutConfigurationRecorder", "PutDeliveryChannel", "PutEvaluations", + "PutRemediationConfigurations", "PutRetentionConfiguration", + "SelectResourceConfig", "StartConfigRulesEvaluation", "StartConfigurationRecorder", - "StopConfigurationRecorder" + "StartRemediationExecution", + "StopConfigurationRecorder", + "TagResource", + "UntagResource" ], "HasResource": true, - "StringPrefix": "config" + "StringPrefix": "config", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "AWS Cost Explorer Service": { "ARNFormat": "arn:aws:ce:::ce", @@ -873,10 +962,13 @@ "ARNRegex": "arn:aws:dms:.+", "Actions": [ "AddTagsToResource", + "ApplyPendingMaintenanceAction", "CreateEndpoint", + "CreateEventSubscription", "CreateReplicationInstance", "CreateReplicationSubnetGroup", "CreateReplicationTask", + "DeleteCertificate", "DeleteEndpoint", "DeleteEventSubscription", "DeleteReplicationInstance", @@ -892,25 +984,43 @@ "DescribeEvents", "DescribeOrderableReplicationInstances", "DescribeRefreshSchemasStatus", + "DescribeReplicationInstanceTaskLogs", "DescribeReplicationInstances", "DescribeReplicationSubnetGroups", + "DescribeReplicationTaskAssessmentResults", "DescribeReplicationTasks", "DescribeSchemas", "DescribeTableStatistics", + "ImportCertificate", "ListTagsForResource", "ModifyEndpoint", "ModifyEventSubscription", "ModifyReplicationInstance", "ModifyReplicationSubnetGroup", "ModifyReplicationTask", + "RebootReplicationInstance", "RefreshSchemas", + "ReloadTables", "RemoveTagsFromResource", "StartReplicationTask", + "StartReplicationTaskAssessment", "StopReplicationTask", "TestConnection" ], - "HasResource": false, - "StringPrefix": "dms" + "HasResource": true, + "StringPrefix": "dms", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys", + "dms:cert-tag/${TagKey}", + "dms:endpoint-tag/${TagKey}", + "dms:es-tag/${TagKey}", + "dms:rep-tag/${TagKey}", + "dms:req-tag/${TagKey}", + "dms:subgrp-tag/${TagKey}", + "dms:task-tag/${TagKey}" + ] }, "AWS DeepLens": { "ARNFormat": "arn:aws:deeplens:::/", @@ -1001,31 +1111,57 @@ "AWS Direct Connect": { "Actions": [ "AllocateConnectionOnInterconnect", + "AllocateHostedConnection", "AllocatePrivateVirtualInterface", "AllocatePublicVirtualInterface", + "AssociateConnectionWithLag", + "AssociateHostedConnection", + "AssociateVirtualInterface", "ConfirmConnection", "ConfirmPrivateVirtualInterface", "ConfirmPublicVirtualInterface", + "CreateBGPPeer", "CreateConnection", + "CreateDirectConnectGateway", + "CreateDirectConnectGatewayAssociation", "CreateInterconnect", + "CreateLag", "CreatePrivateVirtualInterface", "CreatePublicVirtualInterface", + "DeleteBGPPeer", "DeleteConnection", + "DeleteDirectConnectGateway", + "DeleteDirectConnectGatewayAssociation", "DeleteInterconnect", + "DeleteLag", "DeleteVirtualInterface", "DescribeConnectionLoa", "DescribeConnections", "DescribeConnectionsOnInterconnect", + "DescribeDirectConnectGatewayAssociations", + "DescribeDirectConnectGatewayAttachments", + "DescribeDirectConnectGateways", + "DescribeHostedConnections", "DescribeInterconnectLoa", "DescribeInterconnects", + "DescribeLags", + "DescribeLoa", "DescribeLocations", + "DescribeTags", "DescribeVirtualGateways", - "DescribeVirtualInterfaces" + "DescribeVirtualInterfaces", + "DisassociateConnectionFromLag", + "TagResource", + "UntagResource", + "UpdateLag", + "UpdateVirtualInterfaceAttributes" ], "HasResource": false, "StringPrefix": "directconnect" }, "AWS Directory Service": { + "ARNFormat": "arn::ds:::", + "ARNRegex": "^arn::ds:.+", "Actions": [ "AcceptSharedDirectory", "AddIpRoutes", @@ -1037,6 +1173,7 @@ "CreateComputer", "CreateConditionalForwarder", "CreateDirectory", + "CreateIdentityPoolDirectory", "CreateLogSubscription", "CreateMicrosoftAD", "CreateSnapshot", @@ -1058,6 +1195,7 @@ "DisableSso", "EnableRadius", "EnableSso", + "GetAuthorizedApplicationDetails", "GetDirectoryLimits", "GetSnapshotLimits", "ListAuthorizedApplications", @@ -1080,8 +1218,13 @@ "UpdateRadius", "VerifyTrust" ], - "HasResource": false, - "StringPrefix": "ds" + "HasResource": true, + "StringPrefix": "ds", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "AWS Elastic Beanstalk": { "ARNFormat": "arn:aws:elasticbeanstalk:::/", @@ -1168,7 +1311,10 @@ "StringPrefix": "mediaconnect" }, "AWS Elemental MediaConvert": { + "ARNFormat": "arn:${Partition}:mediaconvert:::/", + "ARNRegex": "^arn:${Partition}:mediaconvert:.+", "Actions": [ + "AssociateCertificate", "CancelJob", "CreateJob", "CreateJobTemplate", @@ -1178,6 +1324,7 @@ "DeletePreset", "DeleteQueue", "DescribeEndpoints", + "DisassociateCertificate", "GetJob", "GetJobTemplate", "GetPreset", @@ -1186,23 +1333,35 @@ "ListJobs", "ListPresets", "ListQueues", + "ListTagsForResource", + "TagResource", + "UntagResource", "UpdateJobTemplate", "UpdatePreset", "UpdateQueue" ], - "HasResource": false, - "StringPrefix": "mediaconvert" + "HasResource": true, + "StringPrefix": "mediaconvert", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "AWS Elemental MediaLive": { + "ARNFormat": "arn:${Partition}:medialive:${Region}:${Account}:${ResourceType}:${ResourcePath}", + "ARNRegex": "^arn:${Partition}:medialive:.+", "Actions": [ "BatchUpdateSchedule", "CreateChannel", "CreateInput", "CreateInputSecurityGroup", + "CreateTags", "DeleteChannel", "DeleteInput", "DeleteInputSecurityGroup", "DeleteReservation", + "DeleteTags", "DescribeChannel", "DescribeInput", "DescribeInputSecurityGroup", @@ -1214,15 +1373,23 @@ "ListInputs", "ListOfferings", "ListReservations", + "ListTagsForResource", "PurchaseOffering", "StartChannel", "StopChannel", "UpdateChannel", + "UpdateChannelClass", "UpdateInput", - "UpdateInputSecurityGroup" + "UpdateInputSecurityGroup", + "UpdateReservation" ], - "HasResource": false, - "StringPrefix": "medialive" + "HasResource": true, + "StringPrefix": "medialive", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "AWS Elemental MediaPackage": { "ARNFormat": "arn:aws:mediapackage:::/", @@ -1311,6 +1478,7 @@ "GetComplianceDetail", "GetNotificationChannel", "GetPolicy", + "GetProtectionStatus", "ListComplianceStatus", "ListMemberAccounts", "ListPolicies", @@ -1320,6 +1488,31 @@ "HasResource": true, "StringPrefix": "fms" }, + "AWS Global Accelerator": { + "ARNFormat": "arn:aws:globalaccelerator:::accelerator/", + "ARNRegex": "^arn:aws:globalaccelerator::.+:.+", + "Actions": [ + "CreateAccelerator", + "CreateEndpointGroup", + "CreateListener", + "DeleteAccelerator", + "DeleteEndpointGroup", + "DeleteListener", + "DescribeAccelerator", + "DescribeAcceleratorAttributes", + "DescribeEndpointGroup", + "DescribeListener", + "ListAccelerators", + "ListEndpointGroups", + "ListListeners", + "UpdateAccelerator", + "UpdateAcceleratorAttributes", + "UpdateEndpointGroup", + "UpdateListener" + ], + "HasResource": true, + "StringPrefix": "globalaccelerator" + }, "AWS Glue": { "ARNFormat": "arn:aws:glue:::/", "ARNRegex": "^arn:aws:glue:.+:.+", @@ -1416,6 +1609,8 @@ "Actions": [ "AssociateRoleToGroup", "AssociateServiceRoleToAccount", + "CreateConnectorDefinition", + "CreateConnectorDefinitionVersion", "CreateCoreDefinition", "CreateCoreDefinitionVersion", "CreateDeployment", @@ -1433,6 +1628,7 @@ "CreateSoftwareUpdateJob", "CreateSubscriptionDefinition", "CreateSubscriptionDefinitionVersion", + "DeleteConnectorDefinition", "DeleteCoreDefinition", "DeleteDeviceDefinition", "DeleteFunctionDefinition", @@ -1443,7 +1639,10 @@ "DisassociateRoleFromGroup", "DisassociateServiceRoleFromAccount", "GetAssociatedRole", + "GetBulkDeploymentStatus", "GetConnectivityInfo", + "GetConnectorDefinition", + "GetConnectorDefinitionVersion", "GetCoreDefinition", "GetCoreDefinitionVersion", "GetDeploymentStatus", @@ -1462,6 +1661,10 @@ "GetServiceRoleForAccount", "GetSubscriptionDefinition", "GetSubscriptionDefinitionVersion", + "ListBulkDeploymentDetailedReports", + "ListBulkDeployments", + "ListConnectorDefinitionVersions", + "ListConnectorDefinitions", "ListCoreDefinitionVersions", "ListCoreDefinitions", "ListDeployments", @@ -1478,8 +1681,14 @@ "ListResourceDefinitions", "ListSubscriptionDefinitionVersions", "ListSubscriptionDefinitions", + "ListTagsForResource", "ResetDeployments", + "StartBulkDeployment", + "StopBulkDeployment", + "TagResource", + "UntagResource", "UpdateConnectivityInfo", + "UpdateConnectorDefinition", "UpdateCoreDefinition", "UpdateDeviceDefinition", "UpdateFunctionDefinition", @@ -1490,7 +1699,63 @@ "UpdateSubscriptionDefinition" ], "HasResource": true, - "StringPrefix": "greengrass" + "StringPrefix": "greengrass", + "conditionKeys": [ + "aws:CurrentTime", + "aws:EpochTime", + "aws:MultiFactorAuthAge", + "aws:MultiFactorAuthPresent", + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:SecureTransport", + "aws:TagKeys", + "aws:UserAgent" + ] + }, + "AWS Ground Station": { + "ARNFormat": "arn:aws:groundstation:::/", + "ARNRegex": "^arn:aws:groundstation:.+", + "Actions": [ + "CancelContact", + "CreateConfig", + "CreateDataflowEndpointGroup", + "CreateMissionProfile", + "DeleteConfig", + "DeleteDataflowEndpointGroup", + "DeleteMissionProfile", + "DescribeContact", + "GetConfig", + "GetDataflowEndpointGroup", + "GetMinuteUsage", + "GetMissionProfile", + "GetSatellite", + "ListConfigs", + "ListContacts", + "ListDataflowEndpointGroups", + "ListGroundStations", + "ListMissionProfiles", + "ListSatellites", + "ListTagsForResource", + "ReserveContact", + "TagResource", + "UntagResource", + "UpdateConfig", + "UpdateMissionProfile" + ], + "HasResource": true, + "StringPrefix": "groundstation", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys", + "groundstation:configId", + "groundstation:configType", + "groundstation:contactId", + "groundstation:dataflowEndpointGroupId", + "groundstation:groundStationId", + "groundstation:missionProfileId", + "groundstation:satelliteId" + ] }, "AWS Health APIs and Notifications": { "ARNFormat": "arn:aws:health:::", @@ -1532,7 +1797,9 @@ "AssociateTargetsWithJob", "AttachPolicy", "AttachPrincipalPolicy", + "AttachSecurityProfile", "AttachThingPrincipal", + "CancelAuditTask", "CancelCertificateTransfer", "CancelJob", "CancelJobExecution", @@ -1541,21 +1808,26 @@ "CreateAuthorizer", "CreateBillingGroup", "CreateCertificateFromCsr", + "CreateDynamicThingGroup", "CreateJob", "CreateKeysAndCertificate", "CreateOTAUpdate", "CreatePolicy", "CreatePolicyVersion", "CreateRoleAlias", + "CreateScheduledAudit", + "CreateSecurityProfile", "CreateStream", "CreateThing", "CreateThingGroup", "CreateThingType", "CreateTopicRule", + "DeleteAccountAuditConfiguration", "DeleteAuthorizer", "DeleteBillingGroup", "DeleteCACertificate", "DeleteCertificate", + "DeleteDynamicThingGroup", "DeleteJob", "DeleteJobExecution", "DeleteOTAUpdate", @@ -1563,6 +1835,8 @@ "DeletePolicyVersion", "DeleteRegistrationCode", "DeleteRoleAlias", + "DeleteScheduledAudit", + "DeleteSecurityProfile", "DeleteStream", "DeleteThing", "DeleteThingGroup", @@ -1571,6 +1845,8 @@ "DeleteTopicRule", "DeleteV2LoggingLevel", "DeprecateThingType", + "DescribeAccountAuditConfiguration", + "DescribeAuditTask", "DescribeAuthorizer", "DescribeBillingGroup", "DescribeCACertificate", @@ -1582,6 +1858,8 @@ "DescribeJob", "DescribeJobExecution", "DescribeRoleAlias", + "DescribeScheduledAudit", + "DescribeSecurityProfile", "DescribeStream", "DescribeThing", "DescribeThingGroup", @@ -1589,6 +1867,7 @@ "DescribeThingType", "DetachPolicy", "DetachPrincipalPolicy", + "DetachSecurityProfile", "DetachThingPrincipal", "DisableTopicRule", "EnableTopicRule", @@ -1601,10 +1880,14 @@ "GetPolicy", "GetPolicyVersion", "GetRegistrationCode", + "GetStatistics", "GetThingShadow", "GetTopicRule", "GetV2LoggingOptions", + "ListActiveViolations", "ListAttachedPolicies", + "ListAuditFindings", + "ListAuditTasks", "ListAuthorizers", "ListBillingGroups", "ListCACertificates", @@ -1622,9 +1905,13 @@ "ListPrincipalPolicies", "ListPrincipalThings", "ListRoleAliases", + "ListScheduledAudits", + "ListSecurityProfiles", + "ListSecurityProfilesForTarget", "ListStreams", "ListTagsForResource", "ListTargetsForPolicy", + "ListTargetsForSecurityProfile", "ListThingGroups", "ListThingGroupsForThing", "ListThingPrincipals", @@ -1636,6 +1923,7 @@ "ListThingsInThingGroup", "ListTopicRules", "ListV2LoggingLevels", + "ListViolationEvents", "Publish", "Receive", "RegisterCACertificate", @@ -1652,6 +1940,7 @@ "SetV2LoggingLevel", "SetV2LoggingOptions", "StartNextPendingJobExecution", + "StartOnDemandAuditTask", "StartThingRegistrationTask", "StopThingRegistrationTask", "Subscribe", @@ -1660,23 +1949,33 @@ "TestInvokeAuthorizer", "TransferCertificate", "UntagResource", + "UpdateAccountAuditConfiguration", "UpdateAuthorizer", "UpdateBillingGroup", "UpdateCACertificate", "UpdateCertificate", + "UpdateDynamicThingGroup", "UpdateEventConfigurations", "UpdateIndexingConfiguration", "UpdateJob", "UpdateJobExecution", "UpdateRoleAlias", + "UpdateScheduledAudit", + "UpdateSecurityProfile", "UpdateStream", "UpdateThing", "UpdateThingGroup", "UpdateThingGroupsForThing", - "UpdateThingShadow" + "UpdateThingShadow", + "ValidateSecurityProfileBehaviors" ], "HasResource": true, - "StringPrefix": "iot" + "StringPrefix": "iot", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "AWS IoT 1-Click": { "ARNFormat": "arn:aws:iot1click:::/", @@ -1695,13 +1994,16 @@ "FinalizeDeviceClaim", "GetDeviceMethods", "GetDevicesInPlacement", - "InitializeDeviceClaim", + "InitiateDeviceClaim", "InvokeDeviceMethod", "ListDeviceEvents", "ListDevices", "ListPlacements", "ListProjects", + "ListTagsForResource", + "TagResource", "UnclaimDevice", + "UntagResource", "UpdateDeviceState", "UpdatePlacement", "UpdateProject" @@ -1765,6 +2067,7 @@ "ARNRegex": "^arn:aws:iotevents:.+", "Actions": [ "BatchPutMessage", + "BatchUpdateDetector", "CreateDetectorModel", "CreateInput", "DeleteDetectorModel", @@ -1777,14 +2080,20 @@ "ListDetectorModels", "ListDetectors", "ListInputs", + "ListTagsForResource", "PutLoggingOptions", + "TagResource", + "UntagResource", "UpdateDetectorModel", - "UpdateInput" + "UpdateInput", + "UpdateInputRouting" ], "HasResource": true, "StringPrefix": "iotevents", "conditionKeys": [ - "iotevents:KeyValue" + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" ] }, "AWS IoT SiteWise": { @@ -1846,15 +2155,20 @@ "ARNRegex": "^arn:aws:kms:.+", "Actions": [ "CancelKeyDeletion", + "ConnectCustomKeyStore", "CreateAlias", + "CreateCustomKeyStore", "CreateGrant", "CreateKey", "Decrypt", "DeleteAlias", + "DeleteCustomKeyStore", "DeleteImportedKeyMaterial", + "DescribeCustomKeyStores", "DescribeKey", "DisableKey", "DisableKeyRotation", + "DisconnectCustomKeyStore", "EnableKey", "EnableKeyRotation", "Encrypt", @@ -1880,6 +2194,7 @@ "TagResource", "UntagResource", "UpdateAlias", + "UpdateCustomKeyStore", "UpdateKeyDescription" ], "HasResource": true, @@ -1977,7 +2292,9 @@ "HasResource": true, "StringPrefix": "license-manager", "conditionKeys": [ - "aws:TagKeys" + "aws:RequestTag/${TagKey}", + "aws:TagKeys", + "license-manager:ResourceTag/${TagKey}" ] }, "AWS Marketplace Management Portal": { @@ -2160,13 +2477,14 @@ "StringPrefix": "opsworks-cm" }, "AWS Organizations": { - "ARNFormat": "arn:aws:organizations:::/o-(//)?", - "ARNRegex": "^arn:aws:organizations::.+:.+", + "ARNFormat": "arn:${Partition}:organizations:::/o-(//)?", + "ARNRegex": "^arn:${Partition}:organizations::.+:.+", "Actions": [ "AcceptHandshake", "AttachPolicy", "CancelHandshake", "CreateAccount", + "CreateGovCloudAccount", "CreateOrganization", "CreateOrganizationalUnit", "CreatePolicy", @@ -2200,9 +2518,12 @@ "ListPolicies", "ListPoliciesForTarget", "ListRoots", + "ListTagsForResource", "ListTargetsForPolicy", "MoveAccount", "RemoveAccountFromOrganization", + "TagResource", + "UntagResource", "UpdateOrganizationalUnit", "UpdatePolicy" ], @@ -2258,9 +2579,11 @@ "DeleteResourceShare", "DisassociateResourceShare", "EnableSharingWithAwsOrganization", + "GetResourcePolicies", "GetResourceShareAssociations", "GetResourceShareInvitations", "GetResourceShares", + "ListPendingInvitationResources", "ListPrincipals", "ListResources", "RejectResourceShareInvitation", @@ -2271,13 +2594,15 @@ "HasResource": true, "StringPrefix": "ram", "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", "aws:TagKeys", "ram:AllowsExternalPrincipals", - "ram:Principals", - "ram:ResourceArns", - "ram:ResourceShareNames", - "ram:ResourceType", - "ram:ShareOwnerAccountIds" + "ram:Principal", + "ram:RequestedResourceType", + "ram:ResourceArn", + "ram:ResourceShareName", + "ram:ShareOwnerAccountId" ] }, "AWS Resource Groups": { @@ -2298,7 +2623,12 @@ "UpdateGroupQuery" ], "HasResource": true, - "StringPrefix": "resource-groups" + "StringPrefix": "resource-groups", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "AWS RoboMaker": { "ARNFormat": "arn:${Partition}:robomaker:${Region}:${AccountId}:${ResourceType}/${ResourceName}", @@ -2403,6 +2733,7 @@ "UpdateApplicationInstanceStatus", "UpdateDirectoryAssociation", "UpdateGroup", + "UpdatePermissionSet", "UpdateProfile", "UpdateSSOConfiguration", "UpdateTrust", @@ -2492,6 +2823,7 @@ "DeleteInsight", "DeleteInvitations", "DeleteMembers", + "DescribeProducts", "DisableImportFindingsForProduct", "DisableSecurityHub", "DisassociateFromMasterAccount", @@ -2509,6 +2841,7 @@ "ListEnabledProductsForImport", "ListInvitations", "ListMembers", + "ListProductSubscribers", "UpdateFindings", "UpdateInsight" ], @@ -2636,20 +2969,31 @@ "AcceptPortfolioShare", "AssociatePrincipalWithPortfolio", "AssociateProductWithPortfolio", + "AssociateServiceActionWithProvisioningArtifact", + "AssociateTagOptionWithResource", + "BatchAssociateServiceActionWithProvisioningArtifact", + "BatchDisassociateServiceActionFromProvisioningArtifact", + "CopyProduct", "CreateConstraint", "CreatePortfolio", "CreatePortfolioShare", "CreateProduct", "CreateProvisionedProductPlan", "CreateProvisioningArtifact", + "CreateServiceAction", + "CreateTagOption", "DeleteConstraint", "DeletePortfolio", "DeletePortfolioShare", "DeleteProduct", "DeleteProvisionedProductPlan", "DeleteProvisioningArtifact", + "DeleteServiceAction", + "DeleteTagOption", "DescribeConstraint", + "DescribeCopyProductStatus", "DescribePortfolio", + "DescribePortfolioShareStatus", "DescribeProduct", "DescribeProductAsAdmin", "DescribeProductView", @@ -2658,21 +3002,33 @@ "DescribeProvisioningArtifact", "DescribeProvisioningParameters", "DescribeRecord", + "DescribeServiceAction", + "DescribeTagOption", + "DisableAWSOrganizationsAccess", "DisassociatePrincipalFromPortfolio", "DisassociateProductFromPortfolio", + "DisassociateServiceActionFromProvisioningArtifact", + "DisassociateTagOptionFromResource", + "EnableAWSOrganizationsAccess", "ExecuteProvisionedProductPlan", "ExecuteProvisionedProductServiceAction", + "GetAWSOrganizationsAccessStatus", "ListAcceptedPortfolioShares", "ListConstraintsForPortfolio", "ListLaunchPaths", + "ListOrganizationPortfolioAccess", "ListPortfolioAccess", "ListPortfolios", "ListPortfoliosForProduct", "ListPrincipalsForPortfolio", "ListProvisionedProductPlans", "ListProvisioningArtifacts", + "ListProvisioningArtifactsForServiceAction", "ListRecordHistory", + "ListResourcesForTagOption", + "ListServiceActions", "ListServiceActionsForProvisioningArtifact", + "ListTagOptions", "ProvisionProduct", "RejectPortfolioShare", "ScanProvisionedProducts", @@ -2684,9 +3040,11 @@ "UpdatePortfolio", "UpdateProduct", "UpdateProvisionedProduct", - "UpdateProvisioningArtifact" + "UpdateProvisioningArtifact", + "UpdateServiceAction", + "UpdateTagOption" ], - "HasResource": false, + "HasResource": true, "StringPrefix": "servicecatalog", "conditionKeys": [ "servicecatalog:accountLevel", @@ -2798,11 +3156,12 @@ "StringPrefix": "support" }, "AWS Systems Manager": { - "ARNFormat": "arn:aws:ssm:::", + "ARNFormat": "arn:aws:ssm:::", "ARNRegex": "^arn:aws:(ssm|ec2):.+", "Actions": [ "AddTagsToResource", "CancelCommand", + "CancelMaintenanceWindowExecution", "CreateActivation", "CreateAssociation", "CreateAssociationBatch", @@ -2813,6 +3172,7 @@ "DeleteActivation", "DeleteAssociation", "DeleteDocument", + "DeleteInventory", "DeleteMaintenanceWindow", "DeleteParameter", "DeleteParameters", @@ -2840,12 +3200,15 @@ "DescribeInstancePatchStatesForPatchGroup", "DescribeInstancePatches", "DescribeInstanceProperties", + "DescribeInventoryDeletions", "DescribeMaintenanceWindowExecutionTaskInvocations", "DescribeMaintenanceWindowExecutionTasks", "DescribeMaintenanceWindowExecutions", + "DescribeMaintenanceWindowSchedule", "DescribeMaintenanceWindowTargets", "DescribeMaintenanceWindowTasks", "DescribeMaintenanceWindows", + "DescribeMaintenanceWindowsForTarget", "DescribeParameters", "DescribePatchBaselines", "DescribePatchGroupState", @@ -2871,6 +3234,7 @@ "GetParametersByPath", "GetPatchBaseline", "GetPatchBaselineForPatchGroup", + "LabelParameterVersion", "ListAssociationVersions", "ListAssociations", "ListCommandInvocations", @@ -2917,6 +3281,9 @@ "HasResource": true, "StringPrefix": "ssm", "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys", "ssm:resourceTag/tag-key" ] }, @@ -2954,6 +3321,7 @@ "ARNFormat": "arn:aws:trustedadvisor:*::checks/{category}/{checkId}", "ARNRegex": "arn:aws:trustedadvisor:*", "Actions": [ + "DescribeAccountAccess", "DescribeCheckItems", "DescribeCheckRefreshStatuses", "DescribeCheckSummaries", @@ -2961,6 +3329,7 @@ "ExcludeCheckItems", "IncludeCheckItems", "RefreshCheck", + "SetAccountAccess", "UpdateNotificationPreferences" ], "HasResource": true, @@ -2985,6 +3354,7 @@ "DeleteByteMatchSet", "DeleteGeoMatchSet", "DeleteIPSet", + "DeleteLoggingConfiguration", "DeletePermissionPolicy", "DeleteRateBasedRule", "DeleteRegexMatchSet", @@ -3000,6 +3370,7 @@ "GetChangeTokenStatus", "GetGeoMatchSet", "GetIPSet", + "GetLoggingConfiguration", "GetPermissionPolicy", "GetRateBasedRule", "GetRateBasedRuleManagedKeys", @@ -3016,6 +3387,7 @@ "ListByteMatchSets", "ListGeoMatchSets", "ListIPSets", + "ListLoggingConfigurations", "ListRateBasedRules", "ListRegexMatchSets", "ListRegexPatternSets", @@ -3026,6 +3398,7 @@ "ListSubscribedRuleGroups", "ListWebACLs", "ListXssMatchSets", + "PutLoggingConfiguration", "PutPermissionPolicy", "UpdateByteMatchSet", "UpdateGeoMatchSet", @@ -3063,6 +3436,7 @@ "DeleteByteMatchSet", "DeleteGeoMatchSet", "DeleteIPSet", + "DeleteLoggingConfiguration", "DeletePermissionPolicy", "DeleteRateBasedRule", "DeleteRegexMatchSet", @@ -3079,6 +3453,7 @@ "GetChangeTokenStatus", "GetGeoMatchSet", "GetIPSet", + "GetLoggingConfiguration", "GetPermissionPolicy", "GetRateBasedRule", "GetRateBasedRuleManagedKeys", @@ -3096,6 +3471,7 @@ "ListByteMatchSets", "ListGeoMatchSets", "ListIPSets", + "ListLoggingConfigurations", "ListRateBasedRules", "ListRegexMatchSets", "ListRegexPatternSets", @@ -3107,6 +3483,7 @@ "ListSubscribedRuleGroups", "ListWebACLs", "ListXssMatchSets", + "PutLoggingConfiguration", "PutPermissionPolicy", "UpdateByteMatchSet", "UpdateGeoMatchSet", @@ -3136,6 +3513,8 @@ "StringPrefix": "wellarchitected" }, "AWS X-Ray": { + "ARNFormat": "arn:${Partition}:xray:${Region}:${Account}:${ResourceType}/${ResourceId}", + "ARNRegex": "^arn:${Partition}:xray:.+", "Actions": [ "BatchGetTraces", "CreateGroup", @@ -3149,6 +3528,7 @@ "GetSamplingStatisticSummaries", "GetSamplingTargets", "GetServiceGraph", + "GetTimeSeriesServiceStatistics", "GetTraceGraph", "GetTraceSummaries", "PutEncryptionConfig", @@ -3157,36 +3537,70 @@ "UpdateGroup", "UpdateSamplingRule" ], - "HasResource": false, + "HasResource": true, "StringPrefix": "xray" }, "Alexa for Business": { "ARNFormat": "arn:aws:a4b:::/", "ARNRegex": "^arn:aws:a4b:.+:.+:.+", "Actions": [ + "ApproveSkill", + "AssociateContactWithAddressBook", "AssociateDeviceWithRoom", "AssociateSkillGroupWithRoom", + "AssociateSkillWithSkillGroup", + "AssociateSkillWithUsers", + "CreateAddressBook", + "CreateBusinessReportSchedule", + "CreateConferenceProvider", + "CreateContact", "CreateProfile", "CreateRoom", "CreateSkillGroup", "CreateUser", + "DeleteAddressBook", + "DeleteBusinessReportSchedule", + "DeleteConferenceProvider", + "DeleteContact", + "DeleteDevice", "DeleteProfile", "DeleteRoom", "DeleteRoomSkillParameter", + "DeleteSkillAuthorization", "DeleteSkillGroup", "DeleteUser", + "DisassociateContactFromAddressBook", "DisassociateDeviceFromRoom", + "DisassociateSkillFromSkillGroup", + "DisassociateSkillFromUsers", "DisassociateSkillGroupFromRoom", + "ForgetSmartHomeAppliances", + "GetAddressBook", + "GetConferencePreference", + "GetConferenceProvider", + "GetContact", "GetDevice", "GetProfile", "GetRoom", "GetRoomSkillParameter", "GetSkillGroup", + "ListBusinessReportSchedules", + "ListConferenceProviders", + "ListDeviceEvents", "ListSkills", + "ListSkillsStoreCategories", + "ListSkillsStoreSkillsByCategory", + "ListSmartHomeAppliances", "ListTags", + "PutConferencePreference", "PutRoomSkillParameter", + "PutSkillAuthorization", + "RegisterAVSDevice", + "RejectSkill", "ResolveRoom", "RevokeInvitation", + "SearchAddressBooks", + "SearchContacts", "SearchDevices", "SearchProfiles", "SearchRooms", @@ -3194,15 +3608,27 @@ "SearchUsers", "SendInvitation", "StartDeviceSync", + "StartSmartHomeApplianceDiscovery", "TagResource", "UntagResource", + "UpdateAddressBook", + "UpdateBusinessReportSchedule", + "UpdateConferenceProvider", + "UpdateContact", "UpdateDevice", "UpdateProfile", "UpdateRoom", "UpdateSkillGroup" ], "HasResource": true, - "StringPrefix": "a4b" + "StringPrefix": "a4b", + "conditionKeys": [ + "a4b:amazonId", + "a4b:filters_deviceType", + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon API Gateway": { "ARNFormat": "arn:aws:execute-api:::///", @@ -3228,6 +3654,7 @@ "CreateImageBuilderStreamingURL", "CreateStack", "CreateStreamingURL", + "CreateUsageReportSubscription", "CreateUser", "DeleteDirectoryConfig", "DeleteFleet", @@ -3235,6 +3662,7 @@ "DeleteImageBuilder", "DeleteImagePermissions", "DeleteStack", + "DeleteUsageReportSubscription", "DeleteUser", "DescribeDirectoryConfigs", "DescribeFleets", @@ -3243,6 +3671,7 @@ "DescribeImages", "DescribeSessions", "DescribeStacks", + "DescribeUsageReportSubscriptions", "DescribeUserStackAssociations", "DescribeUsers", "DisableUser", @@ -3333,6 +3762,8 @@ "ConnectDirectory", "CreateAccount", "CreateApiKey", + "CreateBot", + "CreateBotMembership", "CreateCDRBucket", "CreatePhoneNumberOrder", "CreateVoiceConnector", @@ -3342,6 +3773,7 @@ "DeleteCDRBucket", "DeleteDelegate", "DeleteDomain", + "DeleteEventsConfiguration", "DeleteGroups", "DeletePhoneNumber", "DeleteVoiceConnector", @@ -3355,8 +3787,10 @@ "GetAccountResource", "GetAccountSettings", "GetAccountWithOpenIdConfig", + "GetBot", "GetCDRBucket", "GetDomain", + "GetEventsConfiguration", "GetGlobalSettings", "GetMeetingDetail", "GetPhoneNumber", @@ -3375,6 +3809,7 @@ "ListAccountUsageReportData", "ListAccounts", "ListApiKeys", + "ListBots", "ListCDRBucket", "ListCallingRegions", "ListDelegates", @@ -3389,9 +3824,11 @@ "ListVoiceConnectorTerminationCredentials", "ListVoiceConnectors", "LogoutUser", + "PutEventsConfiguration", "PutVoiceConnectorOrigination", "PutVoiceConnectorTermination", "PutVoiceConnectorTerminationCredentials", + "RegenerateSecurityToken", "RenameAccount", "RenewDelegate", "ResetAccountResource", @@ -3407,6 +3844,7 @@ "UpdateAccountOpenIdConfig", "UpdateAccountResource", "UpdateAccountSettings", + "UpdateBot", "UpdateCDRSettings", "UpdateGlobalSettings", "UpdatePhoneNumber", @@ -3562,6 +4000,8 @@ "StringPrefix": "cloudsearch" }, "Amazon CloudWatch": { + "ARNFormat": "arn:${Partition}:cloudwatch:${Region}:${Account}:${ResourceType}/${ResourcePath}", + "ARNRegex": "^arn:${Partition}:cloudwatch:.+", "Actions": [ "DeleteAlarms", "DeleteDashboards", @@ -3576,13 +4016,21 @@ "GetMetricWidgetImage", "ListDashboards", "ListMetrics", + "ListTagsForResource", "PutDashboard", "PutMetricAlarm", "PutMetricData", - "SetAlarmState" + "SetAlarmState", + "TagResource", + "UntagResource" ], - "HasResource": false, - "StringPrefix": "cloudwatch" + "HasResource": true, + "StringPrefix": "cloudwatch", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon CloudWatch Events": { "ARNFormat": "arn:aws::::/", @@ -3595,6 +4043,7 @@ "EnableRule", "ListRuleNamesByTarget", "ListRules", + "ListTagsForResource", "ListTargetsByRule", "PutEvents", "PutPermission", @@ -3602,11 +4051,16 @@ "PutTargets", "RemovePermission", "RemoveTargets", - "TestEventPattern" + "TagResource", + "TestEventPattern", + "UntagResource" ], "HasResource": true, "StringPrefix": "events", "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys", "events:TargetArn", "events:detail-type", "events:detail.eventTypeCode", @@ -3683,15 +4137,23 @@ "GetOpenIdTokenForDeveloperIdentity", "ListIdentities", "ListIdentityPools", + "ListTagsForResource", "LookupDeveloperIdentity", "MergeDeveloperIdentities", "SetIdentityPoolRoles", + "TagResource", "UnlinkDeveloperIdentity", "UnlinkIdentity", + "UntagResource", "UpdateIdentityPool" ], "HasResource": true, - "StringPrefix": "cognito-identity" + "StringPrefix": "cognito-identity", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon Cognito Sync": { "ARNFormat": "arn:aws:cognito-sync:::/:", @@ -3745,6 +4207,7 @@ "AdminResetUserPassword", "AdminRespondToAuthChallenge", "AdminSetUserMFAPreference", + "AdminSetUserPassword", "AdminSetUserSettings", "AdminUpdateAuthEventFeedback", "AdminUpdateDeviceStatus", @@ -3794,6 +4257,7 @@ "ListGroups", "ListIdentityProviders", "ListResourceServers", + "ListTagsForResource", "ListUserImportJobs", "ListUserPoolClients", "ListUserPools", @@ -3809,6 +4273,8 @@ "SignUp", "StartUserImportJob", "StopUserImportJob", + "TagResource", + "UntagResource", "UpdateAuthEventFeedback", "UpdateDeviceStatus", "UpdateGroup", @@ -3817,11 +4283,17 @@ "UpdateUserAttributes", "UpdateUserPool", "UpdateUserPoolClient", + "UpdateUserPoolDomain", "VerifySoftwareToken", "VerifyUserAttribute" ], "HasResource": true, - "StringPrefix": "cognito-idp" + "StringPrefix": "cognito-idp", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon Comprehend": { "ARNFormat": "arn:${Partition}:comprehend:${Region}:${AccountId}:${ResourceType}/${ResourceName}", @@ -3856,6 +4328,7 @@ "ListEntityRecognizers", "ListKeyPhrasesDetectionJobs", "ListSentimentDetectionJobs", + "ListTagsForResource", "ListTopicsDetectionJobs", "StartDocumentClassificationJob", "StartDominantLanguageDetectionJob", @@ -3868,10 +4341,17 @@ "StopKeyPhrasesDetectionJob", "StopSentimentDetectionJob", "StopTrainingDocumentClassifier", - "StopTrainingEntityRecognizer" + "StopTrainingEntityRecognizer", + "TagResource", + "UntagResource" ], "HasResource": true, - "StringPrefix": "comprehend" + "StringPrefix": "comprehend", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon Connect": { "ARNFormat": "arn:${Partition}:connect", @@ -4014,9 +4494,11 @@ "AdvertiseByoipCidr", "AllocateAddress", "AllocateHosts", + "ApplySecurityGroupsToClientVpnTargetNetwork", "AssignIpv6Addresses", "AssignPrivateIpAddresses", "AssociateAddress", + "AssociateClientVpnTargetNetwork", "AssociateDhcpOptions", "AssociateIamInstanceProfile", "AssociateRouteTable", @@ -4028,6 +4510,7 @@ "AttachNetworkInterface", "AttachVolume", "AttachVpnGateway", + "AuthorizeClientVpnIngress", "AuthorizeSecurityGroupEgress", "AuthorizeSecurityGroupIngress", "BundleInstance", @@ -4044,6 +4527,8 @@ "CopyImage", "CopySnapshot", "CreateCapacityReservation", + "CreateClientVpnEndpoint", + "CreateClientVpnRoute", "CreateCustomerGateway", "CreateDefaultSubnet", "CreateDefaultVpc", @@ -4069,6 +4554,7 @@ "CreateRouteTable", "CreateSecurityGroup", "CreateSnapshot", + "CreateSnapshots", "CreateSpotDatafeedSubscription", "CreateSubnet", "CreateTags", @@ -4085,6 +4571,8 @@ "CreateVpnConnection", "CreateVpnConnectionRoute", "CreateVpnGateway", + "DeleteClientVpnEndpoint", + "DeleteClientVpnRoute", "DeleteCustomerGateway", "DeleteDhcpOptions", "DeleteEgressOnlyInternetGateway", @@ -4131,6 +4619,11 @@ "DescribeByoipCidrs", "DescribeCapacityReservations", "DescribeClassicLinkInstances", + "DescribeClientVpnAuthorizationRules", + "DescribeClientVpnConnections", + "DescribeClientVpnEndpoints", + "DescribeClientVpnRoutes", + "DescribeClientVpnTargetNetworks", "DescribeConversionTasks", "DescribeCustomerGateways", "DescribeDhcpOptions", @@ -4223,6 +4716,7 @@ "DisableVpcClassicLink", "DisableVpcClassicLinkDnsSupport", "DisassociateAddress", + "DisassociateClientVpnTargetNetwork", "DisassociateIamInstanceProfile", "DisassociateRouteTable", "DisassociateSubnetCidrBlock", @@ -4233,6 +4727,8 @@ "EnableVolumeIO", "EnableVpcClassicLink", "EnableVpcClassicLinkDnsSupport", + "ExportClientVpnClientCertificateRevocationList", + "ExportClientVpnClientConfiguration", "ExportTransitGatewayRoutes", "GetConsoleOutput", "GetConsoleScreenshot", @@ -4243,12 +4739,14 @@ "GetTransitGatewayAttachmentPropagations", "GetTransitGatewayRouteTableAssociations", "GetTransitGatewayRouteTablePropagations", + "ImportClientVpnClientCertificateRevocationList", "ImportImage", "ImportInstance", "ImportKeyPair", "ImportSnapshot", "ImportVolume", "ModifyCapacityReservation", + "ModifyClientVpnEndpoint", "ModifyFleet", "ModifyFpgaImageAttribute", "ModifyHosts", @@ -4258,6 +4756,7 @@ "ModifyInstanceAttribute", "ModifyInstanceCapacityReservationAttributes", "ModifyInstanceCreditSpecification", + "ModifyInstanceEventStartTime", "ModifyInstancePlacement", "ModifyLaunchTemplate", "ModifyNetworkInterfaceAttribute", @@ -4303,6 +4802,7 @@ "ResetNetworkInterfaceAttribute", "ResetSnapshotAttribute", "RestoreAddressToClassic", + "RevokeClientVpnIngress", "RevokeSecurityGroupEgress", "RevokeSecurityGroupIngress", "RunInstances", @@ -4310,6 +4810,7 @@ "SearchTransitGatewayRoutes", "StartInstances", "StopInstances", + "TerminateClientVpnConnections", "TerminateInstances", "UnassignIpv6Addresses", "UnassignPrivateIpAddresses", @@ -4435,6 +4936,7 @@ "autoscaling:TargetGroupARNs", "autoscaling:VPCZoneIdentifiers", "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", "aws:TagKeys" ] }, @@ -4531,16 +5033,19 @@ "Actions": [ "CreateCluster", "CreateService", - "DeleteAccountSettings", + "CreateTaskSet", + "DeleteAccountSetting", "DeleteAttributes", "DeleteCluster", "DeleteService", + "DeleteTaskSet", "DeregisterContainerInstance", "DeregisterTaskDefinition", "DescribeClusters", "DescribeContainerInstances", "DescribeServices", "DescribeTaskDefinition", + "DescribeTaskSets", "DescribeTasks", "DiscoverPollEndpoint", "ListAccountSettings", @@ -4568,7 +5073,9 @@ "UntagResource", "UpdateContainerAgent", "UpdateContainerInstancesState", - "UpdateService" + "UpdateService", + "UpdateServicePrimaryTaskSet", + "UpdateTaskSet" ], "HasResource": true, "StringPrefix": "ecs", @@ -4578,7 +5085,9 @@ "aws:TagKeys", "ecs:ResourceTag/${TagKey}", "ecs:cluster", - "ecs:container-instances" + "ecs:container-instances", + "ecs:service", + "ecs:task-definition" ] }, "Amazon Elastic Container Service for Kubernetes": { @@ -4761,6 +5270,8 @@ ] }, "Amazon FreeRTOS": { + "ARNFormat": "arn:aws:freertos:::/", + "ARNRegex": "^arn:aws:freertos:.+:[0-9]+:.+", "Actions": [ "CreateSoftwareConfiguration", "DeleteSoftwareConfiguration", @@ -4774,8 +5285,13 @@ "ListSoftwareConfigurations", "UpdateSoftwareConfiguration" ], - "HasResource": false, - "StringPrefix": "freertos" + "HasResource": true, + "StringPrefix": "freertos", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon GameLift": { "Actions": [ @@ -5011,12 +5527,57 @@ "DescribeApplication", "DiscoverInputSchema", "ListApplications", + "ListTagsForResource", "StartApplication", "StopApplication", + "TagResource", + "UntagResource", "UpdateApplication" ], "HasResource": true, - "StringPrefix": "kinesisanalytics" + "StringPrefix": "kinesisanalytics", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] + }, + "Amazon Kinesis Analytics V2": { + "ARNFormat": "arn:aws:kinesisanalytics:::application/", + "ARNRegex": "^arn:aws:kinesisanalytics:.+:[0-9]+:application/[a-zA-Z0-9_.-]+", + "Actions": [ + "AddApplicationCloudWatchLoggingOption", + "AddApplicationInput", + "AddApplicationInputProcessingConfiguration", + "AddApplicationOutput", + "AddApplicationReferenceDataSource", + "CreateApplication", + "CreateApplicationSnapshot", + "DeleteApplication", + "DeleteApplicationCloudWatchLoggingOption", + "DeleteApplicationInputProcessingConfiguration", + "DeleteApplicationOutput", + "DeleteApplicationReferenceDataSource", + "DeleteApplicationSnapshot", + "DescribeApplication", + "DescribeApplicationSnapshot", + "DiscoverInputSchema", + "ListApplicationSnapshots", + "ListApplications", + "ListTagsForResource", + "StartApplication", + "StopApplication", + "TagResource", + "UntagResource", + "UpdateApplication" + ], + "HasResource": true, + "StringPrefix": "kinesisanalytics", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon Kinesis Firehose": { "ARNFormat": "arn:aws:firehose:::deliverystream/", @@ -5125,26 +5686,55 @@ "ARNRegex": "arn:aws:lightsail:.+", "Actions": [ "AllocateStaticIp", + "AttachDisk", + "AttachInstancesToLoadBalancer", + "AttachLoadBalancerTlsCertificate", "AttachStaticIp", "CloseInstancePublicPorts", + "CopySnapshot", + "CreateCloudFormationStack", + "CreateDisk", + "CreateDiskFromSnapshot", + "CreateDiskSnapshot", "CreateDomain", "CreateDomainEntry", "CreateInstanceSnapshot", "CreateInstances", "CreateInstancesFromSnapshot", "CreateKeyPair", + "CreateLoadBalancer", + "CreateLoadBalancerTlsCertificate", + "CreateRelationalDatabase", + "CreateRelationalDatabaseFromSnapshot", + "CreateRelationalDatabaseSnapshot", + "DeleteDisk", + "DeleteDiskSnapshot", "DeleteDomain", "DeleteDomainEntry", "DeleteInstance", "DeleteInstanceSnapshot", "DeleteKeyPair", + "DeleteKnownHostKeys", + "DeleteLoadBalancer", + "DeleteLoadBalancerTlsCertificate", + "DeleteRelationalDatabase", + "DeleteRelationalDatabaseSnapshot", + "DetachDisk", + "DetachInstancesFromLoadBalancer", "DetachStaticIp", "DownloadDefaultKeyPair", + "ExportSnapshot", "GetActiveNames", "GetBlueprints", "GetBundles", + "GetCloudFormationStackRecords", + "GetDisk", + "GetDiskSnapshot", + "GetDiskSnapshots", + "GetDisks", "GetDomain", "GetDomains", + "GetExportSnapshotRecords", "GetInstance", "GetInstanceAccessDetails", "GetInstanceMetricData", @@ -5155,22 +5745,47 @@ "GetInstances", "GetKeyPair", "GetKeyPairs", + "GetLoadBalancer", + "GetLoadBalancerMetricData", + "GetLoadBalancerTlsCertificates", + "GetLoadBalancers", "GetOperation", "GetOperations", "GetOperationsForResource", "GetRegions", + "GetRelationalDatabase", + "GetRelationalDatabaseBlueprints", + "GetRelationalDatabaseBundles", + "GetRelationalDatabaseEvents", + "GetRelationalDatabaseLogEvents", + "GetRelationalDatabaseLogStreams", + "GetRelationalDatabaseMasterUserPassword", + "GetRelationalDatabaseMetricData", + "GetRelationalDatabaseParameters", + "GetRelationalDatabaseSnapshot", + "GetRelationalDatabaseSnapshots", + "GetRelationalDatabases", "GetStaticIp", "GetStaticIps", "ImportKeyPair", "IsVpcPeered", "OpenInstancePublicPorts", "PeerVpc", + "PutInstancePublicPorts", "RebootInstance", + "RebootRelationalDatabase", "ReleaseStaticIp", "StartInstance", + "StartRelationalDatabase", "StopInstance", + "StopRelationalDatabase", + "TagResource", "UnpeerVpc", - "UpdateDomainEntry" + "UntagResource", + "UpdateDomainEntry", + "UpdateLoadBalancerAttribute", + "UpdateRelationalDatabase", + "UpdateRelationalDatabaseParameters" ], "HasResource": true, "StringPrefix": "lightsail" @@ -5187,6 +5802,8 @@ "DeleteTags", "DeleteUser", "DescribeBroker", + "DescribeBrokerEngineTypes", + "DescribeBrokerInstanceOptions", "DescribeConfiguration", "DescribeConfigurationRevision", "DescribeUser", @@ -5201,7 +5818,12 @@ "UpdateUser" ], "HasResource": true, - "StringPrefix": "mq" + "StringPrefix": "mq", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon Machine Learning": { "ARNFormat": "arn:aws:machinelearning:::/", @@ -5255,17 +5877,61 @@ "aws:SourceArn" ] }, + "Amazon Managed Blockchain": { + "ARNFormat": "arn:aws:managedblockchain:::/", + "ARNRegex": "^arn:aws:managedblockchain:.+:[0-9]+:.+", + "Actions": [ + "CreateMember", + "CreateNetwork", + "CreateNode", + "CreateProposal", + "DeleteMember", + "DeleteNode", + "GetMember", + "GetNetwork", + "GetNode", + "GetProposal", + "ListInvitations", + "ListMembers", + "ListNetworks", + "ListNodes", + "ListProposalVotes", + "ListProposals", + "RejectInvitation", + "VoteOnProposal" + ], + "HasResource": true, + "StringPrefix": "managedblockchain" + }, "Amazon Managed Streaming for Kafka": { + "ARNFormat": "arn:aws:kafka::://", + "ARNRegex": "^arn:aws:kafka:.+", "Actions": [ "CreateCluster", + "CreateConfiguration", "DeleteCluster", "DescribeCluster", + "DescribeClusterOperation", + "DescribeConfiguration", + "DescribeConfigurationRevision", "GetBootstrapBrokers", + "ListClusterOperations", "ListClusters", - "ListNodes" + "ListConfigurations", + "ListNodes", + "ListTagsForResource", + "TagResource", + "UntagResource", + "UpdateBrokerStorage", + "UpdateClusterConfiguration" ], - "HasResource": false, - "StringPrefix": "kafka" + "HasResource": true, + "StringPrefix": "kafka", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon Mechanical Turk": { "Actions": [ @@ -5346,6 +6012,53 @@ "HasResource": true, "StringPrefix": "neptune-db" }, + "Amazon Personalize": { + "ARNFormat": "arn:aws:personalize:::/", + "ARNRegex": "^arn:aws:personalize:.+:.+:.+", + "Actions": [ + "CreateCampaign", + "CreateDataset", + "CreateDatasetGroup", + "CreateDatasetImportJob", + "CreateEventTracker", + "CreateSchema", + "CreateSolution", + "CreateSolutionVersion", + "DeleteCampaign", + "DeleteDataset", + "DeleteDatasetGroup", + "DeleteEventTracker", + "DeleteSchema", + "DeleteSolution", + "DescribeAlgorithm", + "DescribeCampaign", + "DescribeDataset", + "DescribeDatasetGroup", + "DescribeDatasetImportJob", + "DescribeEventTracker", + "DescribeFeatureTransformation", + "DescribeRecipe", + "DescribeSchema", + "DescribeSolution", + "DescribeSolutionVersion", + "GetPersonalizedRanking", + "GetRecommendations", + "GetSolutionMetrics", + "ListCampaigns", + "ListDatasetGroups", + "ListDatasetImportJobs", + "ListDatasets", + "ListEventTrackers", + "ListRecipes", + "ListSchemas", + "ListSolutionVersions", + "ListSolutions", + "PutEvents", + "UpdateCampaign" + ], + "HasResource": true, + "StringPrefix": "personalize" + }, "Amazon Pinpoint": { "ARNFormat": "arn:aws:mobiletargeting:::.+", "ARNRegex": "^arn:aws:mobiletargeting:.+", @@ -5407,6 +6120,7 @@ "PhoneNumberValidate", "PutEventStream", "PutEvents", + "RemoveAttributes", "SendMessages", "SendUsersMessages", "TagResource", @@ -5435,6 +6149,63 @@ "aws:TagKeys" ] }, + "Amazon Pinpoint Email Service": { + "ARNFormat": "arn:aws:ses:::/", + "ARNRegex": "^arn:aws:ses:.+:[0-9]+:.+", + "Actions": [ + "CreateConfigurationSet", + "CreateConfigurationSetEventDestination", + "CreateDedicatedIpPool", + "CreateDeliverabilityTestReport", + "CreateEmailIdentity", + "DeleteConfigurationSet", + "DeleteConfigurationSetEventDestination", + "DeleteDedicatedIpPool", + "DeleteEmailIdentity", + "GetAccount", + "GetBlacklistReports", + "GetConfigurationSet", + "GetConfigurationSetEventDestinations", + "GetDedicatedIp", + "GetDedicatedIps", + "GetDeliverabilityDashboardOptions", + "GetDeliverabilityTestReport", + "GetDomainStatisticsReport", + "GetEmailIdentity", + "ListConfigurationSets", + "ListDedicatedIpPools", + "ListDeliverabilityTestReports", + "ListEmailIdentities", + "ListTagsForResource", + "PutAccountDedicatedIpWarmupAttributes", + "PutAccountSendingAttributes", + "PutConfigurationSetDeliveryOptions", + "PutConfigurationSetReputationOptions", + "PutConfigurationSetSendingOptions", + "PutConfigurationSetTrackingOptions", + "PutDedicatedIpInPool", + "PutDedicatedIpWarmupAttributes", + "PutDeliverabilityDashboardOption", + "PutEmailIdentityDkimAttributes", + "PutEmailIdentityFeedbackAttributes", + "PutEmailIdentityMailFromAttributes", + "SendEmail", + "TagResource", + "UntagResource", + "UpdateConfigurationSetEventDestination" + ], + "HasResource": true, + "StringPrefix": "ses", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys", + "ses:FeedbackAddress", + "ses:FromAddress", + "ses:FromDisplayName", + "ses:Recipients" + ] + }, "Amazon Pinpoint SMS and Voice Service": { "ARNFormat": "arn:aws:sms-voice:::/", "ARNRegex": "^arn:aws:sms-voice:.+:.+:.+", @@ -5480,6 +6251,7 @@ "DeleteGroup", "DeleteGroupMembership", "DeleteUser", + "DeleteUserByPrincipalId", "DescribeGroup", "DescribeUser", "GetDashboardEmbedUrl", @@ -5493,7 +6265,8 @@ "SetGroupMapping", "Subscribe", "Unsubscribe", - "UpdateGroup" + "UpdateGroup", + "UpdateUser" ], "HasResource": true, "StringPrefix": "quicksight", @@ -5508,15 +6281,19 @@ "ARNRegex": "^arn:aws:rds:.+", "Actions": [ "AddRoleToDBCluster", + "AddRoleToDBInstance", "AddSourceIdentifierToSubscription", "AddTagsToResource", "ApplyPendingMaintenanceAction", "AuthorizeDBSecurityGroupIngress", + "BacktrackDBCluster", + "CopyDBClusterParameterGroup", "CopyDBClusterSnapshot", "CopyDBParameterGroup", "CopyDBSnapshot", "CopyOptionGroup", "CreateDBCluster", + "CreateDBClusterEndpoint", "CreateDBClusterParameterGroup", "CreateDBClusterSnapshot", "CreateDBInstance", @@ -5526,25 +6303,32 @@ "CreateDBSnapshot", "CreateDBSubnetGroup", "CreateEventSubscription", + "CreateGlobalCluster", "CreateOptionGroup", "DeleteDBCluster", + "DeleteDBClusterEndpoint", "DeleteDBClusterParameterGroup", "DeleteDBClusterSnapshot", "DeleteDBInstance", + "DeleteDBInstanceAutomatedBackup", "DeleteDBParameterGroup", "DeleteDBSecurityGroup", "DeleteDBSnapshot", "DeleteDBSubnetGroup", "DeleteEventSubscription", + "DeleteGlobalCluster", "DeleteOptionGroup", "DescribeAccountAttributes", "DescribeCertificates", + "DescribeDBClusterBacktracks", + "DescribeDBClusterEndpoints", "DescribeDBClusterParameterGroups", "DescribeDBClusterParameters", "DescribeDBClusterSnapshotAttributes", "DescribeDBClusterSnapshots", "DescribeDBClusters", "DescribeDBEngineVersions", + "DescribeDBInstanceAutomatedBackups", "DescribeDBInstances", "DescribeDBLogFiles", "DescribeDBParameterGroups", @@ -5558,12 +6342,14 @@ "DescribeEventCategories", "DescribeEventSubscriptions", "DescribeEvents", + "DescribeGlobalClusters", "DescribeOptionGroupOptions", "DescribeOptionGroups", "DescribeOrderableDBInstanceOptions", "DescribePendingMaintenanceActions", "DescribeReservedDBInstances", "DescribeReservedDBInstancesOfferings", + "DescribeSourceRegions", "DescribeValidDBInstanceModifications", "DownloadCompleteDBLogFile", "DownloadDBLogFilePortion", @@ -5571,24 +6357,33 @@ "ListTagsForResource", "ModifyCurrentDBClusterCapacity", "ModifyDBCluster", + "ModifyDBClusterEndpoint", "ModifyDBClusterParameterGroup", "ModifyDBClusterSnapshotAttribute", "ModifyDBInstance", "ModifyDBParameterGroup", + "ModifyDBSnapshot", "ModifyDBSnapshotAttribute", "ModifyDBSubnetGroup", "ModifyEventSubscription", + "ModifyGlobalCluster", "ModifyOptionGroup", "PromoteReadReplica", + "PromoteReadReplicaDBCluster", "PurchaseReservedDBInstancesOffering", "RebootDBInstance", + "RemoveFromGlobalCluster", + "RemoveRoleFromDBCluster", + "RemoveRoleFromDBInstance", "RemoveSourceIdentifierFromSubscription", "RemoveTagsFromResource", "ResetDBClusterParameterGroup", "ResetDBParameterGroup", + "RestoreDBClusterFromS3", "RestoreDBClusterFromSnapshot", "RestoreDBClusterToPointInTime", "RestoreDBInstanceFromDBSnapshot", + "RestoreDBInstanceFromS3", "RestoreDBInstanceToPointInTime", "RevokeDBSecurityGroupIngress", "StartDBCluster", @@ -5603,8 +6398,10 @@ "rds:DatabaseClass", "rds:DatabaseEngine", "rds:DatabaseName", + "rds:EndpointType", "rds:MultiAz", "rds:Piops", + "rds:StorageEncrypted", "rds:StorageSize", "rds:Vpc", "rds:cluster-pg-tag", @@ -5614,6 +6411,7 @@ "rds:es-tag", "rds:og-tag", "rds:pg-tag", + "rds:req-tag", "rds:ri-tag", "rds:secgrp-tag", "rds:snapshot-tag", @@ -5629,6 +6427,7 @@ "AuthorizeSnapshotAccess", "BatchDeleteClusterSnapshots", "BatchModifyClusterSnapshots", + "CancelQuery", "CancelQuerySession", "CancelResize", "CopyClusterSnapshot", @@ -5641,6 +6440,7 @@ "CreateEventSubscription", "CreateHsmClientCertificate", "CreateHsmConfiguration", + "CreateSavedQuery", "CreateSnapshotCopyGrant", "CreateSnapshotSchedule", "CreateTags", @@ -5652,6 +6452,7 @@ "DeleteEventSubscription", "DeleteHsmClientCertificate", "DeleteHsmConfiguration", + "DeleteSavedQueries", "DeleteSnapshotCopyGrant", "DeleteSnapshotSchedule", "DeleteTags", @@ -5673,21 +6474,29 @@ "DescribeHsmConfigurations", "DescribeLoggingStatus", "DescribeOrderableClusterOptions", + "DescribeQuery", "DescribeReservedNodeOfferings", "DescribeReservedNodes", "DescribeResize", "DescribeSnapshotCopyGrants", "DescribeSnapshotSchedules", "DescribeStorage", + "DescribeTable", "DescribeTableRestoreStatus", "DescribeTags", "DisableLogging", "DisableSnapshotCopy", "EnableLogging", "EnableSnapshotCopy", + "ExecuteQuery", + "FetchResults", "GetClusterCredentials", "GetReservedNodeExchangeOfferings", "JoinGroup", + "ListDatabases", + "ListSavedQueries", + "ListSchemas", + "ListTables", "ModifyCluster", "ModifyClusterDbRevision", "ModifyClusterIamRoles", @@ -5697,6 +6506,7 @@ "ModifyClusterSnapshotSchedule", "ModifyClusterSubnetGroup", "ModifyEventSubscription", + "ModifySavedQuery", "ModifySnapshotCopyRetentionPeriod", "ModifySnapshotSchedule", "PurchaseReservedNodeOffering", @@ -5708,6 +6518,7 @@ "RevokeClusterSecurityGroupIngress", "RevokeSnapshotAccess", "RotateEncryptionKey", + "ViewQueriesFromConsole", "ViewQueriesInConsole" ], "HasResource": true, @@ -5728,6 +6539,7 @@ "DeleteCollection", "DeleteFaces", "DeleteStreamProcessor", + "DescribeCollection", "DescribeStreamProcessor", "DetectFaces", "DetectLabels", @@ -5899,6 +6711,7 @@ "Actions": [ "AbortMultipartUpload", "CreateBucket", + "CreateJob", "DeleteBucket", "DeleteBucketPolicy", "DeleteBucketWebsite", @@ -5906,6 +6719,7 @@ "DeleteObjectTagging", "DeleteObjectVersion", "DeleteObjectVersionTagging", + "DescribeJob", "GetAccelerateConfiguration", "GetAccountPublicAccessBlock", "GetAnalyticsConfiguration", @@ -5914,6 +6728,7 @@ "GetBucketLocation", "GetBucketLogging", "GetBucketNotification", + "GetBucketObjectLockConfiguration", "GetBucketPolicy", "GetBucketPolicyStatus", "GetBucketPublicAccessBlock", @@ -5927,6 +6742,8 @@ "GetMetricsConfiguration", "GetObject", "GetObjectAcl", + "GetObjectLegalHold", + "GetObjectRetention", "GetObjectTagging", "GetObjectTorrent", "GetObjectVersion", @@ -5941,6 +6758,7 @@ "ListBucketByTags", "ListBucketMultipartUploads", "ListBucketVersions", + "ListJobs", "ListMultipartUploadParts", "ObjectOwnerOverrideToBucketOwner", "PutAccelerateConfiguration", @@ -5950,6 +6768,7 @@ "PutBucketCORS", "PutBucketLogging", "PutBucketNotification", + "PutBucketObjectLockConfiguration", "PutBucketPolicy", "PutBucketPublicAccessBlock", "PutBucketRequestPayment", @@ -5962,6 +6781,8 @@ "PutMetricsConfiguration", "PutObject", "PutObjectAcl", + "PutObjectLegalHold", + "PutObjectRetention", "PutObjectTagging", "PutObjectVersionAcl", "PutObjectVersionTagging", @@ -5969,13 +6790,20 @@ "ReplicateDelete", "ReplicateObject", "ReplicateTags", - "RestoreObject" + "RestoreObject", + "UpdateJobPriority", + "UpdateJobStatus" ], "HasResource": true, "StringPrefix": "s3", "conditionKeys": [ + "s3:ExistingJobOperation", + "s3:ExistingJobPriority", "s3:ExistingObjectTag/", + "s3:JobSuspendedCause", "s3:LocationConstraint", + "s3:RequestJobOperation", + "s3:RequestJobPriority", "s3:RequestObjectTag/", "s3:RequestObjectTagKeys", "s3:VersionId", @@ -5983,6 +6811,10 @@ "s3:delimiter", "s3:locationconstraint", "s3:max-keys", + "s3:object-lock-legal-hold", + "s3:object-lock-mode", + "s3:object-lock-remaining-retention-days", + "s3:object-lock-retain-until-date", "s3:prefix", "s3:signatureage", "s3:signatureversion", @@ -6354,6 +7186,7 @@ "AddTagsToResource", "AddUploadBuffer", "AddWorkingStorage", + "AttachVolume", "CancelArchival", "CancelRetrieval", "CreateCachediSCSIVolume", @@ -6389,6 +7222,7 @@ "DescribeUploadBuffer", "DescribeVTLDevices", "DescribeWorkingStorage", + "DetachVolume", "DisableGateway", "JoinDomain", "ListFileShares", @@ -6420,7 +7254,12 @@ "UpdateVTLDeviceType" ], "HasResource": true, - "StringPrefix": "storagegateway" + "StringPrefix": "storagegateway", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] }, "Amazon Sumerian": { "ARNFormat": "arn:aws:sumerian:::", @@ -6450,9 +7289,16 @@ "ARNFormat": "arn:${Partition}:transcribe:${Region}:${AccountId}:${ResourceType}/${ResourceName}", "ARNRegex": "^arn:${Partition}:transcribe:.+:.+:.+", "Actions": [ + "CreateVocabulary", + "DeleteTranscriptionJob", + "DeleteVocabulary", "GetTranscriptionJob", + "GetVocabulary", "ListTranscriptionJobs", - "StartTranscriptionJob" + "ListVocabularies", + "StartStreamTranscription", + "StartTranscriptionJob", + "UpdateVocabulary" ], "HasResource": false, "StringPrefix": "transcribe" @@ -6477,35 +7323,47 @@ "AddResourcePermissions", "AddUserToGroup", "CheckAlias", + "CreateComment", + "CreateCustomMetadata", "CreateFolder", "CreateInstance", + "CreateLabels", "CreateNotificationSubscription", "CreateUser", "DeactivateUser", + "DeleteComment", + "DeleteCustomMetadata", "DeleteDocument", "DeleteFolder", "DeleteFolderContents", "DeleteInstance", + "DeleteLabels", "DeleteNotificationSubscription", "DeleteUser", "DeregisterDirectory", + "DescribeActivities", "DescribeAvailableDirectories", + "DescribeComments", "DescribeDocumentVersions", "DescribeFolderContents", + "DescribeGroups", "DescribeInstances", "DescribeNotificationSubscriptions", "DescribeResourcePermissions", + "DescribeRootFolders", "DescribeUsers", + "DownloadDocumentVersion", + "GetCurrentUser", "GetDocument", "GetDocumentPath", "GetDocumentVersion", "GetFolder", "GetFolderPath", + "GetResources", "InitiateDocumentVersionUpload", "RegisterDirectory", "RemoveAllResourcePermissions", "RemoveResourcePermission", - "RemoveUserFromGroup", "UpdateDocument", "UpdateDocumentVersion", "UpdateFolder", @@ -6587,20 +7445,38 @@ "ARNFormat": "arn:aws:workspaces:*:*", "ARNRegex": "arn:aws:workspaces:*", "Actions": [ + "AssociateIpGroups", + "AuthorizeIpRules", + "CreateIpGroup", "CreateTags", "CreateWorkspaces", + "DeleteIpGroup", "DeleteTags", + "DeleteWorkspaceImage", + "DescribeAccount", + "DescribeAccountModifications", + "DescribeClientProperties", + "DescribeIpGroups", "DescribeTags", "DescribeWorkspaceBundles", "DescribeWorkspaceDirectories", + "DescribeWorkspaceImages", "DescribeWorkspaces", "DescribeWorkspacesConnectionStatus", + "DisassociateIpGroups", + "ImportWorkspaceImage", + "ListAvailableManagementCidrRanges", + "ModifyAccount", + "ModifyClientProperties", "ModifyWorkspaceProperties", + "ModifyWorkspaceState", "RebootWorkspaces", "RebuildWorkspaces", + "RevokeIpRules", "StartWorkspaces", "StopWorkspaces", - "TerminateWorkspaces" + "TerminateWorkspaces", + "UpdateRulesOfIpGroup" ], "HasResource": true, "StringPrefix": "workspaces" @@ -6830,31 +7706,6 @@ "elasticloadbalancing:ResourceTag/tag-key" ] }, - "Global Accelerator": { - "ARNFormat": "arn:aws:globalaccelerator:::accelerator/", - "ARNRegex": "^arn:aws:globalaccelerator::.+:.+", - "Actions": [ - "CreateAccelerator", - "CreateEndpointGroup", - "CreateListener", - "DeleteAccelerator", - "DeleteEndpointGroup", - "DeleteListener", - "DescribeAccelerator", - "DescribeAcceleratorAttributes", - "DescribeEndpointGroup", - "DescribeListener", - "ListAccelerators", - "ListEndpointGroups", - "ListListeners", - "UpdateAccelerator", - "UpdateAcceleratorAttributes", - "UpdateEndpointGroup", - "UpdateListener" - ], - "HasResource": true, - "StringPrefix": "globalaccelerator" - }, "Identity And Access Management": { "ARNFormat": "arn:aws:iam:::", "ARNRegex": "^arn:aws:iam::.+", @@ -6974,6 +7825,7 @@ "ResetServiceSpecificCredential", "ResyncMFADevice", "SetDefaultPolicyVersion", + "SetSecurityTokenServicePreferences", "SimulateCustomPolicy", "SimulatePrincipalPolicy", "TagRole", @@ -7022,7 +7874,23 @@ "OPTIONS" ], "HasResource": true, - "StringPrefix": "apigateway" + "StringPrefix": "apigateway", + "conditionKeys": [ + "aws:RequestTag/${TagKey}", + "aws:ResourceTag/${TagKey}", + "aws:TagKeys" + ] + }, + "The Data API allows access to RDS databases using web services-based APIs": { + "Actions": [ + "BatchExecuteStatement", + "BeginTransaction", + "CommitTransaction", + "ExecuteStatement", + "RollbackTransaction" + ], + "HasResource": false, + "StringPrefix": "rds-data" } } } \ No newline at end of file diff --git a/src/cfnlint/data/CloudSpecs/ap-east-1.json b/src/cfnlint/data/CloudSpecs/ap-east-1.json index 88ec089d0b..1d30f5b644 100644 --- a/src/cfnlint/data/CloudSpecs/ap-east-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-east-1.json @@ -21707,14 +21707,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c5.18xlarge", "c5.2xlarge", "c5.4xlarge", @@ -21738,29 +21730,37 @@ "i3.large", "i3.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t3.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json index 1439bf4c3b..c38ddb06fd 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-1.json @@ -43877,18 +43877,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -43967,22 +43955,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -44005,21 +43999,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json index 06672b46f6..cac85dcca3 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-2.json @@ -38937,14 +38937,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", @@ -38998,16 +38990,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -39029,15 +39025,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json index fd47e18b9d..b0360bda1b 100644 --- a/src/cfnlint/data/CloudSpecs/ap-northeast-3.json +++ b/src/cfnlint/data/CloudSpecs/ap-northeast-3.json @@ -24162,14 +24162,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", @@ -24213,16 +24205,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -24238,15 +24234,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/ap-south-1.json b/src/cfnlint/data/CloudSpecs/ap-south-1.json index f0ca33ae15..8f639f7c32 100644 --- a/src/cfnlint/data/CloudSpecs/ap-south-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-south-1.json @@ -37945,14 +37945,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -37991,16 +37983,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -38019,15 +38015,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json index d40896fa19..d70d07abf8 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-1.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-1.json @@ -39053,18 +39053,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -39130,16 +39118,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -39149,9 +39141,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -39173,15 +39167,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -39191,9 +39189,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json index 518c5db2d7..d8c16e86b6 100644 --- a/src/cfnlint/data/CloudSpecs/ap-southeast-2.json +++ b/src/cfnlint/data/CloudSpecs/ap-southeast-2.json @@ -43820,18 +43820,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -43898,22 +43886,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -43935,21 +43929,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/CloudSpecs/ca-central-1.json b/src/cfnlint/data/CloudSpecs/ca-central-1.json index b48a57faff..026791f23a 100644 --- a/src/cfnlint/data/CloudSpecs/ca-central-1.json +++ b/src/cfnlint/data/CloudSpecs/ca-central-1.json @@ -33065,14 +33065,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -33110,16 +33102,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -33133,15 +33129,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/eu-central-1.json b/src/cfnlint/data/CloudSpecs/eu-central-1.json index 84545f03b9..a923eef6da 100644 --- a/src/cfnlint/data/CloudSpecs/eu-central-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-central-1.json @@ -44058,18 +44058,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", @@ -44139,22 +44127,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -44176,21 +44170,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/eu-north-1.json b/src/cfnlint/data/CloudSpecs/eu-north-1.json index 2ffdf8add7..442f6e4f96 100644 --- a/src/cfnlint/data/CloudSpecs/eu-north-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-north-1.json @@ -19142,6 +19142,424 @@ } } }, + "AWS::Glue::Classifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", + "Properties": { + "CsvClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", + "Required": false, + "Type": "CsvClassifier", + "UpdateType": "Mutable" + }, + "GrokClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", + "Required": false, + "Type": "GrokClassifier", + "UpdateType": "Mutable" + }, + "JsonClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", + "Required": false, + "Type": "JsonClassifier", + "UpdateType": "Mutable" + }, + "XMLClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", + "Required": false, + "Type": "XMLClassifier", + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::Connection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "ConnectionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", + "Required": true, + "Type": "ConnectionInput", + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::Crawler": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", + "Properties": { + "Classifiers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "Configuration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "CrawlerSecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule", + "Required": false, + "Type": "Schedule", + "UpdateType": "Mutable" + }, + "SchemaChangePolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy", + "Required": false, + "Type": "SchemaChangePolicy", + "UpdateType": "Mutable" + }, + "TablePrefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + }, + "Targets": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets", + "Required": true, + "Type": "Targets", + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::DataCatalogEncryptionSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DataCatalogEncryptionSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings", + "Required": true, + "Type": "DataCatalogEncryptionSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::Database": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DatabaseInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput", + "Required": true, + "Type": "DatabaseInput", + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::DevEndpoint": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html", + "Properties": { + "EndpointName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "ExtraJarsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ExtraPythonLibsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "NumberOfNodes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "PublicKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securityconfiguration", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::Job": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html", + "Properties": { + "AllocatedCapacity": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "Command": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command", + "Required": true, + "Type": "JobCommand", + "UpdateType": "Mutable" + }, + "Connections": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections", + "Required": false, + "Type": "ConnectionsList", + "UpdateType": "Mutable" + }, + "DefaultArguments": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ExecutionProperty": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty", + "Required": false, + "Type": "ExecutionProperty", + "UpdateType": "Mutable" + }, + "LogUri": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "MaxRetries": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-securityconfiguration", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::Partition": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "PartitionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput", + "Required": true, + "Type": "PartitionInput", + "UpdateType": "Mutable" + }, + "TableName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + } + } + }, + "AWS::Glue::SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html", + "Properties": { + "EncryptionConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration", + "Required": true, + "Type": "EncryptionConfiguration", + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + } + } + }, + "AWS::Glue::Table": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "TableInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput", + "Required": true, + "Type": "TableInput", + "UpdateType": "Mutable" + } + } + }, + "AWS::Glue::Trigger": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html", + "Properties": { + "Actions": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions", + "ItemType": "Action", + "Required": true, + "Type": "List", + "UpdateType": "Mutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Predicate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate", + "Required": false, + "Type": "Predicate", + "UpdateType": "Mutable" + }, + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + }, + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, "AWS::GuardDuty::Detector": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html", "Properties": { @@ -24248,14 +24666,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c5.12xlarge", "c5.18xlarge", "c5.24xlarge", @@ -24282,29 +24692,37 @@ "i3.large", "i3.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t3.2xlarge", @@ -24744,6 +25162,13 @@ ] }, "NeptuneInstanceClass": { + "AllowedValues": [ + "db.r5.12xl", + "db.r5.2xl", + "db.r5.4xl", + "db.r5.large", + "db.r5.xl" + ], "Ref": { "Parameters": [ "String" diff --git a/src/cfnlint/data/CloudSpecs/eu-west-1.json b/src/cfnlint/data/CloudSpecs/eu-west-1.json index aed27368ac..2b29916f49 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-1.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-1.json @@ -20017,6 +20017,570 @@ } } }, + "AWS::MediaLive::Channel.AribSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aribsourcesettings.html", + "Properties": {} + }, + "AWS::MediaLive::Channel.AudioLanguageSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html", + "Properties": { + "LanguageCode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languagecode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "LanguageSelectionPolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languageselectionpolicy", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioPidSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html#cfn-medialive-channel-audiopidselection-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-selectorsettings", + "Required": false, + "Type": "AudioSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html", + "Properties": { + "AudioLanguageSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiolanguageselection", + "Required": false, + "Type": "AudioLanguageSelection", + "UpdateType": "Mutable" + }, + "AudioPidSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiopidselection", + "Required": false, + "Type": "AudioPidSelection", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.CaptionSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html", + "Properties": { + "LanguageCode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-languagecode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-selectorsettings", + "Required": false, + "Type": "CaptionSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.CaptionSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html", + "Properties": { + "AribSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-aribsourcesettings", + "Required": false, + "Type": "AribSourceSettings", + "UpdateType": "Mutable" + }, + "DvbSubSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-dvbsubsourcesettings", + "Required": false, + "Type": "DvbSubSourceSettings", + "UpdateType": "Mutable" + }, + "EmbeddedSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-embeddedsourcesettings", + "Required": false, + "Type": "EmbeddedSourceSettings", + "UpdateType": "Mutable" + }, + "Scte20SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte20sourcesettings", + "Required": false, + "Type": "Scte20SourceSettings", + "UpdateType": "Mutable" + }, + "Scte27SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte27sourcesettings", + "Required": false, + "Type": "Scte27SourceSettings", + "UpdateType": "Mutable" + }, + "TeletextSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-teletextsourcesettings", + "Required": false, + "Type": "TeletextSourceSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.DvbSubSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html#cfn-medialive-channel-dvbsubsourcesettings-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.EmbeddedSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html", + "Properties": { + "Convert608To708": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-convert608to708", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Scte20Detection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-scte20detection", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608ChannelNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608channelnumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608TrackNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608tracknumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.HlsInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html", + "Properties": { + "Bandwidth": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-bandwidth", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "BufferSegments": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-buffersegments", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "Retries": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retries", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "RetryInterval": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retryinterval", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputAttachment": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html", + "Properties": { + "InputAttachmentName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputattachmentname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "InputId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "InputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputsettings", + "Required": false, + "Type": "InputSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html", + "Properties": { + "AudioSelectors": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-audioselectors", + "ItemType": "AudioSelector", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "CaptionSelectors": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-captionselectors", + "ItemType": "CaptionSelector", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "DeblockFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-deblockfilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DenoiseFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-denoisefilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "FilterStrength": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-filterstrength", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "InputFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-inputfilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "NetworkInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-networkinputsettings", + "Required": false, + "Type": "NetworkInputSettings", + "UpdateType": "Mutable" + }, + "SourceEndBehavior": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-sourceendbehavior", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "VideoSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-videoselector", + "Required": false, + "Type": "VideoSelector", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputSpecification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html", + "Properties": { + "Codec": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-codec", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "MaximumBitrate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-maximumbitrate", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Resolution": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-resolution", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html", + "Properties": { + "ChannelId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html#cfn-medialive-channel-mediapackageoutputdestinationsettings-channelid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.NetworkInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html", + "Properties": { + "HlsInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-hlsinputsettings", + "Required": false, + "Type": "HlsInputSettings", + "UpdateType": "Mutable" + }, + "ServerValidation": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-servervalidation", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.OutputDestination": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html", + "Properties": { + "Id": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-id", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "MediaPackageSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-mediapackagesettings", + "ItemType": "MediaPackageOutputDestinationSettings", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "Settings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-settings", + "ItemType": "OutputDestinationSettings", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.OutputDestinationSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html", + "Properties": { + "PasswordParam": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-passwordparam", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "StreamName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-streamname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Url": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-url", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-username", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.Scte20SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html", + "Properties": { + "Convert608To708": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-convert608to708", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608ChannelNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-source608channelnumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.Scte27SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html#cfn-medialive-channel-scte27sourcesettings-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.TeletextSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html", + "Properties": { + "PageNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html#cfn-medialive-channel-teletextsourcesettings-pagenumber", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html", + "Properties": { + "ColorSpace": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspace", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ColorSpaceUsage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspaceusage", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-selectorsettings", + "Required": false, + "Type": "VideoSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorPid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html#cfn-medialive-channel-videoselectorpid-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html", + "Properties": { + "ProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html#cfn-medialive-channel-videoselectorprogramid-programid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html", + "Properties": { + "VideoSelectorPid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorpid", + "Required": false, + "Type": "VideoSelectorPid", + "UpdateType": "Mutable" + }, + "VideoSelectorProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorprogramid", + "Required": false, + "Type": "VideoSelectorProgramId", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputDestinationRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html", + "Properties": { + "StreamName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html#cfn-medialive-input-inputdestinationrequest-streamname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputSourceRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html", + "Properties": { + "PasswordParam": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-passwordparam", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Url": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-url", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-username", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputVpcRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html", + "Properties": { + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-subnetids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.MediaConnectFlowRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html", + "Properties": { + "FlowArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html#cfn-medialive-input-mediaconnectflowrequest-flowarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html", + "Properties": { + "Cidr": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html#cfn-medialive-inputsecuritygroup-inputwhitelistrulecidr-cidr", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::MediaStore::Container.CorsRule": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html", "Properties": { @@ -46469,18 +47033,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -46574,22 +47126,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -46612,21 +47170,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/CloudSpecs/eu-west-2.json b/src/cfnlint/data/CloudSpecs/eu-west-2.json index daa9133cd7..c740d9522a 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-2.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-2.json @@ -37132,14 +37132,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -37181,16 +37173,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -37204,15 +37200,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/eu-west-3.json b/src/cfnlint/data/CloudSpecs/eu-west-3.json index df4d65d135..6c1977e301 100644 --- a/src/cfnlint/data/CloudSpecs/eu-west-3.json +++ b/src/cfnlint/data/CloudSpecs/eu-west-3.json @@ -29967,14 +29967,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -30012,16 +30004,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -30032,15 +30028,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/sa-east-1.json b/src/cfnlint/data/CloudSpecs/sa-east-1.json index fc27228adb..fa15d95602 100644 --- a/src/cfnlint/data/CloudSpecs/sa-east-1.json +++ b/src/cfnlint/data/CloudSpecs/sa-east-1.json @@ -30233,8 +30233,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -30287,9 +30285,11 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.xlarge", "r3.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/us-east-1.json b/src/cfnlint/data/CloudSpecs/us-east-1.json index 414bc908d7..b499396827 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-east-1.json @@ -20017,6 +20017,570 @@ } } }, + "AWS::MediaLive::Channel.AribSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aribsourcesettings.html", + "Properties": {} + }, + "AWS::MediaLive::Channel.AudioLanguageSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html", + "Properties": { + "LanguageCode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languagecode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "LanguageSelectionPolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languageselectionpolicy", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioPidSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html#cfn-medialive-channel-audiopidselection-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-selectorsettings", + "Required": false, + "Type": "AudioSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html", + "Properties": { + "AudioLanguageSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiolanguageselection", + "Required": false, + "Type": "AudioLanguageSelection", + "UpdateType": "Mutable" + }, + "AudioPidSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiopidselection", + "Required": false, + "Type": "AudioPidSelection", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.CaptionSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html", + "Properties": { + "LanguageCode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-languagecode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-selectorsettings", + "Required": false, + "Type": "CaptionSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.CaptionSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html", + "Properties": { + "AribSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-aribsourcesettings", + "Required": false, + "Type": "AribSourceSettings", + "UpdateType": "Mutable" + }, + "DvbSubSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-dvbsubsourcesettings", + "Required": false, + "Type": "DvbSubSourceSettings", + "UpdateType": "Mutable" + }, + "EmbeddedSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-embeddedsourcesettings", + "Required": false, + "Type": "EmbeddedSourceSettings", + "UpdateType": "Mutable" + }, + "Scte20SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte20sourcesettings", + "Required": false, + "Type": "Scte20SourceSettings", + "UpdateType": "Mutable" + }, + "Scte27SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte27sourcesettings", + "Required": false, + "Type": "Scte27SourceSettings", + "UpdateType": "Mutable" + }, + "TeletextSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-teletextsourcesettings", + "Required": false, + "Type": "TeletextSourceSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.DvbSubSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html#cfn-medialive-channel-dvbsubsourcesettings-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.EmbeddedSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html", + "Properties": { + "Convert608To708": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-convert608to708", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Scte20Detection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-scte20detection", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608ChannelNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608channelnumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608TrackNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608tracknumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.HlsInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html", + "Properties": { + "Bandwidth": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-bandwidth", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "BufferSegments": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-buffersegments", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "Retries": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retries", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "RetryInterval": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retryinterval", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputAttachment": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html", + "Properties": { + "InputAttachmentName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputattachmentname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "InputId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "InputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputsettings", + "Required": false, + "Type": "InputSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html", + "Properties": { + "AudioSelectors": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-audioselectors", + "ItemType": "AudioSelector", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "CaptionSelectors": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-captionselectors", + "ItemType": "CaptionSelector", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "DeblockFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-deblockfilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DenoiseFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-denoisefilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "FilterStrength": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-filterstrength", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "InputFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-inputfilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "NetworkInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-networkinputsettings", + "Required": false, + "Type": "NetworkInputSettings", + "UpdateType": "Mutable" + }, + "SourceEndBehavior": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-sourceendbehavior", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "VideoSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-videoselector", + "Required": false, + "Type": "VideoSelector", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputSpecification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html", + "Properties": { + "Codec": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-codec", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "MaximumBitrate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-maximumbitrate", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Resolution": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-resolution", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html", + "Properties": { + "ChannelId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html#cfn-medialive-channel-mediapackageoutputdestinationsettings-channelid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.NetworkInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html", + "Properties": { + "HlsInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-hlsinputsettings", + "Required": false, + "Type": "HlsInputSettings", + "UpdateType": "Mutable" + }, + "ServerValidation": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-servervalidation", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.OutputDestination": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html", + "Properties": { + "Id": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-id", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "MediaPackageSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-mediapackagesettings", + "ItemType": "MediaPackageOutputDestinationSettings", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "Settings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-settings", + "ItemType": "OutputDestinationSettings", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.OutputDestinationSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html", + "Properties": { + "PasswordParam": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-passwordparam", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "StreamName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-streamname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Url": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-url", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-username", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.Scte20SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html", + "Properties": { + "Convert608To708": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-convert608to708", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608ChannelNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-source608channelnumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.Scte27SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html#cfn-medialive-channel-scte27sourcesettings-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.TeletextSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html", + "Properties": { + "PageNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html#cfn-medialive-channel-teletextsourcesettings-pagenumber", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html", + "Properties": { + "ColorSpace": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspace", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ColorSpaceUsage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspaceusage", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-selectorsettings", + "Required": false, + "Type": "VideoSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorPid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html#cfn-medialive-channel-videoselectorpid-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html", + "Properties": { + "ProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html#cfn-medialive-channel-videoselectorprogramid-programid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html", + "Properties": { + "VideoSelectorPid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorpid", + "Required": false, + "Type": "VideoSelectorPid", + "UpdateType": "Mutable" + }, + "VideoSelectorProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorprogramid", + "Required": false, + "Type": "VideoSelectorProgramId", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputDestinationRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html", + "Properties": { + "StreamName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html#cfn-medialive-input-inputdestinationrequest-streamname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputSourceRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html", + "Properties": { + "PasswordParam": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-passwordparam", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Url": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-url", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-username", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputVpcRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html", + "Properties": { + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-subnetids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.MediaConnectFlowRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html", + "Properties": { + "FlowArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html#cfn-medialive-input-mediaconnectflowrequest-flowarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html", + "Properties": { + "Cidr": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html#cfn-medialive-inputsecuritygroup-inputwhitelistrulecidr-cidr", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::MediaStore::Container.CorsRule": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html", "Properties": { @@ -46509,18 +47073,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -46614,16 +47166,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -46633,9 +47189,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -46658,15 +47216,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -46676,9 +47238,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/CloudSpecs/us-east-2.json b/src/cfnlint/data/CloudSpecs/us-east-2.json index d8c9548a21..e127f3522a 100644 --- a/src/cfnlint/data/CloudSpecs/us-east-2.json +++ b/src/cfnlint/data/CloudSpecs/us-east-2.json @@ -40361,18 +40361,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -40437,16 +40425,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -40456,9 +40448,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -40480,15 +40474,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -40498,9 +40496,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json index 6c98c87fdc..f9beceb337 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-east-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-east-1.json @@ -22385,14 +22385,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c5.18xlarge", "c5.2xlarge", "c5.4xlarge", @@ -22418,29 +22410,37 @@ "i3.large", "i3.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t3.2xlarge", diff --git a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json index a2e90e9cbb..43fe6a7495 100644 --- a/src/cfnlint/data/CloudSpecs/us-gov-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-gov-west-1.json @@ -24405,14 +24405,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -24486,16 +24478,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -24517,15 +24513,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/CloudSpecs/us-west-1.json b/src/cfnlint/data/CloudSpecs/us-west-1.json index 344b5af015..d4bc322725 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-1.json +++ b/src/cfnlint/data/CloudSpecs/us-west-1.json @@ -33039,14 +33039,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -33119,16 +33111,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -33144,15 +33140,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/CloudSpecs/us-west-2.json b/src/cfnlint/data/CloudSpecs/us-west-2.json index 67d5035094..af2ddf0d36 100644 --- a/src/cfnlint/data/CloudSpecs/us-west-2.json +++ b/src/cfnlint/data/CloudSpecs/us-west-2.json @@ -20017,6 +20017,570 @@ } } }, + "AWS::MediaLive::Channel.AribSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aribsourcesettings.html", + "Properties": {} + }, + "AWS::MediaLive::Channel.AudioLanguageSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html", + "Properties": { + "LanguageCode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languagecode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "LanguageSelectionPolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languageselectionpolicy", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioPidSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html#cfn-medialive-channel-audiopidselection-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-selectorsettings", + "Required": false, + "Type": "AudioSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.AudioSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html", + "Properties": { + "AudioLanguageSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiolanguageselection", + "Required": false, + "Type": "AudioLanguageSelection", + "UpdateType": "Mutable" + }, + "AudioPidSelection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiopidselection", + "Required": false, + "Type": "AudioPidSelection", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.CaptionSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html", + "Properties": { + "LanguageCode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-languagecode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-selectorsettings", + "Required": false, + "Type": "CaptionSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.CaptionSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html", + "Properties": { + "AribSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-aribsourcesettings", + "Required": false, + "Type": "AribSourceSettings", + "UpdateType": "Mutable" + }, + "DvbSubSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-dvbsubsourcesettings", + "Required": false, + "Type": "DvbSubSourceSettings", + "UpdateType": "Mutable" + }, + "EmbeddedSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-embeddedsourcesettings", + "Required": false, + "Type": "EmbeddedSourceSettings", + "UpdateType": "Mutable" + }, + "Scte20SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte20sourcesettings", + "Required": false, + "Type": "Scte20SourceSettings", + "UpdateType": "Mutable" + }, + "Scte27SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte27sourcesettings", + "Required": false, + "Type": "Scte27SourceSettings", + "UpdateType": "Mutable" + }, + "TeletextSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-teletextsourcesettings", + "Required": false, + "Type": "TeletextSourceSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.DvbSubSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html#cfn-medialive-channel-dvbsubsourcesettings-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.EmbeddedSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html", + "Properties": { + "Convert608To708": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-convert608to708", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Scte20Detection": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-scte20detection", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608ChannelNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608channelnumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608TrackNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608tracknumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.HlsInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html", + "Properties": { + "Bandwidth": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-bandwidth", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "BufferSegments": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-buffersegments", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "Retries": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retries", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "RetryInterval": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retryinterval", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputAttachment": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html", + "Properties": { + "InputAttachmentName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputattachmentname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "InputId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "InputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputsettings", + "Required": false, + "Type": "InputSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html", + "Properties": { + "AudioSelectors": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-audioselectors", + "ItemType": "AudioSelector", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "CaptionSelectors": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-captionselectors", + "ItemType": "CaptionSelector", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "DeblockFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-deblockfilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DenoiseFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-denoisefilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "FilterStrength": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-filterstrength", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "InputFilter": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-inputfilter", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "NetworkInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-networkinputsettings", + "Required": false, + "Type": "NetworkInputSettings", + "UpdateType": "Mutable" + }, + "SourceEndBehavior": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-sourceendbehavior", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "VideoSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-videoselector", + "Required": false, + "Type": "VideoSelector", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.InputSpecification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html", + "Properties": { + "Codec": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-codec", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "MaximumBitrate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-maximumbitrate", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Resolution": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-resolution", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html", + "Properties": { + "ChannelId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html#cfn-medialive-channel-mediapackageoutputdestinationsettings-channelid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.NetworkInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html", + "Properties": { + "HlsInputSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-hlsinputsettings", + "Required": false, + "Type": "HlsInputSettings", + "UpdateType": "Mutable" + }, + "ServerValidation": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-servervalidation", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.OutputDestination": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html", + "Properties": { + "Id": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-id", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "MediaPackageSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-mediapackagesettings", + "ItemType": "MediaPackageOutputDestinationSettings", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "Settings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-settings", + "ItemType": "OutputDestinationSettings", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.OutputDestinationSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html", + "Properties": { + "PasswordParam": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-passwordparam", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "StreamName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-streamname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Url": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-url", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-username", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.Scte20SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html", + "Properties": { + "Convert608To708": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-convert608to708", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Source608ChannelNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-source608channelnumber", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.Scte27SourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html#cfn-medialive-channel-scte27sourcesettings-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.TeletextSourceSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html", + "Properties": { + "PageNumber": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html#cfn-medialive-channel-teletextsourcesettings-pagenumber", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelector": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html", + "Properties": { + "ColorSpace": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspace", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ColorSpaceUsage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspaceusage", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-selectorsettings", + "Required": false, + "Type": "VideoSelectorSettings", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorPid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html", + "Properties": { + "Pid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html#cfn-medialive-channel-videoselectorpid-pid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html", + "Properties": { + "ProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html#cfn-medialive-channel-videoselectorprogramid-programid", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Channel.VideoSelectorSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html", + "Properties": { + "VideoSelectorPid": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorpid", + "Required": false, + "Type": "VideoSelectorPid", + "UpdateType": "Mutable" + }, + "VideoSelectorProgramId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorprogramid", + "Required": false, + "Type": "VideoSelectorProgramId", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputDestinationRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html", + "Properties": { + "StreamName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html#cfn-medialive-input-inputdestinationrequest-streamname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputSourceRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html", + "Properties": { + "PasswordParam": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-passwordparam", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Url": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-url", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-username", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.InputVpcRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html", + "Properties": { + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-subnetids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::Input.MediaConnectFlowRequest": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html", + "Properties": { + "FlowArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html#cfn-medialive-input-mediaconnectflowrequest-flowarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, + "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html", + "Properties": { + "Cidr": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html#cfn-medialive-inputsecuritygroup-inputwhitelistrulecidr-cidr", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::MediaStore::Container.CorsRule": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html", "Properties": { @@ -46434,18 +46998,6 @@ }, "Ec2InstanceType": { "AllowedValues": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -46539,16 +47091,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -46558,9 +47114,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -46583,15 +47141,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -46601,9 +47163,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json index cdcc3f3c21..92ce35c376 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-east-1/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c5.18xlarge", "c5.2xlarge", "c5.4xlarge", @@ -34,29 +26,37 @@ "i3.large", "i3.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t3.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-east-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/ap-east-1/07_ssm_service_addition.json index 80f553bdbf..edc66b9589 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-east-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-east-1/07_ssm_service_addition.json @@ -1,308 +1,328 @@ [ { "op": "add", - "path": "/ResourceTypes/AWS::DMS::Certificate", + "path": "/ResourceTypes/AWS::Glue::Classifier", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", "Properties": { - "CertificateIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", - "PrimitiveType": "String", + "CsvClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", "Required": false, - "UpdateType": "Immutable" + "Type": "CsvClassifier", + "UpdateType": "Mutable" }, - "CertificatePem": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", - "PrimitiveType": "String", + "GrokClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", "Required": false, - "UpdateType": "Immutable" + "Type": "GrokClassifier", + "UpdateType": "Mutable" }, - "CertificateWallet": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", - "PrimitiveType": "String", + "JsonClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", "Required": false, - "UpdateType": "Immutable" + "Type": "JsonClassifier", + "UpdateType": "Mutable" + }, + "XMLClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", + "Required": false, + "Type": "XMLClassifier", + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::Endpoint", + "path": "/ResourceTypes/AWS::Glue::Connection", "value": { - "Attributes": { - "ExternalId": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", "Properties": { - "CertificateArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "ConnectionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", + "Required": true, + "Type": "ConnectionInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Crawler", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", + "Properties": { + "Classifiers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", + "PrimitiveItemType": "String", "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", + "Configuration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "DynamoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", + "CrawlerSecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", + "PrimitiveType": "String", "Required": false, - "Type": "DynamoDbSettings", "UpdateType": "Mutable" }, - "ElasticsearchSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", - "Required": false, - "Type": "ElasticsearchSettings", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Mutable" }, - "EndpointIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "EndpointType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" + "Required": false, + "UpdateType": "Immutable" }, - "EngineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "ExtraConnectionAttributes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule", + "Required": false, + "Type": "Schedule", + "UpdateType": "Mutable" + }, + "SchemaChangePolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy", + "Required": false, + "Type": "SchemaChangePolicy", + "UpdateType": "Mutable" + }, + "TablePrefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "KinesisSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "KinesisSettings", "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", + "Targets": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets", + "Required": true, + "Type": "Targets", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::DataCatalogEncryptionSettings", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DataCatalogEncryptionSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings", + "Required": true, + "Type": "DataCatalogEncryptionSettings", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Database", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DatabaseInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput", + "Required": true, + "Type": "DatabaseInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::DevEndpoint", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html", + "Properties": { + "EndpointName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "MongoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", + "ExtraJarsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path", + "PrimitiveType": "String", "Required": false, - "Type": "MongoDbSettings", "UpdateType": "Mutable" }, - "Password": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", + "ExtraPythonLibsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Port": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", + "NumberOfNodes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes", "PrimitiveType": "Integer", "Required": false, "UpdateType": "Mutable" }, - "S3Settings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", + "PublicKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey", + "PrimitiveType": "String", "Required": false, - "Type": "S3Settings", "UpdateType": "Mutable" }, - "ServerName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Mutable" }, - "SslMode": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securityconfiguration", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", - "ItemType": "Tag", + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids", + "PrimitiveItemType": "String", "Required": false, "Type": "List", - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "Username": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", + "SubnetId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::EventSubscription", + "path": "/ResourceTypes/AWS::Glue::Job", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html", "Properties": { - "Enabled": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", - "PrimitiveType": "Boolean", + "AllocatedCapacity": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity", + "PrimitiveType": "Double", "Required": false, "UpdateType": "Mutable" }, - "EventCategories": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", + "Command": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command", + "Required": true, + "Type": "JobCommand", "UpdateType": "Mutable" }, - "SnsTopicArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "SourceIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - }, - "SourceType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", - "PrimitiveType": "String", + "Connections": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections", "Required": false, + "Type": "ConnectionsList", "UpdateType": "Mutable" }, - "SubscriptionName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", - "value": { - "Attributes": { - "ReplicationInstancePrivateIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" - }, - "ReplicationInstancePublicIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", - "Properties": { - "AllocatedStorage": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", - "PrimitiveType": "Integer", + "DefaultArguments": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments", + "PrimitiveType": "Json", "Required": false, "UpdateType": "Mutable" }, - "AllowMajorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", - "PrimitiveType": "Boolean", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "AutoMinorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", - "PrimitiveType": "Boolean", + "ExecutionProperty": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty", "Required": false, + "Type": "ExecutionProperty", "UpdateType": "Mutable" }, - "AvailabilityZone": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "EngineVersion": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", + "LogUri": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "MultiAZ": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", - "PrimitiveType": "Boolean", + "MaxRetries": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries", + "PrimitiveType": "Double", "Required": false, "UpdateType": "Mutable" }, - "PreferredMaintenanceWindow": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" - }, - "PubliclyAccessible": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", - "PrimitiveType": "Boolean", - "Required": false, "UpdateType": "Immutable" }, - "ReplicationInstanceClass": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "ReplicationInstanceIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-securityconfiguration", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - }, - "VpcSecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", - "PrimitiveItemType": "String", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -310,34 +330,32 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", + "path": "/ResourceTypes/AWS::Glue::Partition", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html", "Properties": { - "ReplicationSubnetGroupDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "SubnetIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", - "PrimitiveItemType": "String", + "PartitionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput", "Required": true, - "Type": "List", + "Type": "PartitionInput", "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", + "TableName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Immutable" } } @@ -345,117 +363,126 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationTask", + "path": "/ResourceTypes/AWS::Glue::SecurityConfiguration", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html", "Properties": { - "CdcStartTime": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", - "PrimitiveType": "Double", - "Required": false, + "EncryptionConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration", + "Required": true, + "Type": "EncryptionConfiguration", "UpdateType": "Mutable" }, - "MigrationType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-name", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" - }, - "ReplicationInstanceArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Table", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "ReplicationTaskIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename", "PrimitiveType": "String", - "Required": false, + "Required": true, + "UpdateType": "Immutable" + }, + "TableInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput", + "Required": true, + "Type": "TableInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Trigger", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html", + "Properties": { + "Actions": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions", + "ItemType": "Action", + "Required": true, + "Type": "List", "UpdateType": "Mutable" }, - "ReplicationTaskSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "SourceEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, - "TableMappings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", + "Predicate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate", + "Required": false, + "Type": "Predicate", + "UpdateType": "Mutable" + }, + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Mutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", - "ItemType": "Tag", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "List", - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "TargetEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Classifier", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", - "Properties": { - "CsvClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", - "Required": false, - "Type": "CsvClassifier", - "UpdateType": "Mutable" - }, - "GrokClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", - "Required": false, - "Type": "GrokClassifier", - "UpdateType": "Mutable" - }, - "JsonClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", - "Required": false, - "Type": "JsonClassifier", - "UpdateType": "Mutable" - }, - "XMLClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", - "Required": false, - "Type": "XMLClassifier", - "UpdateType": "Mutable" + "Attributes": { + "Name": { + "PrimitiveType": "String" } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Connection", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "ConnectionInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", - "Required": true, - "Type": "ConnectionInput", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -463,81 +490,58 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Crawler", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", "Properties": { - "Classifiers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "Configuration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "CrawlerSecurityConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename", + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Role": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role", + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "Schedule": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule", - "Required": false, - "Type": "Schedule", - "UpdateType": "Mutable" - }, - "SchemaChangePolicy": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy", - "Required": false, - "Type": "SchemaChangePolicy", - "UpdateType": "Mutable" - }, - "TablePrefix": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix", + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tags", - "PrimitiveType": "Json", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", "Required": false, + "Type": "List", "UpdateType": "Mutable" - }, - "Targets": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets", + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::CloudFront::CloudFrontOriginAccessIdentity", + "value": { + "Attributes": { + "S3CanonicalUserId": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html", + "Properties": { + "CloudFrontOriginAccessIdentityConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html#cfn-cloudfront-cloudfrontoriginaccessidentity-cloudfrontoriginaccessidentityconfig", "Required": true, - "Type": "Targets", + "Type": "CloudFrontOriginAccessIdentityConfig", "UpdateType": "Mutable" } } @@ -545,20 +549,26 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::DataCatalogEncryptionSettings", + "path": "/ResourceTypes/AWS::CloudFront::Distribution", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html", + "Attributes": { + "DomainName": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html", "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-catalogid", - "PrimitiveType": "String", + "DistributionConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html#cfn-cloudfront-distribution-distributionconfig", "Required": true, - "UpdateType": "Immutable" + "Type": "DistributionConfig", + "UpdateType": "Mutable" }, - "DataCatalogEncryptionSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings", - "Required": true, - "Type": "DataCatalogEncryptionSettings", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html#cfn-cloudfront-distribution-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -566,20 +576,26 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Database", + "path": "/ResourceTypes/AWS::CloudFront::StreamingDistribution", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html", + "Attributes": { + "DomainName": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html", "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid", - "PrimitiveType": "String", + "StreamingDistributionConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig", "Required": true, - "UpdateType": "Immutable" + "Type": "StreamingDistributionConfig", + "UpdateType": "Mutable" }, - "DatabaseInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html#cfn-cloudfront-streamingdistribution-tags", + "ItemType": "Tag", "Required": true, - "Type": "DatabaseInput", + "Type": "List", "UpdateType": "Mutable" } } @@ -587,69 +603,89 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::DevEndpoint", + "path": "/ResourceTypes/AWS::Batch::ComputeEnvironment", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html", "Properties": { - "EndpointName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname", + "ComputeEnvironmentName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeenvironmentname", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "ExtraJarsS3Path": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path", - "PrimitiveType": "String", + "ComputeResources": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeresources", "Required": false, + "Type": "ComputeResources", "UpdateType": "Mutable" }, - "ExtraPythonLibsS3Path": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path", + "ServiceRole": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-servicerole", "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "NumberOfNodes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes", - "PrimitiveType": "Integer", - "Required": false, + "Required": true, "UpdateType": "Mutable" }, - "PublicKey": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey", + "State": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-state", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn", + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-type", "PrimitiveType": "String", "Required": true, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Batch::JobDefinition", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html", + "Properties": { + "ContainerProperties": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-containerproperties", + "Required": false, + "Type": "ContainerProperties", "UpdateType": "Mutable" }, - "SecurityConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securityconfiguration", + "JobDefinitionName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-jobdefinitionname", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "SecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids", - "PrimitiveItemType": "String", + "NodeProperties": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-nodeproperties", "Required": false, - "Type": "List", + "Type": "NodeProperties", "UpdateType": "Mutable" }, - "SubnetId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid", - "PrimitiveType": "String", + "Parameters": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-parameters", + "PrimitiveType": "Json", "Required": false, "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-tags", - "PrimitiveType": "Json", + "RetryStrategy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-retrystrategy", + "Required": false, + "Type": "RetryStrategy", + "UpdateType": "Mutable" + }, + "Timeout": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-timeout", "Required": false, + "Type": "Timeout", + "UpdateType": "Mutable" + }, + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-type", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Mutable" } } @@ -657,113 +693,60 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Job", + "path": "/ResourceTypes/AWS::Batch::JobQueue", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html", "Properties": { - "AllocatedCapacity": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity", - "PrimitiveType": "Double", - "Required": false, - "UpdateType": "Mutable" - }, - "Command": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command", + "ComputeEnvironmentOrder": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-computeenvironmentorder", + "ItemType": "ComputeEnvironmentOrder", "Required": true, - "Type": "JobCommand", - "UpdateType": "Mutable" - }, - "Connections": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections", - "Required": false, - "Type": "ConnectionsList", - "UpdateType": "Mutable" - }, - "DefaultArguments": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" - }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ExecutionProperty": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty", - "Required": false, - "Type": "ExecutionProperty", - "UpdateType": "Mutable" - }, - "LogUri": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "MaxRetries": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries", - "PrimitiveType": "Double", - "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name", + "JobQueueName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-jobqueuename", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Role": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role", - "PrimitiveType": "String", + "Priority": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-priority", + "PrimitiveType": "Integer", "Required": true, "UpdateType": "Mutable" }, - "SecurityConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-securityconfiguration", + "State": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-state", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-tags", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Partition", + "path": "/ResourceTypes/AWS::DMS::Certificate", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid", + "CertificateIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename", + "CertificatePem": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, - "PartitionInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput", - "Required": true, - "Type": "PartitionInput", - "UpdateType": "Mutable" - }, - "TableName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename", + "CertificateWallet": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" } } @@ -771,200 +754,122 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::SecurityConfiguration", + "path": "/ResourceTypes/AWS::DMS::Endpoint", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html", - "Properties": { - "EncryptionConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration", - "Required": true, - "Type": "EncryptionConfiguration", - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Attributes": { + "ExternalId": { + "PrimitiveType": "String" } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Table", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html", + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid", + "CertificateArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Required": false, + "UpdateType": "Mutable" }, "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Required": false, + "UpdateType": "Mutable" }, - "TableInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput", + "DynamoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", + "Required": false, + "Type": "DynamoDbSettings", + "UpdateType": "Mutable" + }, + "ElasticsearchSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", + "Required": false, + "Type": "ElasticsearchSettings", + "UpdateType": "Mutable" + }, + "EndpointIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "EndpointType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", + "PrimitiveType": "String", "Required": true, - "Type": "TableInput", "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Trigger", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html", - "Properties": { - "Actions": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions", - "ItemType": "Action", + }, + "EngineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", + "PrimitiveType": "String", "Required": true, - "Type": "List", "UpdateType": "Mutable" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description", + "ExtraConnectionAttributes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name", + "KinesisSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", + "Required": false, + "Type": "KinesisSettings", + "UpdateType": "Mutable" + }, + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Predicate": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate", + "MongoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", "Required": false, - "Type": "Predicate", + "Type": "MongoDbSettings", "UpdateType": "Mutable" }, - "Schedule": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule", + "Password": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-tags", - "PrimitiveType": "Json", + "Port": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", + "PrimitiveType": "Integer", "Required": false, "UpdateType": "Mutable" }, - "Type": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::CloudFront::CloudFrontOriginAccessIdentity", - "value": { - "Attributes": { - "S3CanonicalUserId": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html", - "Properties": { - "CloudFrontOriginAccessIdentityConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html#cfn-cloudfront-cloudfrontoriginaccessidentity-cloudfrontoriginaccessidentityconfig", - "Required": true, - "Type": "CloudFrontOriginAccessIdentityConfig", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::CloudFront::Distribution", - "value": { - "Attributes": { - "DomainName": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html", - "Properties": { - "DistributionConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html#cfn-cloudfront-distribution-distributionconfig", - "Required": true, - "Type": "DistributionConfig", + "S3Settings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", + "Required": false, + "Type": "S3Settings", "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html#cfn-cloudfront-distribution-tags", - "ItemType": "Tag", + "ServerName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::CloudFront::StreamingDistribution", - "value": { - "Attributes": { - "DomainName": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html", - "Properties": { - "StreamingDistributionConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig", - "Required": true, - "Type": "StreamingDistributionConfig", + }, + "SslMode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", + "PrimitiveType": "String", + "Required": false, "UpdateType": "Mutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html#cfn-cloudfront-streamingdistribution-tags", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", "ItemType": "Tag", - "Required": true, + "Required": false, "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", - "PrimitiveType": "String", - "Required": true, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -972,128 +877,158 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "path": "/ResourceTypes/AWS::DMS::EventSubscription", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "Enabled": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "EventCategories": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SnsTopicArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "SourceIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "SourceType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Mutable" }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "SubscriptionName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", + "ItemType": "Tag", "Required": false, "Type": "List", - "UpdateType": "Mutable" + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Batch::ComputeEnvironment", + "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html", + "Attributes": { + "ReplicationInstancePrivateIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" + }, + "ReplicationInstancePublicIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", "Properties": { - "ComputeEnvironmentName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeenvironmentname", - "PrimitiveType": "String", + "AllocatedStorage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", + "PrimitiveType": "Integer", "Required": false, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "ComputeResources": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeresources", + "AllowMajorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", + "PrimitiveType": "Boolean", "Required": false, - "Type": "ComputeResources", "UpdateType": "Mutable" }, - "ServiceRole": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-servicerole", - "PrimitiveType": "String", - "Required": true, + "AutoMinorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", + "PrimitiveType": "Boolean", + "Required": false, "UpdateType": "Mutable" }, - "State": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-state", + "AvailabilityZone": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "Type": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-type", + "EngineVersion": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Batch::JobDefinition", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html", - "Properties": { - "ContainerProperties": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-containerproperties", "Required": false, - "Type": "ContainerProperties", "UpdateType": "Mutable" }, - "JobDefinitionName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-jobdefinitionname", + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "NodeProperties": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-nodeproperties", + "MultiAZ": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", + "PrimitiveType": "Boolean", "Required": false, - "Type": "NodeProperties", "UpdateType": "Mutable" }, - "Parameters": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-parameters", - "PrimitiveType": "Json", + "PreferredMaintenanceWindow": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "RetryStrategy": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-retrystrategy", + "PubliclyAccessible": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", + "PrimitiveType": "Boolean", "Required": false, - "Type": "RetryStrategy", + "UpdateType": "Immutable" + }, + "ReplicationInstanceClass": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Mutable" }, - "Timeout": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-timeout", + "ReplicationInstanceIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", + "PrimitiveType": "String", "Required": false, - "Type": "Timeout", "UpdateType": "Mutable" }, - "Type": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-type", + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", "PrimitiveType": "String", - "Required": true, + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "VpcSecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -1101,34 +1036,99 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Batch::JobQueue", + "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", "Properties": { - "ComputeEnvironmentOrder": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-computeenvironmentorder", - "ItemType": "ComputeEnvironmentOrder", + "ReplicationSubnetGroupDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", + "PrimitiveType": "String", "Required": true, - "Type": "List", "UpdateType": "Mutable" }, - "JobQueueName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-jobqueuename", + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Priority": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-priority", - "PrimitiveType": "Integer", + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", + "PrimitiveItemType": "String", "Required": true, + "Type": "List", "UpdateType": "Mutable" }, - "State": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-state", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::ReplicationTask", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", + "Properties": { + "CdcStartTime": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "MigrationType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "ReplicationInstanceArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "ReplicationTaskIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationTaskSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" + }, + "SourceEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "TableMappings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "TargetEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" } } } diff --git a/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json index 5e84d0bc89..e2ca69a563 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-northeast-1/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -93,22 +81,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -131,21 +125,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json index 752ba0b37e..ec0891f86f 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", @@ -64,16 +56,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -95,15 +91,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/07_ssm_service_addition.json index b0cdefb341..2ad8a77737 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-northeast-2/07_ssm_service_addition.json @@ -1,37 +1,4 @@ [ - { - "op": "add", - "path": "/ResourceTypes/AWS::Athena::NamedQuery", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", - "Properties": { - "Database": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "QueryString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::CodeCommit::Repository", @@ -80,72 +47,6 @@ } } }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", - "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", @@ -316,6 +217,105 @@ } } }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Athena::NamedQuery", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", + "Properties": { + "Database": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "QueryString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, { "op": "add", "path": "/ResourceTypes/AWS::Neptune::DBCluster", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json index 59be948790..fc8f281bec 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-northeast-3/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", @@ -54,16 +46,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -79,15 +75,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json index fb6b9eec54..56aabd12b7 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-south-1/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -49,16 +41,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -77,15 +73,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-south-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/ap-south-1/07_ssm_service_addition.json index 3ebe5b3743..cc870564b7 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-south-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-south-1/07_ssm_service_addition.json @@ -1,129 +1,109 @@ [ { "op": "add", - "path": "/ResourceTypes/AWS::Athena::NamedQuery", + "path": "/ResourceTypes/AWS::CodeCommit::Repository", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", - "Properties": { - "Database": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Attributes": { + "Arn": { + "PrimitiveType": "String" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" + "CloneUrlHttp": { + "PrimitiveType": "String" + }, + "CloneUrlSsh": { + "PrimitiveType": "String" }, "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Properties": { + "Code": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", + "Required": false, + "Type": "Code", + "UpdateType": "Mutable" + }, + "RepositoryDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "QueryString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", + "RepositoryName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" + "UpdateType": "Mutable" + }, + "Triggers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", + "ItemType": "RepositoryTrigger", + "Required": false, + "Type": "List", + "UpdateType": "Conditional" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DAX::Cluster", + "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", "value": { "Attributes": { "Arn": { "PrimitiveType": "String" }, - "ClusterDiscoveryEndpoint": { + "Direction": { "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html", - "Properties": { - "AvailabilityZones": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" }, - "ClusterName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" + "HostVPCId": { + "PrimitiveType": "String" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" + "IpAddressCount": { + "PrimitiveType": "String" }, - "IAMRoleARN": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Name": { + "PrimitiveType": "String" }, - "NodeType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype", + "ResolverEndpointId": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html", + "Properties": { + "Direction": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-direction", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "NotificationTopicARN": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ParameterGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname", - "PrimitiveType": "String", - "Required": false, + "IpAddresses": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-ipaddresses", + "ItemType": "IpAddressRequest", + "Required": true, + "Type": "List", "UpdateType": "Mutable" }, - "PreferredMaintenanceWindow": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-name", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "ReplicationFactor": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor", - "PrimitiveType": "Integer", - "Required": true, - "UpdateType": "Mutable" - }, - "SSESpecification": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification", - "Required": false, - "Type": "SSESpecification", - "UpdateType": "Immutable" - }, "SecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-securitygroupids", "PrimitiveItemType": "String", - "Required": false, + "Required": true, "Type": "List", - "UpdateType": "Mutable" - }, - "SubnetGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname", - "PrimitiveType": "String", - "Required": false, "UpdateType": "Immutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags", - "PrimitiveType": "Json", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-tags", + "ItemType": "Tag", "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -131,53 +111,65 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::DAX::ParameterGroup", + "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRule", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html", - "Properties": { - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" + "Attributes": { + "Arn": { + "PrimitiveType": "String" }, - "ParameterGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname", + "DomainName": { + "PrimitiveType": "String" + }, + "Name": { + "PrimitiveType": "String" + }, + "ResolverEndpointId": { + "PrimitiveType": "String" + }, + "ResolverRuleId": { + "PrimitiveType": "String" + }, + "TargetIps": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html", + "Properties": { + "DomainName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-domainname", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "ParameterNameValues": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues", - "PrimitiveType": "Json", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-name", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DAX::SubnetGroup", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html", - "Properties": { - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description", + }, + "ResolverEndpointId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-resolverendpointid", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "SubnetGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname", + "RuleType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-ruletype", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "SubnetIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids", - "PrimitiveItemType": "String", - "Required": true, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "TargetIps": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-targetips", + "ItemType": "TargetAddress", + "Required": false, "Type": "List", "UpdateType": "Mutable" } @@ -186,48 +178,74 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::CodeCommit::Repository", + "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRuleAssociation", "value": { "Attributes": { - "Arn": { + "Name": { "PrimitiveType": "String" }, - "CloneUrlHttp": { + "ResolverRuleAssociationId": { "PrimitiveType": "String" }, - "CloneUrlSsh": { + "ResolverRuleId": { "PrimitiveType": "String" }, - "Name": { + "VPCId": { "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html", "Properties": { - "Code": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-name", + "PrimitiveType": "String", "Required": false, - "Type": "Code", - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "RepositoryDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", + "ResolverRuleId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-resolverruleid", "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" + "Required": true, + "UpdateType": "Immutable" }, - "RepositoryName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", + "VPCId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-vpcid", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Athena::NamedQuery", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", + "Properties": { + "Database": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" }, - "Triggers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", - "ItemType": "RepositoryTrigger", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", + "PrimitiveType": "String", "Required": false, - "Type": "List", - "UpdateType": "Conditional" + "UpdateType": "Immutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "QueryString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" } } } @@ -300,61 +318,96 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", + "path": "/ResourceTypes/AWS::DAX::Cluster", "value": { "Attributes": { "Arn": { "PrimitiveType": "String" }, - "Direction": { - "PrimitiveType": "String" - }, - "HostVPCId": { - "PrimitiveType": "String" - }, - "IpAddressCount": { - "PrimitiveType": "String" - }, - "Name": { - "PrimitiveType": "String" - }, - "ResolverEndpointId": { + "ClusterDiscoveryEndpoint": { "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html", "Properties": { - "Direction": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-direction", + "AvailabilityZones": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "ClusterName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "IAMRoleARN": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "IpAddresses": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-ipaddresses", - "ItemType": "IpAddressRequest", + "NodeType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype", + "PrimitiveType": "String", "Required": true, - "Type": "List", + "UpdateType": "Immutable" + }, + "NotificationTopicARN": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn", + "PrimitiveType": "String", + "Required": false, "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-name", + "ParameterGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, + "PreferredMaintenanceWindow": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationFactor": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor", + "PrimitiveType": "Integer", + "Required": true, + "UpdateType": "Mutable" + }, + "SSESpecification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification", + "Required": false, + "Type": "SSESpecification", + "UpdateType": "Immutable" + }, "SecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-securitygroupids", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids", "PrimitiveItemType": "String", - "Required": true, + "Required": false, "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname", + "PrimitiveType": "String", + "Required": false, "UpdateType": "Immutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-tags", - "ItemType": "Tag", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -362,66 +415,26 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRule", + "path": "/ResourceTypes/AWS::DAX::ParameterGroup", "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "DomainName": { - "PrimitiveType": "String" - }, - "Name": { - "PrimitiveType": "String" - }, - "ResolverEndpointId": { - "PrimitiveType": "String" - }, - "ResolverRuleId": { - "PrimitiveType": "String" - }, - "TargetIps": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html", "Properties": { - "DomainName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-domainname", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-name", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "ResolverEndpointId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-resolverendpointid", + "ParameterGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" - }, - "RuleType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-ruletype", - "PrimitiveType": "String", - "Required": true, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "TargetIps": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-targetips", - "ItemType": "TargetAddress", + "ParameterNameValues": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues", + "PrimitiveType": "Json", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -429,41 +442,28 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRuleAssociation", + "path": "/ResourceTypes/AWS::DAX::SubnetGroup", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - }, - "ResolverRuleAssociationId": { - "PrimitiveType": "String" - }, - "ResolverRuleId": { - "PrimitiveType": "String" - }, - "VPCId": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html", "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-name", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "ResolverRuleId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-resolverruleid", + "SubnetGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, - "VPCId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-vpcid", - "PrimitiveType": "String", + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids", + "PrimitiveItemType": "String", "Required": true, - "UpdateType": "Immutable" + "Type": "List", + "UpdateType": "Mutable" } } } diff --git a/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json index 24b9eda5fa..1dbeeaf5bb 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -80,16 +68,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -99,9 +91,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -123,15 +117,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -141,9 +139,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/07_ssm_service_addition.json index 8903a3f760..aa893de285 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-southeast-1/07_ssm_service_addition.json @@ -1,4 +1,118 @@ [ + { + "op": "add", + "path": "/ResourceTypes/AWS::CodeCommit::Repository", + "value": { + "Attributes": { + "Arn": { + "PrimitiveType": "String" + }, + "CloneUrlHttp": { + "PrimitiveType": "String" + }, + "CloneUrlSsh": { + "PrimitiveType": "String" + }, + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Properties": { + "Code": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", + "Required": false, + "Type": "Code", + "UpdateType": "Mutable" + }, + "RepositoryDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "RepositoryName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Triggers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", + "ItemType": "RepositoryTrigger", + "Required": false, + "Type": "List", + "UpdateType": "Conditional" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, { "op": "add", "path": "/ResourceTypes/AWS::DAX::Cluster", @@ -151,120 +265,6 @@ } } }, - { - "op": "add", - "path": "/ResourceTypes/AWS::CodeCommit::Repository", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "CloneUrlHttp": { - "PrimitiveType": "String" - }, - "CloneUrlSsh": { - "PrimitiveType": "String" - }, - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", - "Properties": { - "Code": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", - "Required": false, - "Type": "Code", - "UpdateType": "Mutable" - }, - "RepositoryDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "RepositoryName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Triggers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", - "ItemType": "RepositoryTrigger", - "Required": false, - "Type": "List", - "UpdateType": "Conditional" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", - "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::Neptune::DBCluster", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json index fea3f4c8b6..2fc50e7a2d 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -81,22 +69,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -118,21 +112,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/07_ssm_service_addition.json index fb0c84f105..181d6aeadc 100644 --- a/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/ap-southeast-2/07_ssm_service_addition.json @@ -1,4 +1,118 @@ [ + { + "op": "add", + "path": "/ResourceTypes/AWS::CodeCommit::Repository", + "value": { + "Attributes": { + "Arn": { + "PrimitiveType": "String" + }, + "CloneUrlHttp": { + "PrimitiveType": "String" + }, + "CloneUrlSsh": { + "PrimitiveType": "String" + }, + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Properties": { + "Code": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", + "Required": false, + "Type": "Code", + "UpdateType": "Mutable" + }, + "RepositoryDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "RepositoryName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Triggers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", + "ItemType": "RepositoryTrigger", + "Required": false, + "Type": "List", + "UpdateType": "Conditional" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, { "op": "add", "path": "/ResourceTypes/AWS::DAX::Cluster", @@ -151,120 +265,6 @@ } } }, - { - "op": "add", - "path": "/ResourceTypes/AWS::CodeCommit::Repository", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "CloneUrlHttp": { - "PrimitiveType": "String" - }, - "CloneUrlSsh": { - "PrimitiveType": "String" - }, - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", - "Properties": { - "Code": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", - "Required": false, - "Type": "Code", - "UpdateType": "Mutable" - }, - "RepositoryDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "RepositoryName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Triggers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", - "ItemType": "RepositoryTrigger", - "Required": false, - "Type": "List", - "UpdateType": "Conditional" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", - "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::Neptune::DBCluster", diff --git a/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json index f565e0ebeb..9c05890792 100644 --- a/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/ca-central-1/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -48,16 +40,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -71,15 +67,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/ca-central-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/ca-central-1/07_ssm_service_addition.json index 2dc38541f3..4ebb63be38 100644 --- a/src/cfnlint/data/ExtendedSpecs/ca-central-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/ca-central-1/07_ssm_service_addition.json @@ -1,37 +1,4 @@ [ - { - "op": "add", - "path": "/ResourceTypes/AWS::Athena::NamedQuery", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", - "Properties": { - "Database": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "QueryString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::CodeCommit::Repository", @@ -80,72 +47,6 @@ } } }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", - "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", @@ -316,6 +217,105 @@ } } }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Athena::NamedQuery", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", + "Properties": { + "Database": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "QueryString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, { "op": "add", "path": "/ResourceTypes/AWS::Cognito::IdentityPool", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json index 98eedaedb5..e27a21f615 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-central-1/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", @@ -84,22 +72,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -121,21 +115,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-central-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/eu-central-1/07_ssm_service_addition.json index 1b5964bb24..bb8c3a1ffe 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-central-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-central-1/07_ssm_service_addition.json @@ -1,156 +1,4 @@ [ - { - "op": "add", - "path": "/ResourceTypes/AWS::DAX::Cluster", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "ClusterDiscoveryEndpoint": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html", - "Properties": { - "AvailabilityZones": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "ClusterName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "IAMRoleARN": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "NodeType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "NotificationTopicARN": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ParameterGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "PreferredMaintenanceWindow": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ReplicationFactor": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor", - "PrimitiveType": "Integer", - "Required": true, - "UpdateType": "Mutable" - }, - "SSESpecification": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification", - "Required": false, - "Type": "SSESpecification", - "UpdateType": "Immutable" - }, - "SecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "SubnetGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DAX::ParameterGroup", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html", - "Properties": { - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ParameterGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "ParameterNameValues": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DAX::SubnetGroup", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html", - "Properties": { - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "SubnetGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "SubnetIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids", - "PrimitiveItemType": "String", - "Required": true, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::CodeCommit::Repository", @@ -429,6 +277,158 @@ } } }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DAX::Cluster", + "value": { + "Attributes": { + "Arn": { + "PrimitiveType": "String" + }, + "ClusterDiscoveryEndpoint": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html", + "Properties": { + "AvailabilityZones": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "ClusterName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "IAMRoleARN": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "NodeType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "NotificationTopicARN": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ParameterGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "PreferredMaintenanceWindow": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationFactor": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor", + "PrimitiveType": "Integer", + "Required": true, + "UpdateType": "Mutable" + }, + "SSESpecification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification", + "Required": false, + "Type": "SSESpecification", + "UpdateType": "Immutable" + }, + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DAX::ParameterGroup", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html", + "Properties": { + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ParameterGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "ParameterNameValues": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DAX::SubnetGroup", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html", + "Properties": { + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SubnetGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids", + "PrimitiveItemType": "String", + "Required": true, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, { "op": "add", "path": "/ResourceTypes/AWS::FSx::FileSystem", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json index 25cf147d40..ced522a71a 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-north-1/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c5.12xlarge", "c5.18xlarge", "c5.24xlarge", @@ -37,29 +29,37 @@ "i3.large", "i3.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t3.2xlarge", @@ -108,5 +108,16 @@ "ds2.8xlarge", "ds2.xlarge" ] + }, + { + "op": "add", + "path": "/ValueTypes/NeptuneInstanceClass/AllowedValues", + "value": [ + "db.r5.12xl", + "db.r5.2xl", + "db.r5.4xl", + "db.r5.large", + "db.r5.xl" + ] } ] \ No newline at end of file diff --git a/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json index db363ce8a1..f31e29bb6f 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-north-1/07_ssm_service_addition.json @@ -1,93 +1,328 @@ [ { "op": "add", - "path": "/ResourceTypes/AWS::SecretsManager::ResourcePolicy", + "path": "/ResourceTypes/AWS::Glue::Classifier", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", "Properties": { - "ResourcePolicy": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-resourcepolicy", + "CsvClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", + "Required": false, + "Type": "CsvClassifier", + "UpdateType": "Mutable" + }, + "GrokClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", + "Required": false, + "Type": "GrokClassifier", + "UpdateType": "Mutable" + }, + "JsonClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", + "Required": false, + "Type": "JsonClassifier", + "UpdateType": "Mutable" + }, + "XMLClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", + "Required": false, + "Type": "XMLClassifier", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Connection", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "ConnectionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", + "Required": true, + "Type": "ConnectionInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Crawler", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", + "Properties": { + "Classifiers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "Configuration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "CrawlerSecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule", + "Required": false, + "Type": "Schedule", + "UpdateType": "Mutable" + }, + "SchemaChangePolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy", + "Required": false, + "Type": "SchemaChangePolicy", + "UpdateType": "Mutable" + }, + "TablePrefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tags", "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + }, + "Targets": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets", "Required": true, + "Type": "Targets", "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::DataCatalogEncryptionSettings", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" }, - "SecretId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-secretid", + "DataCatalogEncryptionSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings", + "Required": true, + "Type": "DataCatalogEncryptionSettings", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Database", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" + }, + "DatabaseInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput", + "Required": true, + "Type": "DatabaseInput", + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::SecretsManager::RotationSchedule", + "path": "/ResourceTypes/AWS::Glue::DevEndpoint", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html", "Properties": { - "RotationLambdaARN": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-rotationlambdaarn", + "EndpointName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "ExtraJarsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "RotationRules": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-rotationrules", + "ExtraPythonLibsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path", + "PrimitiveType": "String", "Required": false, - "Type": "RotationRules", "UpdateType": "Mutable" }, - "SecretId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-secretid", + "NumberOfNodes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "PublicKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" + "UpdateType": "Mutable" + }, + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securityconfiguration", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::SecretsManager::Secret", + "path": "/ResourceTypes/AWS::Glue::Job", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html", "Properties": { + "AllocatedCapacity": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "Command": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command", + "Required": true, + "Type": "JobCommand", + "UpdateType": "Mutable" + }, + "Connections": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections", + "Required": false, + "Type": "ConnectionsList", + "UpdateType": "Mutable" + }, + "DefaultArguments": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + }, "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-description", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "GenerateSecretString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-generatesecretstring", + "ExecutionProperty": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty", "Required": false, - "Type": "GenerateSecretString", + "Type": "ExecutionProperty", "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-kmskeyid", + "LogUri": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, + "MaxRetries": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-name", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "SecretString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-secretstring", + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-securityconfiguration", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-tags", - "ItemType": "Tag", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -95,26 +330,198 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::SecretsManager::SecretTargetAttachment", + "path": "/ResourceTypes/AWS::Glue::Partition", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html", "Properties": { - "SecretId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-secretid", + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid", "PrimitiveType": "String", "Required": true, + "UpdateType": "Immutable" + }, + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "PartitionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput", + "Required": true, + "Type": "PartitionInput", "UpdateType": "Mutable" }, - "TargetId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-targetid", + "TableName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename", "PrimitiveType": "String", "Required": true, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::SecurityConfiguration", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html", + "Properties": { + "EncryptionConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration", + "Required": true, + "Type": "EncryptionConfiguration", "UpdateType": "Mutable" }, - "TargetType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-targettype", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-name", "PrimitiveType": "String", "Required": true, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Table", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "TableInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput", + "Required": true, + "Type": "TableInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Trigger", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html", + "Properties": { + "Actions": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions", + "ItemType": "Action", + "Required": true, + "Type": "List", + "UpdateType": "Mutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Predicate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate", + "Required": false, + "Type": "Predicate", + "UpdateType": "Mutable" + }, + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" + }, + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -196,26 +603,176 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "path": "/ResourceTypes/AWS::GuardDuty::Detector", "value": { - "Attributes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html", + "Properties": { + "Enable": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-enable", + "PrimitiveType": "Boolean", + "Required": true, + "UpdateType": "Mutable" + }, + "FindingPublishingFrequency": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-findingpublishingfrequency", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::Filter", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html", + "Properties": { + "Action": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-action", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-description", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "FindingCriteria": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-findingcriteria", + "Required": true, + "Type": "FindingCriteria", + "UpdateType": "Mutable" + }, "Name": { - "PrimitiveType": "String" + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Rank": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-rank", + "PrimitiveType": "Integer", + "Required": true, + "UpdateType": "Mutable" } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::IPSet", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html", "Properties": { + "Activate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-activate", + "PrimitiveType": "Boolean", + "Required": true, + "UpdateType": "Mutable" + }, + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Format": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-format", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Location": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-location", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::Master", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html", + "Properties": { + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "InvitationId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-invitationid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "MasterId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-masterid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::Member", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html", + "Properties": { + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DisableEmailNotification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-disableemailnotification", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "Email": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-email", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", + "MemberId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-memberid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Message": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-message", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Status": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-status", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -223,38 +780,38 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "path": "/ResourceTypes/AWS::GuardDuty::ThreatIntelSet", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html", "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", + "Activate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-activate", + "PrimitiveType": "Boolean", "Required": true, "UpdateType": "Mutable" }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-detectorid", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "Format": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-format", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", + "Location": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-location", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-name", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -386,129 +943,45 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Detector", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html", - "Properties": { - "Enable": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-enable", - "PrimitiveType": "Boolean", - "Required": true, - "UpdateType": "Mutable" - }, - "FindingPublishingFrequency": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-findingpublishingfrequency", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Filter", + "path": "/ResourceTypes/AWS::SecretsManager::ResourcePolicy", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html", "Properties": { - "Action": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-action", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-description", - "PrimitiveType": "String", + "ResourcePolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-resourcepolicy", + "PrimitiveType": "Json", "Required": true, "UpdateType": "Mutable" }, - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-detectorid", + "SecretId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-secretid", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" - }, - "FindingCriteria": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-findingcriteria", - "Required": true, - "Type": "FindingCriteria", - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-name", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Rank": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-rank", - "PrimitiveType": "Integer", - "Required": true, - "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::IPSet", + "path": "/ResourceTypes/AWS::SecretsManager::RotationSchedule", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html", "Properties": { - "Activate": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-activate", - "PrimitiveType": "Boolean", - "Required": true, - "UpdateType": "Mutable" - }, - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-detectorid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Format": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-format", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Location": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-location", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-name", + "RotationLambdaARN": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-rotationlambdaarn", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Master", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html", - "Properties": { - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-detectorid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" }, - "InvitationId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-invitationid", - "PrimitiveType": "String", + "RotationRules": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-rotationrules", "Required": false, - "UpdateType": "Immutable" + "Type": "RotationRules", + "UpdateType": "Mutable" }, - "MasterId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-masterid", + "SecretId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-secretid", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" @@ -518,44 +991,45 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Member", + "path": "/ResourceTypes/AWS::SecretsManager::Secret", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html", "Properties": { - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-detectorid", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-description", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Required": false, + "UpdateType": "Mutable" }, - "DisableEmailNotification": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-disableemailnotification", - "PrimitiveType": "Boolean", + "GenerateSecretString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-generatesecretstring", "Required": false, + "Type": "GenerateSecretString", "UpdateType": "Mutable" }, - "Email": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-email", + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-kmskeyid", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Required": false, + "UpdateType": "Mutable" }, - "MemberId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-memberid", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-name", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, - "Message": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-message", + "SecretString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-secretstring", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Status": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-status", - "PrimitiveType": "String", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-tags", + "ItemType": "Tag", "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -563,38 +1037,26 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::ThreatIntelSet", + "path": "/ResourceTypes/AWS::SecretsManager::SecretTargetAttachment", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html", "Properties": { - "Activate": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-activate", - "PrimitiveType": "Boolean", - "Required": true, - "UpdateType": "Mutable" - }, - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-detectorid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Format": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-format", + "SecretId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-secretid", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "Location": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-location", + "TargetId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-targetid", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-name", + "TargetType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-targettype", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Mutable" } } diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json index 0035bebaf4..c32f7a49b0 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-1/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -108,22 +96,28 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -146,21 +140,27 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json index 2834c494fa..2469b182f5 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-2/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -52,16 +44,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -75,15 +71,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json index 04e7d553b5..4b01452078 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-2/07_ssm_service_addition.json @@ -405,72 +405,6 @@ } } }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", - "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", @@ -641,6 +575,72 @@ } } }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, { "op": "add", "path": "/ResourceTypes/AWS::AmazonMQ::Broker", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json index bbe72500d6..1bc880c999 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-3/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", @@ -48,16 +40,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -68,15 +64,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/eu-west-3/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/eu-west-3/07_ssm_service_addition.json index 640f78012a..358910a5f7 100644 --- a/src/cfnlint/data/ExtendedSpecs/eu-west-3/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/eu-west-3/07_ssm_service_addition.json @@ -1,203 +1,310 @@ [ { "op": "add", - "path": "/ResourceTypes/AWS::DMS::Certificate", + "path": "/ResourceTypes/AWS::CodeCommit::Repository", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", + "Attributes": { + "Arn": { + "PrimitiveType": "String" + }, + "CloneUrlHttp": { + "PrimitiveType": "String" + }, + "CloneUrlSsh": { + "PrimitiveType": "String" + }, + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", "Properties": { - "CertificateIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", - "PrimitiveType": "String", + "Code": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", "Required": false, - "UpdateType": "Immutable" + "Type": "Code", + "UpdateType": "Mutable" }, - "CertificatePem": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", + "RepositoryDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "CertificateWallet": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", + "RepositoryName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Triggers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", + "ItemType": "RepositoryTrigger", "Required": false, - "UpdateType": "Immutable" + "Type": "List", + "UpdateType": "Conditional" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::Endpoint", + "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", "value": { "Attributes": { - "ExternalId": { + "Arn": { + "PrimitiveType": "String" + }, + "Direction": { + "PrimitiveType": "String" + }, + "HostVPCId": { + "PrimitiveType": "String" + }, + "IpAddressCount": { + "PrimitiveType": "String" + }, + "Name": { + "PrimitiveType": "String" + }, + "ResolverEndpointId": { "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html", "Properties": { - "CertificateArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", + "Direction": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-direction", "PrimitiveType": "String", - "Required": false, + "Required": true, + "UpdateType": "Immutable" + }, + "IpAddresses": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-ipaddresses", + "ItemType": "IpAddressRequest", + "Required": true, + "Type": "List", "UpdateType": "Mutable" }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-name", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "DynamoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", - "Required": false, - "Type": "DynamoDbSettings", - "UpdateType": "Mutable" + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-securitygroupids", + "PrimitiveItemType": "String", + "Required": true, + "Type": "List", + "UpdateType": "Immutable" }, - "ElasticsearchSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-tags", + "ItemType": "Tag", "Required": false, - "Type": "ElasticsearchSettings", + "Type": "List", "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRule", + "value": { + "Attributes": { + "Arn": { + "PrimitiveType": "String" }, - "EndpointIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" + "DomainName": { + "PrimitiveType": "String" }, - "EndpointType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" + "Name": { + "PrimitiveType": "String" }, - "EngineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", + "ResolverEndpointId": { + "PrimitiveType": "String" + }, + "ResolverRuleId": { + "PrimitiveType": "String" + }, + "TargetIps": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html", + "Properties": { + "DomainName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-domainname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "ExtraConnectionAttributes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-name", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "KinesisSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", + "ResolverEndpointId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-resolverendpointid", + "PrimitiveType": "String", "Required": false, - "Type": "KinesisSettings", "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", + "RuleType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-ruletype", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "MongoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-tags", + "ItemType": "Tag", "Required": false, - "Type": "MongoDbSettings", + "Type": "List", "UpdateType": "Mutable" }, - "Password": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", - "PrimitiveType": "String", + "TargetIps": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-targetips", + "ItemType": "TargetAddress", "Required": false, + "Type": "List", "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRuleAssociation", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" }, - "Port": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", - "PrimitiveType": "Integer", - "Required": false, - "UpdateType": "Mutable" + "ResolverRuleAssociationId": { + "PrimitiveType": "String" }, - "S3Settings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", - "Required": false, - "Type": "S3Settings", - "UpdateType": "Mutable" + "ResolverRuleId": { + "PrimitiveType": "String" }, - "ServerName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", + "VPCId": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-name", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "SslMode": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", + "ResolverRuleId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-resolverruleid", "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", + "Required": true, "UpdateType": "Immutable" }, - "Username": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", + "VPCId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-vpcid", "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" + "Required": true, + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::EventSubscription", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", "Properties": { - "Enabled": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", - "PrimitiveType": "Boolean", - "Required": false, - "UpdateType": "Mutable" + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" }, - "EventCategories": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", - "PrimitiveItemType": "String", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", "Required": false, "Type": "List", "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" }, - "SnsTopicArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "SourceIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", - "PrimitiveItemType": "String", + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Immutable" }, - "SourceType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", - "PrimitiveType": "String", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", "Required": false, + "Type": "List", "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::Certificate", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", + "Properties": { + "CertificateIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" }, - "SubscriptionName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", + "CertificatePem": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", - "ItemType": "Tag", + "CertificateWallet": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Immutable" } } @@ -205,379 +312,281 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", + "path": "/ResourceTypes/AWS::DMS::Endpoint", "value": { "Attributes": { - "ReplicationInstancePrivateIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" - }, - "ReplicationInstancePublicIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" + "ExternalId": { + "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", "Properties": { - "AllocatedStorage": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", - "PrimitiveType": "Integer", + "CertificateArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "AllowMajorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", - "PrimitiveType": "Boolean", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "AutoMinorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", - "PrimitiveType": "Boolean", + "DynamoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", "Required": false, + "Type": "DynamoDbSettings", "UpdateType": "Mutable" }, - "AvailabilityZone": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "EngineVersion": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", - "PrimitiveType": "String", + "ElasticsearchSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", "Required": false, + "Type": "ElasticsearchSettings", "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", + "EndpointIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" - }, - "MultiAZ": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", - "PrimitiveType": "Boolean", - "Required": false, "UpdateType": "Mutable" }, - "PreferredMaintenanceWindow": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", + "EndpointType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Mutable" }, - "PubliclyAccessible": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", - "PrimitiveType": "Boolean", - "Required": false, - "UpdateType": "Immutable" - }, - "ReplicationInstanceClass": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", + "EngineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "ReplicationInstanceIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", + "ExtraConnectionAttributes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", - "PrimitiveType": "String", + "KinesisSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", "Required": false, - "UpdateType": "Immutable" + "Type": "KinesisSettings", + "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", - "ItemType": "Tag", + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Immutable" }, - "VpcSecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", - "PrimitiveItemType": "String", + "MongoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", - "Properties": { - "ReplicationSubnetGroupDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", - "PrimitiveType": "String", - "Required": true, + "Type": "MongoDbSettings", "UpdateType": "Mutable" }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", + "Password": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" - }, - "SubnetIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", - "PrimitiveItemType": "String", - "Required": true, - "Type": "List", "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationTask", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", - "Properties": { - "CdcStartTime": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", - "PrimitiveType": "Double", + "Port": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", + "PrimitiveType": "Integer", "Required": false, "UpdateType": "Mutable" }, - "MigrationType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "ReplicationInstanceArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "ReplicationTaskIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", - "PrimitiveType": "String", + "S3Settings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", "Required": false, + "Type": "S3Settings", "UpdateType": "Mutable" }, - "ReplicationTaskSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", + "ServerName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "SourceEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "TableMappings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", + "SslMode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Mutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", "ItemType": "Tag", "Required": false, "Type": "List", "UpdateType": "Immutable" }, - "TargetEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" + "Required": false, + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::CodeCommit::Repository", + "path": "/ResourceTypes/AWS::DMS::EventSubscription", "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "CloneUrlHttp": { - "PrimitiveType": "String" - }, - "CloneUrlSsh": { - "PrimitiveType": "String" - }, - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", "Properties": { - "Code": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", + "Enabled": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", + "PrimitiveType": "Boolean", "Required": false, - "Type": "Code", "UpdateType": "Mutable" }, - "RepositoryDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", - "PrimitiveType": "String", + "EventCategories": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", + "PrimitiveItemType": "String", "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "RepositoryName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", + "SnsTopicArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "Triggers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", - "ItemType": "RepositoryTrigger", + "SourceIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", + "PrimitiveItemType": "String", "Required": false, "Type": "List", - "UpdateType": "Conditional" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "UpdateType": "Immutable" + }, + "SourceType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SubscriptionName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", + "ItemType": "Tag", "Required": false, "Type": "List", - "UpdateType": "Mutable" + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", "value": { "Attributes": { - "Name": { - "PrimitiveType": "String" + "ReplicationInstancePrivateIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" + }, + "ReplicationInstancePublicIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, + "AllocatedStorage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", + "PrimitiveType": "Integer", + "Required": false, "UpdateType": "Mutable" }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", - "PrimitiveType": "String", - "Required": true, + "AllowMajorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", + "PrimitiveType": "Boolean", + "Required": false, "UpdateType": "Mutable" }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "AutoMinorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "AvailabilityZone": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", + "EngineVersion": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", + "PrimitiveType": "String", "Required": false, - "Type": "List", "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "Direction": { - "PrimitiveType": "String" - }, - "HostVPCId": { - "PrimitiveType": "String" }, - "IpAddressCount": { - "PrimitiveType": "String" + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" }, - "Name": { - "PrimitiveType": "String" + "MultiAZ": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" }, - "ResolverEndpointId": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html", - "Properties": { - "Direction": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-direction", + "PreferredMaintenanceWindow": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", "PrimitiveType": "String", - "Required": true, + "Required": false, + "UpdateType": "Mutable" + }, + "PubliclyAccessible": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", + "PrimitiveType": "Boolean", + "Required": false, "UpdateType": "Immutable" }, - "IpAddresses": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-ipaddresses", - "ItemType": "IpAddressRequest", + "ReplicationInstanceClass": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", + "PrimitiveType": "String", "Required": true, - "Type": "List", "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-name", + "ReplicationInstanceIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "SecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-securitygroupids", - "PrimitiveItemType": "String", - "Required": true, - "Type": "List", + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", + "PrimitiveType": "String", + "Required": false, "UpdateType": "Immutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-tags", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", "ItemType": "Tag", "Required": false, "Type": "List", + "UpdateType": "Immutable" + }, + "VpcSecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -585,105 +594,96 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRule", + "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "DomainName": { - "PrimitiveType": "String" - }, - "Name": { - "PrimitiveType": "String" - }, - "ResolverEndpointId": { - "PrimitiveType": "String" - }, - "ResolverRuleId": { - "PrimitiveType": "String" - }, - "TargetIps": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", "Properties": { - "DomainName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-domainname", + "ReplicationSubnetGroupDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-name", - "PrimitiveType": "String", - "Required": false, "UpdateType": "Mutable" }, - "ResolverEndpointId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-resolverendpointid", + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" - }, - "RuleType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-ruletype", - "PrimitiveType": "String", - "Required": true, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-tags", - "ItemType": "Tag", - "Required": false, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", + "PrimitiveItemType": "String", + "Required": true, "Type": "List", "UpdateType": "Mutable" }, - "TargetIps": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-targetips", - "ItemType": "TargetAddress", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", + "ItemType": "Tag", "Required": false, "Type": "List", - "UpdateType": "Mutable" + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Route53Resolver::ResolverRuleAssociation", + "path": "/ResourceTypes/AWS::DMS::ReplicationTask", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", + "Properties": { + "CdcStartTime": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" }, - "ResolverRuleAssociationId": { - "PrimitiveType": "String" + "MigrationType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" }, - "ResolverRuleId": { - "PrimitiveType": "String" + "ReplicationInstanceArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" }, - "VPCId": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-name", + "ReplicationTaskIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationTaskSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", "PrimitiveType": "String", "Required": false, + "UpdateType": "Mutable" + }, + "SourceEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Immutable" }, - "ResolverRuleId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-resolverruleid", + "TableMappings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", "PrimitiveType": "String", "Required": true, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", "UpdateType": "Immutable" }, - "VPCId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-vpcid", + "TargetEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" diff --git a/src/cfnlint/data/ExtendedSpecs/sa-east-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/sa-east-1/05_pricing_property_values.json index 8e89d2224e..f438cf38ec 100644 --- a/src/cfnlint/data/ExtendedSpecs/sa-east-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/sa-east-1/05_pricing_property_values.json @@ -3,8 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -57,9 +55,11 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.xlarge", "r3.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/sa-east-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/sa-east-1/07_ssm_service_addition.json index 7107e0c869..7e77cd580f 100644 --- a/src/cfnlint/data/ExtendedSpecs/sa-east-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/sa-east-1/07_ssm_service_addition.json @@ -1,200 +1,224 @@ [ { "op": "add", - "path": "/ResourceTypes/AWS::DAX::Cluster", + "path": "/ResourceTypes/AWS::CodeCommit::Repository", "value": { "Attributes": { "Arn": { "PrimitiveType": "String" }, - "ClusterDiscoveryEndpoint": { + "CloneUrlHttp": { + "PrimitiveType": "String" + }, + "CloneUrlSsh": { + "PrimitiveType": "String" + }, + "Name": { "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", "Properties": { - "AvailabilityZones": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones", - "PrimitiveItemType": "String", + "Code": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", "Required": false, - "Type": "List", + "Type": "Code", "UpdateType": "Mutable" }, - "ClusterName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description", + "RepositoryDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "IAMRoleARN": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "NodeType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype", + "RepositoryName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" - }, - "NotificationTopicARN": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn", - "PrimitiveType": "String", - "Required": false, "UpdateType": "Mutable" }, - "ParameterGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname", - "PrimitiveType": "String", + "Triggers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", + "ItemType": "RepositoryTrigger", "Required": false, - "UpdateType": "Mutable" + "Type": "List", + "UpdateType": "Conditional" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::ServiceDiscovery::HttpNamespace", + "value": { + "Attributes": { + "Arn": { + "PrimitiveType": "String" }, - "PreferredMaintenanceWindow": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow", + "Id": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html", + "Properties": { + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html#cfn-servicediscovery-httpnamespace-description", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "ReplicationFactor": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor", - "PrimitiveType": "Integer", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html#cfn-servicediscovery-httpnamespace-name", + "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" - }, - "SSESpecification": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification", - "Required": false, - "Type": "SSESpecification", "UpdateType": "Immutable" - }, - "SecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::ServiceDiscovery::Instance", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html", + "Properties": { + "InstanceAttributes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-instanceattributes", + "PrimitiveType": "Map", + "Required": true, "UpdateType": "Mutable" }, - "SubnetGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname", + "InstanceId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-instanceid", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" + "ServiceId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-serviceid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DAX::ParameterGroup", + "path": "/ResourceTypes/AWS::ServiceDiscovery::PrivateDnsNamespace", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html", + "Attributes": { + "Arn": { + "PrimitiveType": "String" + }, + "Id": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html", "Properties": { "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-description", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "ParameterGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-name", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "ParameterNameValues": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" + "Vpc": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-vpc", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DAX::SubnetGroup", + "path": "/ResourceTypes/AWS::ServiceDiscovery::PublicDnsNamespace", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html", + "Attributes": { + "Arn": { + "PrimitiveType": "String" + }, + "Id": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html", "Properties": { "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "SubnetGroupName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "SubnetIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids", - "PrimitiveItemType": "String", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-name", + "PrimitiveType": "String", "Required": true, - "Type": "List", - "UpdateType": "Mutable" + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::CodeCommit::Repository", + "path": "/ResourceTypes/AWS::ServiceDiscovery::Service", "value": { "Attributes": { "Arn": { "PrimitiveType": "String" }, - "CloneUrlHttp": { - "PrimitiveType": "String" - }, - "CloneUrlSsh": { + "Id": { "PrimitiveType": "String" }, "Name": { "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html", "Properties": { - "Code": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-description", + "PrimitiveType": "String", "Required": false, - "Type": "Code", "UpdateType": "Mutable" }, - "RepositoryDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", - "PrimitiveType": "String", + "DnsConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-dnsconfig", "Required": false, + "Type": "DnsConfig", "UpdateType": "Mutable" }, - "RepositoryName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", - "PrimitiveType": "String", - "Required": true, + "HealthCheckConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-healthcheckconfig", + "Required": false, + "Type": "HealthCheckConfig", "UpdateType": "Mutable" }, - "Triggers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", - "ItemType": "RepositoryTrigger", + "HealthCheckCustomConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-healthcheckcustomconfig", "Required": false, - "Type": "List", - "UpdateType": "Conditional" + "Type": "HealthCheckCustomConfig", + "UpdateType": "Immutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "NamespaceId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-namespaceid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" } } } @@ -267,176 +291,152 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::ServiceDiscovery::HttpNamespace", + "path": "/ResourceTypes/AWS::DAX::Cluster", "value": { "Attributes": { "Arn": { "PrimitiveType": "String" }, - "Id": { + "ClusterDiscoveryEndpoint": { "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html", "Properties": { - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html#cfn-servicediscovery-httpnamespace-description", + "AvailabilityZones": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "ClusterName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html#cfn-servicediscovery-httpnamespace-name", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::ServiceDiscovery::Instance", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html", - "Properties": { - "InstanceAttributes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-instanceattributes", - "PrimitiveType": "Map", - "Required": true, + "Required": false, "UpdateType": "Mutable" }, - "InstanceId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-instanceid", + "IAMRoleARN": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "ServiceId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-serviceid", + "NodeType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::ServiceDiscovery::PrivateDnsNamespace", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" }, - "Id": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html", - "Properties": { - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-description", + "NotificationTopicARN": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-name", + "ParameterGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname", "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "PreferredMaintenanceWindow": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationFactor": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor", + "PrimitiveType": "Integer", "Required": true, + "UpdateType": "Mutable" + }, + "SSESpecification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification", + "Required": false, + "Type": "SSESpecification", "UpdateType": "Immutable" }, - "Vpc": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-vpc", + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SubnetGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::ServiceDiscovery::PublicDnsNamespace", + "path": "/ResourceTypes/AWS::DAX::ParameterGroup", "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "Id": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html", "Properties": { "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-description", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-name", + "ParameterGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" + }, + "ParameterNameValues": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::ServiceDiscovery::Service", + "path": "/ResourceTypes/AWS::DAX::SubnetGroup", "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "Id": { - "PrimitiveType": "String" - }, - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html", "Properties": { "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-description", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "DnsConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-dnsconfig", - "Required": false, - "Type": "DnsConfig", - "UpdateType": "Mutable" - }, - "HealthCheckConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-healthcheckconfig", - "Required": false, - "Type": "HealthCheckConfig", - "UpdateType": "Mutable" - }, - "HealthCheckCustomConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-healthcheckcustomconfig", - "Required": false, - "Type": "HealthCheckCustomConfig", - "UpdateType": "Immutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-name", + "SubnetGroupName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "NamespaceId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-namespaceid", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids", + "PrimitiveItemType": "String", + "Required": true, + "Type": "List", + "UpdateType": "Mutable" } } } diff --git a/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json index f1eaee09ed..e9f34a1c1b 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-east-1/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -108,16 +96,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -127,9 +119,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -152,15 +146,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -170,9 +168,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json index 18c3bab153..e4e3b50a9d 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-east-2/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -79,16 +67,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -98,9 +90,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -122,15 +116,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -140,9 +138,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t2.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json index d68ea878ec..8ecd642b5d 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c5.18xlarge", "c5.2xlarge", "c5.4xlarge", @@ -36,29 +28,37 @@ "i3.large", "i3.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t3.2xlarge", diff --git a/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/07_ssm_service_addition.json index ba8fa75fda..739546a208 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/us-gov-east-1/07_ssm_service_addition.json @@ -1,308 +1,328 @@ [ { "op": "add", - "path": "/ResourceTypes/AWS::DMS::Certificate", + "path": "/ResourceTypes/AWS::Glue::Classifier", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", "Properties": { - "CertificateIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", - "PrimitiveType": "String", + "CsvClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", "Required": false, - "UpdateType": "Immutable" + "Type": "CsvClassifier", + "UpdateType": "Mutable" }, - "CertificatePem": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", - "PrimitiveType": "String", + "GrokClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", "Required": false, - "UpdateType": "Immutable" + "Type": "GrokClassifier", + "UpdateType": "Mutable" }, - "CertificateWallet": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", - "PrimitiveType": "String", + "JsonClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", "Required": false, - "UpdateType": "Immutable" + "Type": "JsonClassifier", + "UpdateType": "Mutable" + }, + "XMLClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", + "Required": false, + "Type": "XMLClassifier", + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::Endpoint", + "path": "/ResourceTypes/AWS::Glue::Connection", "value": { - "Attributes": { - "ExternalId": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", "Properties": { - "CertificateArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "ConnectionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", + "Required": true, + "Type": "ConnectionInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Crawler", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", + "Properties": { + "Classifiers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", + "PrimitiveItemType": "String", "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", + "Configuration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "DynamoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", + "CrawlerSecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", + "PrimitiveType": "String", "Required": false, - "Type": "DynamoDbSettings", "UpdateType": "Mutable" }, - "ElasticsearchSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", - "Required": false, - "Type": "ElasticsearchSettings", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Mutable" }, - "EndpointIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "EndpointType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" + "Required": false, + "UpdateType": "Immutable" }, - "EngineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "ExtraConnectionAttributes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule", + "Required": false, + "Type": "Schedule", + "UpdateType": "Mutable" + }, + "SchemaChangePolicy": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy", + "Required": false, + "Type": "SchemaChangePolicy", + "UpdateType": "Mutable" + }, + "TablePrefix": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "KinesisSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "KinesisSettings", "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", + "Targets": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets", + "Required": true, + "Type": "Targets", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::DataCatalogEncryptionSettings", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DataCatalogEncryptionSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings", + "Required": true, + "Type": "DataCatalogEncryptionSettings", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Database", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DatabaseInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput", + "Required": true, + "Type": "DatabaseInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::DevEndpoint", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html", + "Properties": { + "EndpointName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "MongoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", + "ExtraJarsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path", + "PrimitiveType": "String", "Required": false, - "Type": "MongoDbSettings", "UpdateType": "Mutable" }, - "Password": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", + "ExtraPythonLibsS3Path": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Port": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", + "NumberOfNodes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes", "PrimitiveType": "Integer", "Required": false, "UpdateType": "Mutable" }, - "S3Settings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", + "PublicKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey", + "PrimitiveType": "String", "Required": false, - "Type": "S3Settings", "UpdateType": "Mutable" }, - "ServerName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Mutable" }, - "SslMode": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securityconfiguration", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", - "ItemType": "Tag", + "SecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids", + "PrimitiveItemType": "String", "Required": false, "Type": "List", - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "Username": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", + "SubnetId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-tags", + "PrimitiveType": "Json", + "Required": false, + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::EventSubscription", + "path": "/ResourceTypes/AWS::Glue::Job", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html", "Properties": { - "Enabled": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", - "PrimitiveType": "Boolean", + "AllocatedCapacity": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity", + "PrimitiveType": "Double", "Required": false, "UpdateType": "Mutable" }, - "EventCategories": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", + "Command": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command", + "Required": true, + "Type": "JobCommand", "UpdateType": "Mutable" }, - "SnsTopicArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "SourceIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - }, - "SourceType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", - "PrimitiveType": "String", + "Connections": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections", "Required": false, + "Type": "ConnectionsList", "UpdateType": "Mutable" }, - "SubscriptionName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", - "value": { - "Attributes": { - "ReplicationInstancePrivateIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" - }, - "ReplicationInstancePublicIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", - "Properties": { - "AllocatedStorage": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", - "PrimitiveType": "Integer", + "DefaultArguments": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments", + "PrimitiveType": "Json", "Required": false, "UpdateType": "Mutable" }, - "AllowMajorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", - "PrimitiveType": "Boolean", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "AutoMinorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", - "PrimitiveType": "Boolean", + "ExecutionProperty": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty", "Required": false, + "Type": "ExecutionProperty", "UpdateType": "Mutable" }, - "AvailabilityZone": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "EngineVersion": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", + "LogUri": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "MultiAZ": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", - "PrimitiveType": "Boolean", + "MaxRetries": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries", + "PrimitiveType": "Double", "Required": false, "UpdateType": "Mutable" }, - "PreferredMaintenanceWindow": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" - }, - "PubliclyAccessible": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", - "PrimitiveType": "Boolean", - "Required": false, "UpdateType": "Immutable" }, - "ReplicationInstanceClass": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", + "Role": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "ReplicationInstanceIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", + "SecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-securityconfiguration", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - }, - "VpcSecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", - "PrimitiveItemType": "String", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "List", "UpdateType": "Mutable" } } @@ -310,34 +330,32 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", + "path": "/ResourceTypes/AWS::Glue::Partition", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html", "Properties": { - "ReplicationSubnetGroupDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "SubnetIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", - "PrimitiveItemType": "String", + "PartitionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput", "Required": true, - "Type": "List", + "Type": "PartitionInput", "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", + "TableName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Immutable" } } @@ -345,220 +363,207 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationTask", + "path": "/ResourceTypes/AWS::Glue::SecurityConfiguration", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html", "Properties": { - "CdcStartTime": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", - "PrimitiveType": "Double", - "Required": false, + "EncryptionConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration", + "Required": true, + "Type": "EncryptionConfiguration", "UpdateType": "Mutable" }, - "MigrationType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-name", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" - }, - "ReplicationInstanceArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Table", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "ReplicationTaskIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename", "PrimitiveType": "String", - "Required": false, + "Required": true, + "UpdateType": "Immutable" + }, + "TableInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput", + "Required": true, + "Type": "TableInput", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Trigger", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html", + "Properties": { + "Actions": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions", + "ItemType": "Action", + "Required": true, + "Type": "List", "UpdateType": "Mutable" }, - "ReplicationTaskSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "SourceEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, - "TableMappings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", + "Predicate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate", + "Required": false, + "Type": "Predicate", + "UpdateType": "Mutable" + }, + "Schedule": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Mutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", - "ItemType": "Tag", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-tags", + "PrimitiveType": "Json", "Required": false, - "Type": "List", - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "TargetEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", + "Type": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Classifier", + "path": "/ResourceTypes/AWS::CodeCommit::Repository", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", - "Properties": { - "CsvClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", - "Required": false, - "Type": "CsvClassifier", - "UpdateType": "Mutable" + "Attributes": { + "Arn": { + "PrimitiveType": "String" }, - "GrokClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", - "Required": false, - "Type": "GrokClassifier", - "UpdateType": "Mutable" + "CloneUrlHttp": { + "PrimitiveType": "String" }, - "JsonClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", + "CloneUrlSsh": { + "PrimitiveType": "String" + }, + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Properties": { + "Code": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", "Required": false, - "Type": "JsonClassifier", + "Type": "Code", "UpdateType": "Mutable" }, - "XMLClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", + "RepositoryDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", + "PrimitiveType": "String", "Required": false, - "Type": "XMLClassifier", "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Connection", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", - "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" }, - "ConnectionInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", + "RepositoryName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", + "PrimitiveType": "String", "Required": true, - "Type": "ConnectionInput", "UpdateType": "Mutable" + }, + "Triggers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", + "ItemType": "RepositoryTrigger", + "Required": false, + "Type": "List", + "UpdateType": "Conditional" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Crawler", + "path": "/ResourceTypes/AWS::Athena::NamedQuery", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", "Properties": { - "Classifiers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "Configuration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "CrawlerSecurityConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename", + "Database": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "Role": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Schedule": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule", - "Required": false, - "Type": "Schedule", - "UpdateType": "Mutable" - }, - "SchemaChangePolicy": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy", - "Required": false, - "Type": "SchemaChangePolicy", - "UpdateType": "Mutable" - }, - "TablePrefix": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix", + "QueryString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tags", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" - }, - "Targets": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets", "Required": true, - "Type": "Targets", - "UpdateType": "Mutable" + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::DataCatalogEncryptionSettings", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html", + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-catalogid", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "DataCatalogEncryptionSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings", - "Required": true, - "Type": "DataCatalogEncryptionSettings", + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -566,20 +571,38 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Database", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html", + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid", + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", "PrimitiveType": "String", "Required": true, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "DatabaseInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput", + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", "Required": true, - "Type": "DatabaseInput", + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", "UpdateType": "Mutable" } } @@ -587,283 +610,149 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::DevEndpoint", + "path": "/ResourceTypes/AWS::DMS::Certificate", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", "Properties": { - "EndpointName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname", + "CertificateIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "ExtraJarsS3Path": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ExtraPythonLibsS3Path": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "NumberOfNodes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes", - "PrimitiveType": "Integer", - "Required": false, - "UpdateType": "Mutable" - }, - "PublicKey": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "SecurityConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securityconfiguration", + "CertificatePem": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" - }, - "SecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "SubnetId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid", + "CertificateWallet": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", "PrimitiveType": "String", "Required": false, - "UpdateType": "Mutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-tags", - "PrimitiveType": "Json", - "Required": false, - "UpdateType": "Mutable" + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::Glue::Job", + "path": "/ResourceTypes/AWS::DMS::Endpoint", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html", + "Attributes": { + "ExternalId": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", "Properties": { - "AllocatedCapacity": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity", - "PrimitiveType": "Double", - "Required": false, - "UpdateType": "Mutable" - }, - "Command": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command", - "Required": true, - "Type": "JobCommand", - "UpdateType": "Mutable" - }, - "Connections": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections", - "Required": false, - "Type": "ConnectionsList", - "UpdateType": "Mutable" - }, - "DefaultArguments": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments", - "PrimitiveType": "Json", + "CertificateArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description", + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "ExecutionProperty": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty", + "DynamoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", "Required": false, - "Type": "ExecutionProperty", + "Type": "DynamoDbSettings", "UpdateType": "Mutable" }, - "LogUri": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri", - "PrimitiveType": "String", + "ElasticsearchSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", "Required": false, + "Type": "ElasticsearchSettings", "UpdateType": "Mutable" }, - "MaxRetries": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries", - "PrimitiveType": "Double", + "EndpointIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name", + "EndpointType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" + "Required": true, + "UpdateType": "Mutable" }, - "Role": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role", + "EngineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "SecurityConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-securityconfiguration", + "ExtraConnectionAttributes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-tags", - "PrimitiveType": "Json", + "KinesisSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", "Required": false, + "Type": "KinesisSettings", "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Partition", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html", - "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename", + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Immutable" }, - "PartitionInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput", - "Required": true, - "Type": "PartitionInput", + "MongoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", + "Required": false, + "Type": "MongoDbSettings", "UpdateType": "Mutable" }, - "TableName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename", + "Password": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::SecurityConfiguration", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html", - "Properties": { - "EncryptionConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration", - "Required": true, - "Type": "EncryptionConfiguration", + "Required": false, "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Table", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html", - "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "TableInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput", - "Required": true, - "Type": "TableInput", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Trigger", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html", - "Properties": { - "Actions": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions", - "ItemType": "Action", - "Required": true, - "Type": "List", + "Port": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", + "PrimitiveType": "Integer", + "Required": false, "UpdateType": "Mutable" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description", - "PrimitiveType": "String", + "S3Settings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", "Required": false, + "Type": "S3Settings", "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name", + "ServerName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" - }, - "Predicate": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate", - "Required": false, - "Type": "Predicate", "UpdateType": "Mutable" }, - "Schedule": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule", + "SslMode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-tags", - "PrimitiveType": "Json", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", + "ItemType": "Tag", "Required": false, - "UpdateType": "Mutable" + "Type": "List", + "UpdateType": "Immutable" }, - "Type": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type", + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Mutable" } } @@ -871,32 +760,53 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::Athena::NamedQuery", + "path": "/ResourceTypes/AWS::DMS::EventSubscription", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", "Properties": { - "Database": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database", + "Enabled": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "EventCategories": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SnsTopicArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", "PrimitiveType": "String", "Required": true, + "UpdateType": "Mutable" + }, + "SourceIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", "UpdateType": "Immutable" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description", + "SourceType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", "PrimitiveType": "String", "Required": false, - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name", + "SubscriptionName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "QueryString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring", - "PrimitiveType": "String", - "Required": true, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", "UpdateType": "Immutable" } } @@ -904,114 +814,204 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::CodeCommit::Repository", + "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", "value": { "Attributes": { - "Arn": { - "PrimitiveType": "String" - }, - "CloneUrlHttp": { - "PrimitiveType": "String" - }, - "CloneUrlSsh": { - "PrimitiveType": "String" + "ReplicationInstancePrivateIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" }, - "Name": { - "PrimitiveType": "String" + "ReplicationInstancePublicIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", "Properties": { - "Code": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code", + "AllocatedStorage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", + "PrimitiveType": "Integer", "Required": false, - "Type": "Code", "UpdateType": "Mutable" }, - "RepositoryDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription", + "AllowMajorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "AutoMinorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "AvailabilityZone": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "EngineVersion": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "RepositoryName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname", + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "MultiAZ": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "PreferredMaintenanceWindow": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "PubliclyAccessible": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "ReplicationInstanceClass": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "Triggers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers", - "ItemType": "RepositoryTrigger", + "ReplicationInstanceIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", + "ItemType": "Tag", "Required": false, "Type": "List", - "UpdateType": "Conditional" + "UpdateType": "Immutable" + }, + "VpcSecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "ReplicationSubnetGroupDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", "PrimitiveType": "String", "Required": true, + "UpdateType": "Mutable" + }, + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", + "PrimitiveType": "String", + "Required": false, "UpdateType": "Immutable" }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", + "PrimitiveItemType": "String", + "Required": true, + "Type": "List", + "UpdateType": "Mutable" + }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", + "ItemType": "Tag", "Required": false, "Type": "List", - "UpdateType": "Mutable" + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "path": "/ResourceTypes/AWS::DMS::ReplicationTask", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "CdcStartTime": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "MigrationType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", "PrimitiveType": "String", "Required": true, "UpdateType": "Mutable" }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "ReplicationInstanceArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", "PrimitiveType": "String", "Required": true, + "UpdateType": "Immutable" + }, + "ReplicationTaskIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", + "PrimitiveType": "String", + "Required": false, "UpdateType": "Mutable" }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "ReplicationTaskSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", "PrimitiveType": "String", "Required": false, + "UpdateType": "Mutable" + }, + "SourceEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", + "PrimitiveType": "String", + "Required": true, "UpdateType": "Immutable" }, + "TableMappings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", + "ItemType": "Tag", "Required": false, "Type": "List", - "UpdateType": "Mutable" + "UpdateType": "Immutable" + }, + "TargetEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" } } } diff --git a/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json index ae3b4b8ebe..7aeab8d002 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -84,16 +76,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -115,15 +111,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/07_ssm_service_addition.json index 28d75c87fe..e892a9fc9a 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/us-gov-west-1/07_ssm_service_addition.json @@ -1,488 +1,212 @@ [ { "op": "add", - "path": "/ResourceTypes/AWS::DMS::Certificate", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", - "Properties": { - "CertificateIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "CertificatePem": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "CertificateWallet": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DMS::Endpoint", + "path": "/ResourceTypes/AWS::CodeBuild::Project", "value": { "Attributes": { - "ExternalId": { + "Arn": { "PrimitiveType": "String" } }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html", "Properties": { - "CertificateArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "DatabaseName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", - "PrimitiveType": "String", - "Required": false, + "Artifacts": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-artifacts", + "Required": true, + "Type": "Artifacts", "UpdateType": "Mutable" }, - "DynamoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", + "BadgeEnabled": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-badgeenabled", + "PrimitiveType": "Boolean", "Required": false, - "Type": "DynamoDbSettings", "UpdateType": "Mutable" }, - "ElasticsearchSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", + "Cache": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-cache", "Required": false, - "Type": "ElasticsearchSettings", + "Type": "ProjectCache", "UpdateType": "Mutable" }, - "EndpointIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-description", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "EndpointType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", + "EncryptionKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-encryptionkey", "PrimitiveType": "String", - "Required": true, + "Required": false, "UpdateType": "Mutable" }, - "EngineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", - "PrimitiveType": "String", + "Environment": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-environment", "Required": true, + "Type": "Environment", "UpdateType": "Mutable" }, - "ExtraConnectionAttributes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "KinesisSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", + "LogsConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-logsconfig", "Required": false, - "Type": "KinesisSettings", + "Type": "LogsConfig", "UpdateType": "Mutable" }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-name", "PrimitiveType": "String", "Required": false, "UpdateType": "Immutable" }, - "MongoDbSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", + "QueuedTimeoutInMinutes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-queuedtimeoutinminutes", + "PrimitiveType": "Integer", "Required": false, - "Type": "MongoDbSettings", "UpdateType": "Mutable" }, - "Password": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", - "PrimitiveType": "String", + "SecondaryArtifacts": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondaryartifacts", + "ItemType": "Artifacts", "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "Port": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", - "PrimitiveType": "Integer", + "SecondarySourceVersions": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondarysourceversions", + "ItemType": "ProjectSourceVersion", "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "S3Settings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", + "SecondarySources": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondarysources", + "ItemType": "Source", "Required": false, - "Type": "S3Settings", + "Type": "List", "UpdateType": "Mutable" }, - "ServerName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", + "ServiceRole": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-servicerole", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Mutable" }, - "SslMode": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", + "Source": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-source", + "Required": true, + "Type": "Source", + "UpdateType": "Mutable" + }, + "SourceVersion": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-sourceversion", "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-tags", "ItemType": "Tag", "Required": false, "Type": "List", - "UpdateType": "Immutable" + "UpdateType": "Mutable" }, - "Username": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", - "PrimitiveType": "String", + "TimeoutInMinutes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-timeoutinminutes", + "PrimitiveType": "Integer", "Required": false, "UpdateType": "Mutable" + }, + "Triggers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-triggers", + "Required": false, + "Type": "ProjectTriggers", + "UpdateType": "Mutable" + }, + "VpcConfig": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-vpcconfig", + "Required": false, + "Type": "VpcConfig", + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::EventSubscription", + "path": "/ResourceTypes/AWS::Glue::Classifier", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", "Properties": { - "Enabled": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", - "PrimitiveType": "Boolean", + "CsvClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", "Required": false, + "Type": "CsvClassifier", "UpdateType": "Mutable" }, - "EventCategories": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", - "PrimitiveItemType": "String", + "GrokClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "SnsTopicArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", - "PrimitiveType": "String", - "Required": true, + "Type": "GrokClassifier", "UpdateType": "Mutable" }, - "SourceIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", - "PrimitiveItemType": "String", + "JsonClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", "Required": false, - "Type": "List", - "UpdateType": "Immutable" + "Type": "JsonClassifier", + "UpdateType": "Mutable" }, - "SourceType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", - "PrimitiveType": "String", + "XMLClassifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", "Required": false, + "Type": "XMLClassifier", "UpdateType": "Mutable" - }, - "SubscriptionName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::Glue::Connection", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", + "Properties": { + "CatalogId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" + "ConnectionInput": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", + "Required": true, + "Type": "ConnectionInput", + "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", + "path": "/ResourceTypes/AWS::Glue::Crawler", "value": { - "Attributes": { - "ReplicationInstancePrivateIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" - }, - "ReplicationInstancePublicIpAddresses": { - "PrimitiveItemType": "String", - "Type": "List" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", "Properties": { - "AllocatedStorage": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", - "PrimitiveType": "Integer", + "Classifiers": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", + "PrimitiveItemType": "String", "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "AllowMajorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", - "PrimitiveType": "Boolean", + "Configuration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, - "AutoMinorVersionUpgrade": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", - "PrimitiveType": "Boolean", - "Required": false, - "UpdateType": "Mutable" - }, - "AvailabilityZone": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "EngineVersion": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "KmsKeyId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "MultiAZ": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", - "PrimitiveType": "Boolean", - "Required": false, - "UpdateType": "Mutable" - }, - "PreferredMaintenanceWindow": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "PubliclyAccessible": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", - "PrimitiveType": "Boolean", - "Required": false, - "UpdateType": "Immutable" - }, - "ReplicationInstanceClass": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "ReplicationInstanceIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - }, - "VpcSecurityGroupIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", - "Properties": { - "ReplicationSubnetGroupDescription": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "ReplicationSubnetGroupIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "SubnetIds": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", - "PrimitiveItemType": "String", - "Required": true, - "Type": "List", - "UpdateType": "Mutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::DMS::ReplicationTask", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", - "Properties": { - "CdcStartTime": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", - "PrimitiveType": "Double", - "Required": false, - "UpdateType": "Mutable" - }, - "MigrationType": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "ReplicationInstanceArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "ReplicationTaskIdentifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "ReplicationTaskSettings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "SourceEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "TableMappings": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Immutable" - }, - "TargetEndpointArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Classifier", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html", - "Properties": { - "CsvClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier", - "Required": false, - "Type": "CsvClassifier", - "UpdateType": "Mutable" - }, - "GrokClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier", - "Required": false, - "Type": "GrokClassifier", - "UpdateType": "Mutable" - }, - "JsonClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier", - "Required": false, - "Type": "JsonClassifier", - "UpdateType": "Mutable" - }, - "XMLClassifier": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier", - "Required": false, - "Type": "XMLClassifier", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Connection", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html", - "Properties": { - "CatalogId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "ConnectionInput": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput", - "Required": true, - "Type": "ConnectionInput", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Glue::Crawler", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html", - "Properties": { - "Classifiers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers", - "PrimitiveItemType": "String", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "Configuration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "CrawlerSecurityConfiguration": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", - "PrimitiveType": "String", + "CrawlerSecurityConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration", + "PrimitiveType": "String", "Required": false, "UpdateType": "Mutable" }, @@ -871,139 +595,7 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::CodeBuild::Project", - "value": { - "Attributes": { - "Arn": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html", - "Properties": { - "Artifacts": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-artifacts", - "Required": true, - "Type": "Artifacts", - "UpdateType": "Mutable" - }, - "BadgeEnabled": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-badgeenabled", - "PrimitiveType": "Boolean", - "Required": false, - "UpdateType": "Mutable" - }, - "Cache": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-cache", - "Required": false, - "Type": "ProjectCache", - "UpdateType": "Mutable" - }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-description", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "EncryptionKey": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-encryptionkey", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "Environment": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-environment", - "Required": true, - "Type": "Environment", - "UpdateType": "Mutable" - }, - "LogsConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-logsconfig", - "Required": false, - "Type": "LogsConfig", - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-name", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "QueuedTimeoutInMinutes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-queuedtimeoutinminutes", - "PrimitiveType": "Integer", - "Required": false, - "UpdateType": "Mutable" - }, - "SecondaryArtifacts": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondaryartifacts", - "ItemType": "Artifacts", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "SecondarySourceVersions": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondarysourceversions", - "ItemType": "ProjectSourceVersion", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "SecondarySources": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondarysources", - "ItemType": "Source", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "ServiceRole": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-servicerole", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Source": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-source", - "Required": true, - "Type": "Source", - "UpdateType": "Mutable" - }, - "SourceVersion": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-sourceversion", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-tags", - "ItemType": "Tag", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "TimeoutInMinutes": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-timeoutinminutes", - "PrimitiveType": "Integer", - "Required": false, - "UpdateType": "Mutable" - }, - "Triggers": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-triggers", - "Required": false, - "Type": "ProjectTriggers", - "UpdateType": "Mutable" - }, - "VpcConfig": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-vpcconfig", - "Required": false, - "Type": "VpcConfig", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::Athena::NamedQuery", + "path": "/ResourceTypes/AWS::Athena::NamedQuery", "value": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html", "Properties": { @@ -1036,129 +628,103 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "path": "/ResourceTypes/AWS::WAFRegional::ByteMatchSet", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html", "Properties": { + "ByteMatchTuples": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-bytematchtuples", + "ItemType": "ByteMatchTuple", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-name", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "path": "/ResourceTypes/AWS::WAFRegional::GeoMatchSet", "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html", "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, + "GeoMatchConstraints": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html#cfn-wafregional-geomatchset-geomatchconstraints", + "ItemType": "GeoMatchConstraint", + "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html#cfn-wafregional-geomatchset-name", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" - }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", - "PrimitiveType": "String", - "Required": false, "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Detector", + "path": "/ResourceTypes/AWS::WAFRegional::IPSet", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html", "Properties": { - "Enable": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-enable", - "PrimitiveType": "Boolean", - "Required": true, + "IPSetDescriptors": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-ipsetdescriptors", + "ItemType": "IPSetDescriptor", + "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "FindingPublishingFrequency": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-findingpublishingfrequency", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-name", "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" + "Required": true, + "UpdateType": "Immutable" } } } }, { "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Filter", + "path": "/ResourceTypes/AWS::WAFRegional::RateBasedRule", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html", "Properties": { - "Action": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-action", - "PrimitiveType": "String", - "Required": true, + "MatchPredicates": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-matchpredicates", + "ItemType": "Predicate", + "Required": false, + "Type": "List", "UpdateType": "Mutable" }, - "Description": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-description", + "MetricName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-metricname", "PrimitiveType": "String", "Required": true, - "UpdateType": "Mutable" + "UpdateType": "Immutable" }, - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-detectorid", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-name", "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, - "FindingCriteria": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-findingcriteria", - "Required": true, - "Type": "FindingCriteria", - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-name", + "RateKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-ratekey", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Immutable" }, - "Rank": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-rank", + "RateLimit": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-ratelimit", "PrimitiveType": "Integer", "Required": true, "UpdateType": "Mutable" @@ -1168,269 +734,13 @@ }, { "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::IPSet", + "path": "/ResourceTypes/AWS::WAFRegional::RegexPatternSet", "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-regexpatternset.html", "Properties": { - "Activate": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-activate", - "PrimitiveType": "Boolean", - "Required": true, - "UpdateType": "Mutable" - }, - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-detectorid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Format": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-format", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Location": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-location", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-name", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Master", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html", - "Properties": { - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-detectorid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "InvitationId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-invitationid", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "MasterId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-masterid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::Member", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html", - "Properties": { - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-detectorid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "DisableEmailNotification": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-disableemailnotification", - "PrimitiveType": "Boolean", - "Required": false, - "UpdateType": "Mutable" - }, - "Email": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-email", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "MemberId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-memberid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Message": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-message", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - }, - "Status": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-status", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::GuardDuty::ThreatIntelSet", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html", - "Properties": { - "Activate": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-activate", - "PrimitiveType": "Boolean", - "Required": true, - "UpdateType": "Mutable" - }, - "DetectorId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-detectorid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Format": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-format", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Location": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-location", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-name", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::WAFRegional::ByteMatchSet", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html", - "Properties": { - "ByteMatchTuples": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-bytematchtuples", - "ItemType": "ByteMatchTuple", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::WAFRegional::GeoMatchSet", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html", - "Properties": { - "GeoMatchConstraints": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html#cfn-wafregional-geomatchset-geomatchconstraints", - "ItemType": "GeoMatchConstraint", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html#cfn-wafregional-geomatchset-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::WAFRegional::IPSet", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html", - "Properties": { - "IPSetDescriptors": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-ipsetdescriptors", - "ItemType": "IPSetDescriptor", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::WAFRegional::RateBasedRule", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html", - "Properties": { - "MatchPredicates": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-matchpredicates", - "ItemType": "Predicate", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - }, - "MetricName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-metricname", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "RateKey": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-ratekey", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "RateLimit": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-ratelimit", - "PrimitiveType": "Integer", - "Required": true, - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::WAFRegional::RegexPatternSet", - "value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-regexpatternset.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-regexpatternset.html#cfn-wafregional-regexpatternset-name", - "PrimitiveType": "String", + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-regexpatternset.html#cfn-wafregional-regexpatternset-name", + "PrimitiveType": "String", "Required": true, "UpdateType": "Immutable" }, @@ -1592,5 +902,695 @@ } } } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::Detector", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html", + "Properties": { + "Enable": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-enable", + "PrimitiveType": "Boolean", + "Required": true, + "UpdateType": "Mutable" + }, + "FindingPublishingFrequency": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-findingpublishingfrequency", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::Filter", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html", + "Properties": { + "Action": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-action", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Description": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-description", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "FindingCriteria": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-findingcriteria", + "Required": true, + "Type": "FindingCriteria", + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Rank": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-rank", + "PrimitiveType": "Integer", + "Required": true, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::IPSet", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html", + "Properties": { + "Activate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-activate", + "PrimitiveType": "Boolean", + "Required": true, + "UpdateType": "Mutable" + }, + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Format": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-format", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Location": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-location", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::Master", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html", + "Properties": { + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "InvitationId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-invitationid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "MasterId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-masterid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::Member", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html", + "Properties": { + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DisableEmailNotification": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-disableemailnotification", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "Email": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-email", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "MemberId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-memberid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Message": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-message", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Status": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-status", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::GuardDuty::ThreatIntelSet", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html", + "Properties": { + "Activate": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-activate", + "PrimitiveType": "Boolean", + "Required": true, + "UpdateType": "Mutable" + }, + "DetectorId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-detectorid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Format": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-format", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Location": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-location", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-name", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::Certificate", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html", + "Properties": { + "CertificateIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "CertificatePem": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "CertificateWallet": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::Endpoint", + "value": { + "Attributes": { + "ExternalId": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html", + "Properties": { + "CertificateArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DatabaseName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DynamoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings", + "Required": false, + "Type": "DynamoDbSettings", + "UpdateType": "Mutable" + }, + "ElasticsearchSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings", + "Required": false, + "Type": "ElasticsearchSettings", + "UpdateType": "Mutable" + }, + "EndpointIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "EndpointType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "EngineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "ExtraConnectionAttributes": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "KinesisSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings", + "Required": false, + "Type": "KinesisSettings", + "UpdateType": "Mutable" + }, + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "MongoDbSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings", + "Required": false, + "Type": "MongoDbSettings", + "UpdateType": "Mutable" + }, + "Password": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Port": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "S3Settings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings", + "Required": false, + "Type": "S3Settings", + "UpdateType": "Mutable" + }, + "ServerName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SslMode": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "Username": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::EventSubscription", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html", + "Properties": { + "Enabled": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "EventCategories": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + }, + "SnsTopicArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "SourceIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "SourceType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SubscriptionName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::ReplicationInstance", + "value": { + "Attributes": { + "ReplicationInstancePrivateIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" + }, + "ReplicationInstancePublicIpAddresses": { + "PrimitiveItemType": "String", + "Type": "List" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html", + "Properties": { + "AllocatedStorage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage", + "PrimitiveType": "Integer", + "Required": false, + "UpdateType": "Mutable" + }, + "AllowMajorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "AutoMinorVersionUpgrade": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "AvailabilityZone": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "EngineVersion": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "KmsKeyId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "MultiAZ": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Mutable" + }, + "PreferredMaintenanceWindow": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "PubliclyAccessible": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible", + "PrimitiveType": "Boolean", + "Required": false, + "UpdateType": "Immutable" + }, + "ReplicationInstanceClass": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "ReplicationInstanceIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "VpcSecurityGroupIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids", + "PrimitiveItemType": "String", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::ReplicationSubnetGroup", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html", + "Properties": { + "ReplicationSubnetGroupDescription": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "ReplicationSubnetGroupIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "SubnetIds": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids", + "PrimitiveItemType": "String", + "Required": true, + "Type": "List", + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::DMS::ReplicationTask", + "value": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html", + "Properties": { + "CdcStartTime": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime", + "PrimitiveType": "Double", + "Required": false, + "UpdateType": "Mutable" + }, + "MigrationType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "ReplicationInstanceArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "ReplicationTaskIdentifier": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "ReplicationTaskSettings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "SourceEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "TableMappings": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags", + "ItemType": "Tag", + "Required": false, + "Type": "List", + "UpdateType": "Immutable" + }, + "TargetEndpointArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + } + } + } } ] \ No newline at end of file diff --git a/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json index 43d10838b2..9b8cee49cf 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-west-1/05_pricing_property_values.json @@ -3,14 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "c1.medium", "c1.xlarge", "c3.2xlarge", @@ -83,16 +75,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -108,15 +104,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro", diff --git a/src/cfnlint/data/ExtendedSpecs/us-west-1/07_ssm_service_addition.json b/src/cfnlint/data/ExtendedSpecs/us-west-1/07_ssm_service_addition.json index 95031ad758..6e69d87c30 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-west-1/07_ssm_service_addition.json +++ b/src/cfnlint/data/ExtendedSpecs/us-west-1/07_ssm_service_addition.json @@ -47,72 +47,6 @@ } } }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::Activity", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", - "Properties": { - "Name": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, - { - "op": "add", - "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", - "value": { - "Attributes": { - "Name": { - "PrimitiveType": "String" - } - }, - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", - "Properties": { - "DefinitionString": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "RoleArn": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "StateMachineName": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", - "PrimitiveType": "String", - "Required": false, - "UpdateType": "Immutable" - }, - "Tags": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", - "ItemType": "TagsEntry", - "Required": false, - "Type": "List", - "UpdateType": "Mutable" - } - } - } - }, { "op": "add", "path": "/ResourceTypes/AWS::Route53Resolver::ResolverEndpoint", @@ -282,5 +216,71 @@ } } } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::Activity", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html", + "Properties": { + "Name": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } + }, + { + "op": "add", + "path": "/ResourceTypes/AWS::StepFunctions::StateMachine", + "value": { + "Attributes": { + "Name": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html", + "Properties": { + "DefinitionString": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "RoleArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + }, + "StateMachineName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Immutable" + }, + "Tags": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags", + "ItemType": "TagsEntry", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + } } ] \ No newline at end of file diff --git a/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json b/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json index f1eaee09ed..e9f34a1c1b 100644 --- a/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json +++ b/src/cfnlint/data/ExtendedSpecs/us-west-2/05_pricing_property_values.json @@ -3,18 +3,6 @@ "op": "add", "path": "/ValueTypes/Ec2InstanceType/AllowedValues", "value": [ - "M5.16xlarge", - "M5.8xlarge", - "M5a.16xlarge", - "M5a.8xlarge", - "M5d.16xlarge", - "M5d.8xlarge", - "R5.16xlarge", - "R5.8xlarge", - "R5a.16xlarge", - "R5a.8xlarge", - "R5d.16xlarge", - "R5d.8xlarge", "a1.2xlarge", "a1.4xlarge", "a1.large", @@ -108,16 +96,20 @@ "m4.large", "m4.xlarge", "m5.12xlarge", + "m5.16xlarge", "m5.24xlarge", "m5.2xlarge", "m5.4xlarge", + "m5.8xlarge", "m5.large", "m5.metal", "m5.xlarge", "m5a.12xlarge", + "m5a.16xlarge", "m5a.24xlarge", "m5a.2xlarge", "m5a.4xlarge", + "m5a.8xlarge", "m5a.large", "m5a.xlarge", "m5ad.12xlarge", @@ -127,9 +119,11 @@ "m5ad.large", "m5ad.xlarge", "m5d.12xlarge", + "m5d.16xlarge", "m5d.24xlarge", "m5d.2xlarge", "m5d.4xlarge", + "m5d.8xlarge", "m5d.large", "m5d.metal", "m5d.xlarge", @@ -152,15 +146,19 @@ "r4.large", "r4.xlarge", "r5.12xlarge", + "r5.16xlarge", "r5.24xlarge", "r5.2xlarge", "r5.4xlarge", + "r5.8xlarge", "r5.large", "r5.xlarge", "r5a.12xlarge", + "r5a.16xlarge", "r5a.24xlarge", "r5a.2xlarge", "r5a.4xlarge", + "r5a.8xlarge", "r5a.large", "r5a.xlarge", "r5ad.12xlarge", @@ -170,9 +168,11 @@ "r5ad.large", "r5ad.xlarge", "r5d.12xlarge", + "r5d.16xlarge", "r5d.24xlarge", "r5d.2xlarge", "r5d.4xlarge", + "r5d.8xlarge", "r5d.large", "r5d.xlarge", "t1.micro",