From b2111890d55f33f43c42f27d2da6ede7de702f25 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:17:46 +0300 Subject: [PATCH] feat: update L1 CloudFormation resource definitions (#31688) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the L1 CloudFormation resource definitions with the latest changes from `@aws-cdk/aws-service-spec` **L1 CloudFormation resource definition changes:** ``` ├[~] service aws-b2bi │ └ resources │ ├[~] resource AWS::B2BI::Capability │ │ └ types │ │ ├[~] type EdiType │ │ │ ├ - documentation: Specifies the details for the EDI standard that is being used for the transformer. Currently, only X12 is supported. X12 is a set of standards and corresponding messages that define specific business documents. │ │ │ │ + documentation: undefined │ │ │ └ properties │ │ │ └ X12Details: (documentation changed) │ │ └[~] type S3Location │ │ └ - documentation: Specifies the details for the Amazon S3 file location that is being used with AWS B2BI Data Interchange. File locations in Amazon S3 are identified using a combination of the bucket and key. │ │ + documentation: Specifies the details for the Amazon S3 file location that is being used with AWS B2B Data Interchange. File locations in Amazon S3 are identified using a combination of the bucket and key. │ └[~] resource AWS::B2BI::Transformer │ ├ - documentation: Creates a transformer. A transformer describes how to process the incoming EDI documents and extract the necessary information to the output file. │ │ + documentation: Creates a transformer. AWS B2B Data Interchange currently supports two scenarios: │ │ - *Inbound EDI* : the AWS customer receives an EDI file from their trading partner. AWS B2B Data Interchange converts this EDI file into a JSON or XML file with a service-defined structure. A mapping template provided by the customer, in JSONata or XSLT format, is optionally applied to this file to produce a JSON or XML file with the structure the customer requires. │ │ - *Outbound EDI* : the AWS customer has a JSON or XML file containing data that they wish to use in an EDI file. A mapping template, provided by the customer (in either JSONata or XSLT format) is applied to this file to generate a JSON or XML file in the service-defined structure. This file is then converted to an EDI file. │ │ > The following fields are provided for backwards compatibility only: `fileFormat` , `mappingTemplate` , `ediType` , and `sampleDocument` . │ │ > │ │ > - Use the `mapping` data type in place of `mappingTemplate` and `fileFormat` │ │ > - Use the `sampleDocuments` data type in place of `sampleDocument` │ │ > - Use either the `inputConversion` or `outputConversion` in place of `ediType` │ └ types │ └[~] type EdiType │ ├ - documentation: Specifies the details for the EDI standard that is being used for the transformer. Currently, only X12 is supported. X12 is a set of standards and corresponding messages that define specific business documents. │ │ + documentation: undefined │ └ properties │ └ X12Details: (documentation changed) ├[~] service aws-cloudformation │ └ resources │ └[~] resource AWS::CloudFormation::CustomResource │ └ properties │ └[+] ServiceTimeout: integer ├[~] service aws-emr │ └ resources │ ├[~] resource AWS::EMR::Cluster │ │ └ types │ │ ├[~] type InstanceFleetConfig │ │ │ └ properties │ │ │ └[+] ResizeSpecifications: InstanceFleetResizingSpecifications │ │ ├[+] type InstanceFleetResizingSpecifications │ │ │ ├ name: InstanceFleetResizingSpecifications │ │ │ └ properties │ │ │ ├OnDemandResizeSpecification: OnDemandResizingSpecification │ │ │ └SpotResizeSpecification: SpotResizingSpecification │ │ ├[~] type InstanceTypeConfig │ │ │ └ properties │ │ │ └[+] Priority: number │ │ ├[+] type OnDemandCapacityReservationOptions │ │ │ ├ name: OnDemandCapacityReservationOptions │ │ │ └ properties │ │ │ ├UsageStrategy: string │ │ │ ├CapacityReservationResourceGroupArn: string │ │ │ └CapacityReservationPreference: string │ │ ├[~] type OnDemandProvisioningSpecification │ │ │ └ properties │ │ │ └[+] CapacityReservationOptions: OnDemandCapacityReservationOptions │ │ ├[+] type OnDemandResizingSpecification │ │ │ ├ name: OnDemandResizingSpecification │ │ │ └ properties │ │ │ ├CapacityReservationOptions: OnDemandCapacityReservationOptions │ │ │ ├AllocationStrategy: string │ │ │ └TimeoutDurationMinutes: integer │ │ └[+] type SpotResizingSpecification │ │ ├ name: SpotResizingSpecification │ │ └ properties │ │ ├AllocationStrategy: string │ │ └TimeoutDurationMinutes: integer │ └[~] resource AWS::EMR::InstanceFleetConfig │ ├ properties │ │ └[+] ResizeSpecifications: InstanceFleetResizingSpecifications │ └ types │ ├[+] type InstanceFleetResizingSpecifications │ │ ├ name: InstanceFleetResizingSpecifications │ │ └ properties │ │ ├OnDemandResizeSpecification: OnDemandResizingSpecification │ │ └SpotResizeSpecification: SpotResizingSpecification │ ├[~] type InstanceTypeConfig │ │ └ properties │ │ └[+] Priority: number │ ├[+] type OnDemandCapacityReservationOptions │ │ ├ name: OnDemandCapacityReservationOptions │ │ └ properties │ │ ├UsageStrategy: string │ │ ├CapacityReservationResourceGroupArn: string │ │ └CapacityReservationPreference: string │ ├[~] type OnDemandProvisioningSpecification │ │ └ properties │ │ └[+] CapacityReservationOptions: OnDemandCapacityReservationOptions │ ├[+] type OnDemandResizingSpecification │ │ ├ name: OnDemandResizingSpecification │ │ └ properties │ │ ├CapacityReservationOptions: OnDemandCapacityReservationOptions │ │ ├AllocationStrategy: string │ │ └TimeoutDurationMinutes: integer │ └[+] type SpotResizingSpecification │ ├ name: SpotResizingSpecification │ └ properties │ ├AllocationStrategy: string │ └TimeoutDurationMinutes: integer ├[~] service aws-glue │ └ resources │ └[~] resource AWS::Glue::Job │ ├ properties │ │ └ JobRunQueuingEnabled: (documentation changed) │ └ attributes │ └ Id: (documentation changed) ├[~] service aws-iot │ └ resources │ └[~] resource AWS::IoT::DomainConfiguration │ ├ properties │ │ ├[+] ApplicationProtocol: string │ │ ├[+] AuthenticationType: string │ │ └[+] ClientCertificateConfig: ClientCertificateConfig │ └ types │ └[+] type ClientCertificateConfig │ ├ name: ClientCertificateConfig │ └ properties │ └ClientCertificateCallbackArn: string ├[~] service aws-iotsitewise │ └ resources │ └[~] resource AWS::IoTSiteWise::AssetModel │ └ types │ └[~] type AssetModelProperty │ └ properties │ └ DataType: (documentation changed) ├[~] service aws-quicksight │ └ resources │ └[~] resource AWS::QuickSight::Folder │ ├ - documentation: Definition of the AWS::QuickSight::Folder Resource Type. │ │ + documentation: Creates an empty shared folder. │ ├ properties │ │ ├ FolderId: (documentation changed) │ │ ├ FolderType: (documentation changed) │ │ ├ Name: (documentation changed) │ │ ├ ParentFolderArn: (documentation changed) │ │ └ SharingModel: (documentation changed) │ └ attributes │ ├ Arn: (documentation changed) │ ├ CreatedTime: (documentation changed) │ └ LastUpdatedTime: (documentation changed) ├[~] service aws-rds │ └ resources │ ├[~] resource AWS::RDS::DBInstance │ │ └ properties │ │ └ DBSnapshotIdentifier: (documentation changed) │ └[~] resource AWS::RDS::GlobalCluster │ └ properties │ └ Tags: (documentation changed) ├[~] service aws-route53resolver │ └ resources │ └[~] resource AWS::Route53Resolver::ResolverRule │ └ types │ └[~] type TargetAddress │ └ properties │ └ Protocol: (documentation changed) └[~] service aws-s3 └ resources └[~] resource AWS::S3::Bucket └ types └[~] type LifecycleConfiguration └ properties ├ Rules: (documentation changed) └[+] TransitionDefaultMinimumObjectSize: string ``` --- .../@aws-cdk/cloudformation-diff/package.json | 4 +- packages/@aws-cdk/integ-runner/package.json | 2 +- packages/aws-cdk-lib/package.json | 2 +- tools/@aws-cdk/spec2cdk/package.json | 4 +- yarn.lock | 48 +++++++++++++++---- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json index 71a1c66ecd1b6..87501d4bbbcdd 100644 --- a/packages/@aws-cdk/cloudformation-diff/package.json +++ b/packages/@aws-cdk/cloudformation-diff/package.json @@ -23,8 +23,8 @@ }, "license": "Apache-2.0", "dependencies": { - "@aws-cdk/aws-service-spec": "^0.1.25", - "@aws-cdk/service-spec-types": "^0.0.92", + "@aws-cdk/aws-service-spec": "^0.1.26", + "@aws-cdk/service-spec-types": "^0.0.93", "chalk": "^4", "diff": "^5.2.0", "fast-deep-equal": "^3.1.3", diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json index 9851c3f9fc1ea..34be598eb2d90 100644 --- a/packages/@aws-cdk/integ-runner/package.json +++ b/packages/@aws-cdk/integ-runner/package.json @@ -75,7 +75,7 @@ "@aws-cdk/cloudformation-diff": "0.0.0", "@aws-cdk/cx-api": "0.0.0", "cdk-assets": "^2.154.0", - "@aws-cdk/aws-service-spec": "^0.1.25", + "@aws-cdk/aws-service-spec": "^0.1.26", "@aws-cdk/cdk-cli-wrapper": "0.0.0", "aws-cdk": "0.0.0", diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index bd881886ad093..05b6eab532f46 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -136,7 +136,7 @@ "mime-types": "^2.1.35" }, "devDependencies": { - "@aws-cdk/aws-service-spec": "^0.1.25", + "@aws-cdk/aws-service-spec": "^0.1.26", "@aws-cdk/cdk-build-tools": "0.0.0", "@aws-cdk/custom-resource-handlers": "0.0.0", "@aws-cdk/pkglint": "0.0.0", diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json index 1ab321feccc28..c54690eeb49a2 100644 --- a/tools/@aws-cdk/spec2cdk/package.json +++ b/tools/@aws-cdk/spec2cdk/package.json @@ -32,9 +32,9 @@ }, "license": "Apache-2.0", "dependencies": { - "@aws-cdk/aws-service-spec": "^0.1.25", + "@aws-cdk/aws-service-spec": "^0.1.26", "@aws-cdk/service-spec-importers": "^0.0.49", - "@aws-cdk/service-spec-types": "^0.0.92", + "@aws-cdk/service-spec-types": "^0.0.93", "@cdklabs/tskb": "^0.0.3", "@cdklabs/typewriter": "^0.0.3", "camelcase": "^6", diff --git a/yarn.lock b/yarn.lock index 10ff2bbe956ca..24dbb889e10a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -51,12 +51,12 @@ resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.1.0.tgz#6d3c7860354d4856a7e75375f2f0ecab313b4989" integrity sha512-7bY3J8GCVxLupn/kNmpPc5VJz8grx+4RKfnnJiO1LG+uxkZfANZG3RMHhE+qQxxwkyQ9/MfPtTpf748UhR425A== -"@aws-cdk/aws-service-spec@^0.1.25": - version "0.1.25" - resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.25.tgz#cb6b91a51e5c81d75c20f84fa79d68b381fc9d03" - integrity sha512-5Zzqa1NDm9HrcV2BPOFoavrqXmNm+g6dF59fOkPkjuW9OwiR93fFK9AMc8KYJ7U7jRUejs6pn2bDnqGZ5IXTRg== +"@aws-cdk/aws-service-spec@^0.1.26": + version "0.1.26" + resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.1.26.tgz#9b08f2bff08650230d948596b171c7e8f8ce4979" + integrity sha512-VXkCdPB2cIKiDXpKK94EYd91Rh1V8SljA5B+GIOQOV5KtHkssqh1hTr5lL6TXYSE79kols/A5GX9pFVdw4fhVw== dependencies: - "@aws-cdk/service-spec-types" "^0.0.92" + "@aws-cdk/service-spec-types" "^0.0.93" "@cdklabs/tskb" "^0.0.3" "@aws-cdk/cloud-assembly-schema@^38.0.0": @@ -112,6 +112,13 @@ dependencies: "@cdklabs/tskb" "^0.0.3" +"@aws-cdk/service-spec-types@^0.0.93": + version "0.0.93" + resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.93.tgz#322dc14942af734be00c8a2bba0604239e9d5901" + integrity sha512-nLT07w8q/of+8X5QGgNtS1tu68CQSGJHL0xQcLsRKgaxoIddZnUUf2d6WS+Yp0aZCXu2UZaacUxPYwU+qmNhpw== + dependencies: + "@cdklabs/tskb" "^0.0.3" + "@aws-crypto/crc32@5.2.0": version "5.2.0" resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz#cfcc22570949c98c6689cfcbd2d693d36cdae2e1" @@ -14588,7 +14595,16 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", string-width@*, string-width@^1.0.1, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@*, string-width@^1.0.1, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -14653,7 +14669,7 @@ stringify-package@^1.0.1: resolved "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -14667,6 +14683,13 @@ strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -15664,7 +15687,7 @@ workerpool@^6.5.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -15682,6 +15705,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"