diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES index ad862cd67eb28..9927af86bd644 100644 --- a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES +++ b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES @@ -668,7 +668,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ---------------- -** cdk-from-cfn@0.69.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.69.0 | MIT OR Apache-2.0 +** cdk-from-cfn@0.84.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.84.0 | MIT OR Apache-2.0 ---------------- diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES index fcec60d9efba7..9ec2be2dc01f2 100644 --- a/packages/aws-cdk/THIRD_PARTY_LICENSES +++ b/packages/aws-cdk/THIRD_PARTY_LICENSES @@ -461,7 +461,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ---------------- -** cdk-from-cfn@0.69.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.69.0 | MIT OR Apache-2.0 +** cdk-from-cfn@0.84.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.84.0 | MIT OR Apache-2.0 ---------------- diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index ee7b47080e881..987256e9caeaa 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -105,7 +105,7 @@ "aws-sdk": "^2.1498.0", "camelcase": "^6.3.0", "cdk-assets": "0.0.0", - "cdk-from-cfn": "^0.69.0", + "cdk-from-cfn": "^0.84.0", "chalk": "^4", "chokidar": "^3.5.3", "decamelize": "^5.0.1", diff --git a/packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.java b/packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.java index 5c3688f99f153..5bd333f6cdab1 100644 --- a/packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.java +++ b/packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.java @@ -42,7 +42,8 @@ public GoodJavaStack(final Construct scope, final String id, final StackProps pr s3Bucket.applyRemovalPolicy(RemovalPolicy.RETAIN); this.websiteUrl = s3Bucket.getAttrWebsiteUrl(); - CfnOutput.Builder.create(this, "WebsiteURL") + CfnOutput.Builder.create(this, "CfnOutputWebsiteURL") + .key("WebsiteURL") .value(this.websiteUrl.toString()) .description("URL for website hosted on S3") .build(); @@ -50,7 +51,8 @@ public GoodJavaStack(final Construct scope, final String id, final StackProps pr this.s3BucketSecureUrl = String.join("", "https://", s3Bucket.getAttrDomainName()); - CfnOutput.Builder.create(this, "S3BucketSecureURL") + CfnOutput.Builder.create(this, "CfnOutputS3BucketSecureURL") + .key("S3BucketSecureURL") .value(this.s3BucketSecureUrl.toString()) .description("Name of S3 bucket to hold website content") .build(); diff --git a/packages/aws-cdk/test/commands/test-resources/stacks/s3-stack.ts b/packages/aws-cdk/test/commands/test-resources/stacks/s3-stack.ts index dcdbd7178d3a1..e272daa7503b6 100644 --- a/packages/aws-cdk/test/commands/test-resources/stacks/s3-stack.ts +++ b/packages/aws-cdk/test/commands/test-resources/stacks/s3-stack.ts @@ -32,7 +32,8 @@ export class GoodTypeScriptStack extends cdk.Stack { // Outputs this.websiteUrl = s3Bucket.attrWebsiteUrl; - new cdk.CfnOutput(this, 'WebsiteURL', { + new cdk.CfnOutput(this, 'CfnOutputWebsiteURL', { + key: 'WebsiteURL', description: 'URL for website hosted on S3', value: this.websiteUrl!.toString(), }); @@ -40,7 +41,8 @@ export class GoodTypeScriptStack extends cdk.Stack { 'https://', s3Bucket.attrDomainName, ].join(''); - new cdk.CfnOutput(this, 'S3BucketSecureURL', { + new cdk.CfnOutput(this, 'CfnOutputS3BucketSecureURL', { + key: 'S3BucketSecureURL', description: 'Name of S3 bucket to hold website content', value: this.s3BucketSecureUrl!.toString(), }); diff --git a/packages/aws-cdk/test/commands/test-resources/stacks/s3_stack.py b/packages/aws-cdk/test/commands/test-resources/stacks/s3_stack.py index 374b3ea813510..4443d5d044871 100644 --- a/packages/aws-cdk/test/commands/test-resources/stacks/s3_stack.py +++ b/packages/aws-cdk/test/commands/test-resources/stacks/s3_stack.py @@ -25,7 +25,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None: URL for website hosted on S3 """ self.website_url = s3Bucket.attr_website_url - cdk.CfnOutput(self, 'WebsiteURL', + cdk.CfnOutput(self, 'CfnOutputWebsiteURL', + key = 'WebsiteURL', description = 'URL for website hosted on S3', value = str(self.website_url), ) @@ -37,7 +38,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None: 'https://', s3Bucket.attr_domain_name, ]) - cdk.CfnOutput(self, 'S3BucketSecureURL', + cdk.CfnOutput(self, 'CfnOutputS3BucketSecureURL', + key = 'S3BucketSecureURL', description = 'Name of S3 bucket to hold website content', value = str(self.s3_bucket_secure_url), ) diff --git a/yarn.lock b/yarn.lock index 2cebdfc80c4c6..03448e2ae87ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6221,10 +6221,10 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdk-from-cfn@^0.69.0: - version "0.69.0" - resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.69.0.tgz#3b8621a01825da6d0559f2151047a44efea3cbe5" - integrity sha512-JkEi9VaGxsT0OTm+b/pSgF6dhr4Be1HZF7Kbdzo/HfoXOzKZtPKzxEgVlg5mqpMZ44XpqhXHd4t7Ro1iELV4EA== +cdk-from-cfn@^0.84.0: + version "0.84.0" + resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.84.0.tgz#b5a16245f3c1729b752bc48727daedc6df43e399" + integrity sha512-81AKH75ODmLDT+st/oxZIFsA21kvBb4lHLTwL4/N83VYh80DYbjd7LjIbUszF+2rwBlBNOJSN2q1P2vNL1mACQ== cdk-generate-synthetic-examples@^0.1.297: version "0.1.297"