From 0acfa8b047e2bf9f711f4330a3f71fadf9e5abd0 Mon Sep 17 00:00:00 2001 From: Adam Ruka Date: Wed, 8 May 2019 15:09:11 -0700 Subject: [PATCH] chore(cfnspec): update CFN specification to 3.0.0. (#2492) --- packages/@aws-cdk/cfnspec/CHANGELOG.md | 32 ++++ ...0_CloudFormationResourceSpecification.json | 138 +++++++++++------- .../spec-source/600_RefKinds_patch.json | 38 +++-- 3 files changed, 142 insertions(+), 66 deletions(-) diff --git a/packages/@aws-cdk/cfnspec/CHANGELOG.md b/packages/@aws-cdk/cfnspec/CHANGELOG.md index dfb4c8f85db0d..eee421bf37040 100644 --- a/packages/@aws-cdk/cfnspec/CHANGELOG.md +++ b/packages/@aws-cdk/cfnspec/CHANGELOG.md @@ -1,3 +1,35 @@ +# CloudFormation Resource Specification v3.0.0 + +## New Resource Types + +* AWS::ApiGatewayV2::ApiMapping +* AWS::ApiGatewayV2::DomainName + +## Attribute Changes + + +## Property Changes + +* AWS::FSx::FileSystem Tags.ItemType (__changed__) + * Old: TagEntry + * New: Tag + +## Property Type Changes + +* Tag Key.Documentation (__changed__) + * Old: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html#cfn-dms-endpoint-tag-key + * New: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-tag.html#cfn-iotanalytics-datastore-tag-key +* Tag Key.Required (__changed__) + * Old: false + * New: true +* Tag Value.Documentation (__changed__) + * Old: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html#cfn-dms-endpoint-tag-value + * New: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-tag.html#cfn-iotanalytics-datastore-tag-value +* Tag Value.Required (__changed__) + * Old: false + * New: true + + # CloudFormation Resource Specification v2.32.0 ## New Resource Types diff --git a/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json b/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json index 0bc96ed9d94bc..e4594085a17c2 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json +++ b/packages/@aws-cdk/cfnspec/spec-source/000_CloudFormationResourceSpecification.json @@ -843,6 +843,29 @@ } } }, + "AWS::ApiGatewayV2::DomainName.DomainNameConfiguration": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html", + "Properties": { + "CertificateArn": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-certificatearn", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "CertificateName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-certificatename", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "EndpointType": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-endpointtype", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + } + } + }, "AWS::ApiGatewayV2::Route.ParameterConstraints": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-route-parameterconstraints.html", "Properties": { @@ -11840,23 +11863,6 @@ } } }, - "AWS::FSx::FileSystem.TagEntry": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-tagentry.html", - "Properties": { - "Key": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-tagentry.html#cfn-fsx-filesystem-tagentry-key", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - }, - "Value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-tagentry.html#cfn-fsx-filesystem-tagentry-value", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Mutable" - } - } - }, "AWS::FSx::FileSystem.WindowsConfiguration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html", "Properties": { @@ -20785,24 +20791,24 @@ } }, "Tag": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-tag.html", "Properties": { "Key": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html#cfn-dms-endpoint-tag-key", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-tag.html#cfn-iotanalytics-datastore-tag-key", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Mutable" }, "Value": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-tag.html#cfn-dms-endpoint-tag-value", + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-tag.html#cfn-iotanalytics-datastore-tag-value", "PrimitiveType": "String", - "Required": false, + "Required": true, "UpdateType": "Mutable" } } } }, - "ResourceSpecificationVersion": "2.32.0", + "ResourceSpecificationVersion": "3.0.0", "ResourceTypes": { "AWS::AmazonMQ::Broker": { "Attributes": { @@ -21822,6 +21828,35 @@ } } }, + "AWS::ApiGatewayV2::ApiMapping": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html", + "Properties": { + "ApiId": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-apiid", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "ApiMappingKey": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-apimappingkey", + "PrimitiveType": "String", + "Required": false, + "UpdateType": "Mutable" + }, + "DomainName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-domainname", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "Stage": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-stage", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Mutable" + } + } + }, "AWS::ApiGatewayV2::Authorizer": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html", "Properties": { @@ -21899,6 +21934,32 @@ } } }, + "AWS::ApiGatewayV2::DomainName": { + "Attributes": { + "RegionalDomainName": { + "PrimitiveType": "String" + }, + "RegionalHostedZoneId": { + "PrimitiveType": "String" + } + }, + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html", + "Properties": { + "DomainName": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html#cfn-apigatewayv2-domainname-domainname", + "PrimitiveType": "String", + "Required": true, + "UpdateType": "Immutable" + }, + "DomainNameConfigurations": { + "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html#cfn-apigatewayv2-domainname-domainnameconfigurations", + "ItemType": "DomainNameConfiguration", + "Required": false, + "Type": "List", + "UpdateType": "Mutable" + } + } + }, "AWS::ApiGatewayV2::Integration": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html", "Properties": { @@ -27849,35 +27910,6 @@ } } }, - "AWS::EC2::TrunkInterfaceAssociation": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html", - "Properties": { - "BranchInterfaceId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-branchinterfaceid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "GREKey": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-grekey", - "PrimitiveType": "Integer", - "Required": false, - "UpdateType": "Immutable" - }, - "TrunkInterfaceId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-trunkinterfaceid", - "PrimitiveType": "String", - "Required": true, - "UpdateType": "Immutable" - }, - "VLANId": { - "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trunkinterfaceassociation.html#cfn-ec2-trunkinterfaceassociation-vlanid", - "PrimitiveType": "Integer", - "Required": false, - "UpdateType": "Immutable" - } - } - }, "AWS::EC2::VPC": { "Attributes": { "CidrBlock": { @@ -30281,7 +30313,7 @@ }, "Tags": { "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-tags", - "ItemType": "TagEntry", + "ItemType": "Tag", "Required": false, "Type": "List", "UpdateType": "Mutable" diff --git a/packages/@aws-cdk/cfnspec/spec-source/600_RefKinds_patch.json b/packages/@aws-cdk/cfnspec/spec-source/600_RefKinds_patch.json index fa0572448dab5..19ab8c9a830e9 100644 --- a/packages/@aws-cdk/cfnspec/spec-source/600_RefKinds_patch.json +++ b/packages/@aws-cdk/cfnspec/spec-source/600_RefKinds_patch.json @@ -1524,18 +1524,6 @@ "description": "Set RefKind of AWS::EC2::TransitGatewayRouteTablePropagation to Id" } }, - "AWS::EC2::TrunkInterfaceAssociation": { - "patch": { - "operations": [ - { - "op": "add", - "path": "/RefKind", - "value": "Id" - } - ], - "description": "Set RefKind of AWS::EC2::TrunkInterfaceAssociation to Id" - } - }, "AWS::EC2::VPC": { "patch": { "operations": [ @@ -4679,6 +4667,30 @@ ], "description": "Set RefKind of AWS::Greengrass::ResourceDefinition to Id" } + }, + "AWS::ApiGatewayV2::ApiMapping": { + "patch": { + "operations": [ + { + "op": "add", + "path": "/RefKind", + "value": "Id" + } + ], + "description": "Set RefKind of AWS::ApiGatewayV2::ApiMapping to Id" + } + }, + "AWS::ApiGatewayV2::DomainName": { + "patch": { + "operations": [ + { + "op": "add", + "path": "/RefKind", + "value": "Name" + } + ], + "description": "Set RefKind of AWS::ApiGatewayV2::DomainName to Name" + } } } -} \ No newline at end of file +}