Skip to content

Commit 335b6af

Browse files
chore: update version of cdk-from-cfn (#28253)
> REPLACE THIS TEXT BLOCK > > Describe the reason for this change, what the solution is, and any > important design decisions you made. > > Remember to follow the [CONTRIBUTING GUIDE] and [DESIGN GUIDELINES] for any > code you submit. > > [CONTRIBUTING GUIDE]: https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md > [DESIGN GUIDELINES]: https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md Closes #<issue number here>. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 89f9803 commit 335b6af

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES

+1-1
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
668668

669669
----------------
670670

671-
** cdk-from-cfn@0.69.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.69.0 | MIT OR Apache-2.0
671+
** cdk-from-cfn@0.84.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.84.0 | MIT OR Apache-2.0
672672

673673
----------------
674674

packages/aws-cdk/THIRD_PARTY_LICENSES

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
461461

462462
----------------
463463

464-
** cdk-from-cfn@0.69.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.69.0 | MIT OR Apache-2.0
464+
** cdk-from-cfn@0.84.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.84.0 | MIT OR Apache-2.0
465465

466466
----------------
467467

packages/aws-cdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"aws-sdk": "^2.1498.0",
106106
"camelcase": "^6.3.0",
107107
"cdk-assets": "0.0.0",
108-
"cdk-from-cfn": "^0.69.0",
108+
"cdk-from-cfn": "^0.84.0",
109109
"chalk": "^4",
110110
"chokidar": "^3.5.3",
111111
"decamelize": "^5.0.1",

packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,17 @@ public GoodJavaStack(final Construct scope, final String id, final StackProps pr
4242
s3Bucket.applyRemovalPolicy(RemovalPolicy.RETAIN);
4343

4444
this.websiteUrl = s3Bucket.getAttrWebsiteUrl();
45-
CfnOutput.Builder.create(this, "WebsiteURL")
45+
CfnOutput.Builder.create(this, "CfnOutputWebsiteURL")
46+
.key("WebsiteURL")
4647
.value(this.websiteUrl.toString())
4748
.description("URL for website hosted on S3")
4849
.build();
4950

5051
this.s3BucketSecureUrl = String.join("",
5152
"https://",
5253
s3Bucket.getAttrDomainName());
53-
CfnOutput.Builder.create(this, "S3BucketSecureURL")
54+
CfnOutput.Builder.create(this, "CfnOutputS3BucketSecureURL")
55+
.key("S3BucketSecureURL")
5456
.value(this.s3BucketSecureUrl.toString())
5557
.description("Name of S3 bucket to hold website content")
5658
.build();

packages/aws-cdk/test/commands/test-resources/stacks/s3-stack.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,17 @@ export class GoodTypeScriptStack extends cdk.Stack {
3232

3333
// Outputs
3434
this.websiteUrl = s3Bucket.attrWebsiteUrl;
35-
new cdk.CfnOutput(this, 'WebsiteURL', {
35+
new cdk.CfnOutput(this, 'CfnOutputWebsiteURL', {
36+
key: 'WebsiteURL',
3637
description: 'URL for website hosted on S3',
3738
value: this.websiteUrl!.toString(),
3839
});
3940
this.s3BucketSecureUrl = [
4041
'https://',
4142
s3Bucket.attrDomainName,
4243
].join('');
43-
new cdk.CfnOutput(this, 'S3BucketSecureURL', {
44+
new cdk.CfnOutput(this, 'CfnOutputS3BucketSecureURL', {
45+
key: 'S3BucketSecureURL',
4446
description: 'Name of S3 bucket to hold website content',
4547
value: this.s3BucketSecureUrl!.toString(),
4648
});

packages/aws-cdk/test/commands/test-resources/stacks/s3_stack.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
2525
URL for website hosted on S3
2626
"""
2727
self.website_url = s3Bucket.attr_website_url
28-
cdk.CfnOutput(self, 'WebsiteURL',
28+
cdk.CfnOutput(self, 'CfnOutputWebsiteURL',
29+
key = 'WebsiteURL',
2930
description = 'URL for website hosted on S3',
3031
value = str(self.website_url),
3132
)
@@ -37,7 +38,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
3738
'https://',
3839
s3Bucket.attr_domain_name,
3940
])
40-
cdk.CfnOutput(self, 'S3BucketSecureURL',
41+
cdk.CfnOutput(self, 'CfnOutputS3BucketSecureURL',
42+
key = 'S3BucketSecureURL',
4143
description = 'Name of S3 bucket to hold website content',
4244
value = str(self.s3_bucket_secure_url),
4345
)

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -6221,10 +6221,10 @@ [email protected], case@^1.6.3:
62216221
resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
62226222
integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==
62236223

6224-
cdk-from-cfn@^0.69.0:
6225-
version "0.69.0"
6226-
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.69.0.tgz#3b8621a01825da6d0559f2151047a44efea3cbe5"
6227-
integrity sha512-JkEi9VaGxsT0OTm+b/pSgF6dhr4Be1HZF7Kbdzo/HfoXOzKZtPKzxEgVlg5mqpMZ44XpqhXHd4t7Ro1iELV4EA==
6224+
cdk-from-cfn@^0.84.0:
6225+
version "0.84.0"
6226+
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.84.0.tgz#b5a16245f3c1729b752bc48727daedc6df43e399"
6227+
integrity sha512-81AKH75ODmLDT+st/oxZIFsA21kvBb4lHLTwL4/N83VYh80DYbjd7LjIbUszF+2rwBlBNOJSN2q1P2vNL1mACQ==
62286228

62296229
cdk-generate-synthetic-examples@^0.1.297:
62306230
version "0.1.297"

0 commit comments

Comments
 (0)