Skip to content

Commit

Permalink
chore: update version of cdk-from-cfn (#28253)
Browse files Browse the repository at this point in the history
> 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*
  • Loading branch information
TheRealAmazonKendra authored Dec 5, 2023
1 parent 89f9803 commit 335b6af
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -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

----------------

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -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

----------------

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,17 @@ 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();

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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ 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(),
});
this.s3BucketSecureUrl = [
'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(),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
Expand All @@ -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),
)
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6221,10 +6221,10 @@ [email protected], 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"
Expand Down

0 comments on commit 335b6af

Please sign in to comment.