Skip to content

Commit 8bb221d

Browse files
TheRealAmazonKendraTheRealAmazonKendra
authored
chore: upgrade cdk migrate version with bug fixes (#27406)
This change contains bug fixes for all languages, some of which were caught in our current tests. I'm continuing to list these changes as chores until we're ready for them to show up in our changelog. > > [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 495dafa commit 8bb221d

File tree

8 files changed

+43
-36
lines changed

8 files changed

+43
-36
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The @aws-cdk/cli-lib-alpha package includes the following third-party software/licensing:
22

3-
** @jsii/check-node@1.88.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.88.0 | Apache-2.0
3+
** @jsii/check-node@1.89.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.89.0 | Apache-2.0
44
jsii
55
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
66

@@ -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.1461.0 - https://www.npmjs.com/package/aws-sdk/v/2.1461.0 | Apache-2.0
267+
** aws-sdk@2.1466.0 - https://www.npmjs.com/package/aws-sdk/v/2.1466.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.35.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.35.0 | MIT OR Apache-2.0
464+
** cdk-from-cfn@0.47.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.47.0 | MIT OR Apache-2.0
465465

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

@@ -2717,10 +2717,10 @@ THE SOFTWARE.
27172717

27182718
----------------
27192719

2720-
** sax@1.2.4 - https://www.npmjs.com/package/sax/v/1.2.4 | ISC
2720+
** sax@1.3.0 - https://www.npmjs.com/package/sax/v/1.3.0 | ISC
27212721
The ISC License
27222722

2723-
Copyright (c) Isaac Z. Schlueter and Contributors
2723+
Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
27242724

27252725
Permission to use, copy, modify, and/or distribute this software for any
27262726
purpose with or without fee is hereby granted, provided that the above
@@ -2739,7 +2739,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
27392739
`String.fromCodePoint` by Mathias Bynens used according to terms of MIT
27402740
License, as follows:
27412741

2742-
Copyright Mathias Bynens <https://mathiasbynens.be/>
2742+
Copyright (c) 2010-2022 Mathias Bynens <https://mathiasbynens.be/>
27432743

27442744
Permission is hereby granted, free of charge, to any person obtaining
27452745
a copy of this software and associated documentation files (the

‎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.36.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.36.0 | MIT OR Apache-2.0
464+
** cdk-from-cfn@0.47.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.47.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.36.0",
85+
"cdk-from-cfn": "^0.47.0",
8686
"constructs": "^10.0.0",
8787
"fast-check": "^3.13.1",
8888
"jest": "^29.7.0",
@@ -105,7 +105,7 @@
105105
"aws-sdk": "^2.1466.0",
106106
"camelcase": "^6.3.0",
107107
"cdk-assets": "0.0.0",
108-
"cdk-from-cfn": "^0.36.0",
108+
"cdk-from-cfn": "^0.47.0",
109109
"chalk": "^4",
110110
"chokidar": "^3.5.3",
111111
"decamelize": "^5.0.1",

‎packages/aws-cdk/test/commands/migrate.test.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ describe('Migrate Function Tests', () => {
123123
expect(app.map(line => line.match(/new GoodTypeScriptStack\(app, \'GoodTypeScript\', \{/)).filter(line => line).length).toEqual(1);
124124

125125
// Replaced stack file is correctly generated
126-
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodTypeScript', 'lib', 'good_type_script-stack.ts'));
127-
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 's3-stack.ts')));
126+
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodTypeScript', 'lib', 'good_type_script-stack.ts'), 'utf8');
127+
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 's3-stack.ts'), 'utf8'));
128128
});
129129

130130
cliTest('generateCdkApp generates the expected cdk app when called for python', async (workDir) => {
@@ -142,8 +142,8 @@ describe('Migrate Function Tests', () => {
142142
expect(app.map(line => line.match(/GoodPythonStack\(app, "GoodPython",/)).filter(line => line).length).toEqual(1);
143143

144144
// Replaced stack file is correctly generated
145-
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodPython', 'good_python', 'good_python_stack.py'));
146-
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 's3_stack.py')));
145+
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodPython', 'good_python', 'good_python_stack.py'), 'utf8');
146+
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 's3_stack.py'), 'utf8'));
147147
});
148148

149149
cliTest('generateCdkApp generates the expected cdk app when called for java', async (workDir) => {
@@ -161,8 +161,8 @@ describe('Migrate Function Tests', () => {
161161
expect(app.map(line => line.match(/ new GoodJavaStack\(app, "GoodJava", StackProps.builder()/)).filter(line => line).length).toEqual(1);
162162

163163
// Replaced stack file is correctly generated
164-
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodJava', 'src', 'main', 'java', 'com', 'myorg', 'GoodJavaStack.java'));
165-
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 'S3Stack.java')));
164+
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodJava', 'src', 'main', 'java', 'com', 'myorg', 'GoodJavaStack.java'), 'utf8');
165+
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 'S3Stack.java'), 'utf8'));
166166
});
167167

