Skip to content

Commit e8f0cda

Browse files
TheRealAmazonKendraTheRealAmazonKendra
authored
chore: upgrade version of cdk-from-cfn (#27328)
The newer versions contain some bug fixes that cause breakages in the tests so we need to do this upgrade manually. > 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 4e8c9c4 commit e8f0cda

File tree

8 files changed

+22
-18
lines changed

8 files changed

+22
-18
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
264264

265265
----------------
266266

267-
** aws-sdk@2.1451.0 - https://www.npmjs.com/package/aws-sdk/v/2.1451.0 | Apache-2.0
267+
** aws-sdk@2.1461.0 - https://www.npmjs.com/package/aws-sdk/v/2.1461.0 | Apache-2.0
268268
AWS SDK for JavaScript
269269
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
270270

@@ -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.17.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.17.0 | MIT OR Apache-2.0
464+
** cdk-from-cfn@0.35.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.35.0 | MIT OR Apache-2.0
465465

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

‎packages/@aws-cdk/cli-lib-alpha/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,4 @@
121121
},
122122
"dependencies": {},
123123
"peerDependencies": {}
124-
}
124+
}

‎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.17.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.17.0 | MIT OR Apache-2.0
464+
** cdk-from-cfn@0.35.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.35.0 | MIT OR Apache-2.0
465465

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

‎packages/aws-cdk/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"aws-cdk-lib": "0.0.0",
8383
"aws-sdk-mock": "5.6.0",
8484
"axios": "^0.27.2",
85-
"cdk-from-cfn": "^0.17.0",
85+
"cdk-from-cfn": "^0.35.0",
8686
"constructs": "^10.0.0",
8787
"fast-check": "^3.13.0",
8888
"jest": "^29.7.0",
@@ -105,7 +105,7 @@
105105
"aws-sdk": "^2.1461.0",
106106
"camelcase": "^6.3.0",
107107
"cdk-assets": "0.0.0",
108-
"cdk-from-cfn": "^0.17.0",
108+
"cdk-from-cfn": "^0.35.0",
109109
"chalk": "^4",
110110
"chokidar": "^3.5.3",
111111
"decamelize": "^5.0.1",

‎packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
using Constructs;
44
using System.Collections.Generic;
55

6-
namespace Com.Acme.Test.Simple
6+
namespace GoodCSharpStack
77
{
8+
public class GoodCSharpStackProps : StackProps
9+
{
10+
}
11+
812
/// <summary>
913
/// AWS CloudFormation Sample Template S3_Website_Bucket_With_Retain_On_Delete: Sample template showing how to create a publicly accessible S3 bucket configured for website access with a deletion policy of retain on delete.
1014
/// </summary>

‎packages/aws-cdk/test/commands/test-resources/stacks/s3.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ func NewGoodGoStack(scope constructs.Construct, id string, props GoodGoStackProp
4848
func main() {
4949
defer jsii.Close()
5050

51-
app := awscdk.NewApp(nil)
51+
app := cdk.NewApp(nil)
5252

53-
NewGoodGoStack(app, "GoodGo", &GoodGoStackProps{
54-
awscdk.StackProps{
53+
NewGoodGoStack(app, "GoodGo", GoodGoStackProps{
54+
cdk.StackProps{
5555
Env: env(),
5656
},
5757
})
@@ -61,7 +61,7 @@ func main() {
6161

6262
// env determines the AWS environment (account+region) in which our stack is to
6363
// be deployed. For more information see: https://docs.aws.amazon.com/cdk/latest/guide/environments.html
64-
func env() *awscdk.Environment {
64+
func env() *cdk.Environment {
6565
// If unspecified, this stack will be "environment-agnostic".
6666
// Account/Region-dependent features and context lookups will not work, but a
6767
// single synthesized template can be deployed anywhere.
@@ -71,7 +71,7 @@ func env() *awscdk.Environment {
7171
// Uncomment if you know exactly what account and region you want to deploy
7272
// the stack to. This is the recommendation for production stacks.
7373
//---------------------------------------------------------------------------
74-
// return &awscdk.Environment{
74+
// return &cdk.Environment{
7575
// Account: jsii.String("123456789012"),
7676
// Region: jsii.String("us-east-1"),
7777
// }
@@ -80,7 +80,7 @@ func env() *awscdk.Environment {
8080
// implied by the current CLI configuration. This is recommended for dev
8181
// stacks.
8282
//---------------------------------------------------------------------------
83-
// return &awscdk.Environment{
83+
// return &cdk.Environment{
8484
// Account: jsii.String(os.Getenv("CDK_DEFAULT_ACCOUNT")),
8585
// Region: jsii.String(os.Getenv("CDK_DEFAULT_REGION")),
8686
// }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
2727
'errorDocument': 'error.html',
2828
},
2929
)
30-
s3Bucket.cfnOptions.deletionPolicy = cdk.CfnDeletionPolicy.RETAIN
30+
s3Bucket.cfn_options.deletion_policy = cdk.CfnDeletionPolicy.RETAIN
3131

3232
# Outputs
3333
self.website_u_r_l = s3Bucket.attr_website_u_r_l

‎yarn.lock

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

5337-
cdk-from-cfn@^0.17.0:
5338-
version "0.17.0"
5339-
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.17.0.tgz#46f77dc1141c21ee99255cdda59a8a2d2d428755"
5340-
integrity sha512-7sJnvEfnlFhYdIih4XZfIpUFiIy0ogdLXHk8BZEaWdG1tSpUOV9HTmk5IvZJr6YfF1j1D21kvrGLZYZNsRr7HA==
5337+
cdk-from-cfn@^0.35.0:
5338+
version "0.35.0"
5339+
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.35.0.tgz#e7c1111fa9286a6ebd6d82d7f8083af7c4eef230"
5340+
integrity sha512-5wBdQKHv+z93209sxNf8ErTUgvKu5gMSNjQUJRqunKq2zENJbrnCKUUTv1vwR2KFhijKIGykWBsqRsByZ4QN/A==
53415341

53425342
cdk-generate-synthetic-examples@^0.1.291:
53435343
version "0.1.291"

0 commit comments

Comments
 (0)