168168
cliTest('generateCdkApp generates the expected cdk app when called for csharp', async (workDir) => {
@@ -180,8 +180,8 @@ describe('Migrate Function Tests', () => {
180180
expect(app.map(line => line.match(/ new GoodCSharpStack\(app, "GoodCSharp", new StackProps/)).filter(line => line).length).toEqual(1);
181181

182182
// Replaced stack file is correctly generated
183-
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodCSharp', 'src', 'GoodCSharp', 'GoodCSharpStack.cs'));
184-
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 'S3Stack.cs')));
183+
const replacedStack = fs.readFileSync(path.join(workDir, 'GoodCSharp', 'src', 'GoodCSharp', 'GoodCSharpStack.cs'), 'utf8');
184+
expect(replacedStack).toEqual(fs.readFileSync(path.join(...stackPath, 'S3Stack.cs'), 'utf8'));
185185
});
186186

187187
cliTest('generatedCdkApp generates the expected cdk app when called for go', async (workDir) => {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import software.constructs.Construct;
44

55
import java.util.*;
6-
import software.amazon.awscdk.*;
76
import software.amazon.awscdk.CfnMapping;
87
import software.amazon.awscdk.CfnTag;
98
import software.amazon.awscdk.Stack;
109
import software.amazon.awscdk.StackProps;
1110

11+
import software.amazon.awscdk.*;
1212
import software.amazon.awscdk.services.s3.*;
1313

1414
class GoodJavaStack extends Stack {

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

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

3333
// Outputs
3434
this.websiteUrl = s3Bucket.attrWebsiteUrl;
35+
new cdk.CfnOutput(this, 'WebsiteURL', {
36+
description: 'URL for website hosted on S3',
37+
value: this.websiteUrl!.toString(),
38+
});
3539
this.s3BucketSecureUrl = [
3640
'https://',
3741
s3Bucket.attrDomainName,
3842
].join('');
43+
new cdk.CfnOutput(this, 'S3BucketSecureURL', {
44+
description: 'Name of S3 bucket to hold website content',
45+
value: this.s3BucketSecureUrl!.toString(),
46+
});
3947
}
4048
}

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

+13-14
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
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.
88
"""
99
class GoodPythonStack(Stack):
10-
"""
11-
URL for website hosted on S3
12-
"""
13-
global website_u_r_l
14-
"""
15-
Name of S3 bucket to hold website content
16-
"""
17-
global s3_bucket_secure_u_r_l
18-
1910
def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
2011
super().__init__(scope, construct_id, **kwargs)
2112

@@ -30,18 +21,26 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
3021
s3Bucket.cfn_options.deletion_policy = cdk.CfnDeletionPolicy.RETAIN
3122

3223
# Outputs
33-
self.website_u_r_l = s3Bucket.attr_website_u_r_l
24+
"""
25+
URL for website hosted on S3
26+
"""
27+
self.website_url = s3Bucket.attr_website_url
3428
cdk.CfnOutput(self, 'WebsiteURL',
3529
description = 'URL for website hosted on S3',
36-
value = self.website_u_r_l,
30+
value = str(self.website_url),
3731
)
38-
self.s3_bucket_secure_u_r_l = [
32+
33+
"""
34+
Name of S3 bucket to hold website content
35+
"""
36+
self.s3_bucket_secure_url = ''.join([
3937
'https://',
4038
s3Bucket.attr_domain_name,
41-
].join('')
39+
])
4240
cdk.CfnOutput(self, 'S3BucketSecureURL',
4341
description = 'Name of S3 bucket to hold website content',
44-
value = self.s3_bucket_secure_u_r_l,
42+
value = str(self.s3_bucket_secure_url),
4543
)
4644

4745

46+

‎yarn.lock

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

5518-
cdk-from-cfn@^0.36.0:
5519-
version "0.36.0"
5520-
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.36.0.tgz#d5363d8475e10e09bcb7e8f5a64df19b8794df87"
5521-
integrity sha512-UWDcoLhph/1qUul2u7V2C2MMlbWGo4VhguyWEOHVDTSN4CZ/XuMH3GNDCaNVoQgeLh/GVJFtZAd92WUZNzj4hw==
5518+
cdk-from-cfn@^0.47.0:
5519+
version "0.47.0"
5520+
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.47.0.tgz#76998b826245ba28809746a173ef1f844294c32b"
5521+
integrity sha512-GNTTgBlFT1A2WezIeH4pjoTE2zuRJxpjl3emQCiTpQmDeTeQSfe30fvatrKc4Dn0TJZtNhTubpRJeRf2dfDDeA==
55225522

55235523
cdk-generate-synthetic-examples@^0.1.291:
55245524
version "0.1.291"

0 commit comments

Comments
 (0)