Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update cdk-from-cfn version #28619

Merged
merged 3 commits into from
Jan 8, 2024
Merged

chore: update cdk-from-cfn version #28619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eed9707
chore: update cdk-from-cfn version
TheRealAmazonKendra Jan 8, 2024
f29ae9a
oops, don't print that
TheRealAmazonKendra Jan 8, 2024
2303d93
Merge branch 'main' into TheRealAmazonKendra/cdk-from-cfn-update
mergify[bot] Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
View file
Open in desktop
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.91.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.91.0 | MIT OR Apache-2.0
** cdk-from-cfn@0.113.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.113.0 | MIT OR Apache-2.0

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

Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"aws-sdk": "^2.1517.0",
"camelcase": "^6.3.0",
"cdk-assets": "0.0.0",
"cdk-from-cfn": "^0.91.0",
"cdk-from-cfn": "^0.113.0",
"chalk": "^4",
"chokidar": "^3.5.3",
"decamelize": "^5.0.1",
Expand Down Expand Up @@ -155,4 +155,4 @@
"publishConfig": {
"tag": "latest"
}
}
}
2 changes: 1 addition & 1 deletion packages/aws-cdk/test/commands/migrate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ describe('Migrate Function Tests', () => {

expect(fs.pathExists(path.join(workDir, 's3.go'))).toBeTruthy();
const app = fs.readFileSync(path.join(workDir, 'GoodGo', 'good_go.go'), 'utf8').split('\n');
expect(app.map(line => line.match(/func NewGoodGoStack\(scope constructs.Construct, id string, props GoodGoStackProps\) \*GoodGoStack \{/)).filter(line => line).length).toEqual(1);
expect(app.map(line => line.match(/func NewGoodGoStack\(scope constructs.Construct, id string, props \*GoodGoStackProps\) \*GoodGoStack \{/)).filter(line => line).length).toEqual(1);
expect(app.map(line => line.match(/ NewGoodGoStack\(app, "GoodGo", &GoodGoStackProps\{/)));
});

Expand Down
8 changes: 6 additions & 2 deletions packages/aws-cdk/test/commands/test-resources/stacks/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ type GoodGoStack struct {
S3BucketSecureUrl interface{} // TODO: fix to appropriate type
}

func NewGoodGoStack(scope constructs.Construct, id string, props GoodGoStackProps) *GoodGoStack {
stack := cdk.NewStack(scope, &id, &props.StackProps)
func NewGoodGoStack(scope constructs.Construct, id string, props *GoodGoStackProps) *GoodGoStack {
var sprops cdk.StackProps
if props != nil {
sprops = props.StackProps
}
stack := cdk.NewStack(scope, &id, &sprops)

s3Bucket := s3.NewCfnBucket(
stack,
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6246,10 +6246,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.91.0:
version "0.91.0"
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.91.0.tgz#d1858e323b749d130cc073b098367bd354f21afa"
integrity sha512-ZkeA2Iws4LCg7QqeF+iVjZ5U0MaNni+O0RSEocGxKMvbn4SG/Z1Ib/lWBQZX32ZvuqpgUCUOL3askIuZ7e3+5g==
cdk-from-cfn@^0.113.0:
version "0.113.0"
resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.113.0.tgz#b68832b84ce939d525b9660f928a2aef028cc867"
integrity sha512-cBsPHyg6tNvy4JRHwQpkUh5U6Te5fUAxZX2RhIlaOVT/Ci40PjPYFDhStC1BFl+L3O9uZTmy/OY8CkjlZsWvlw==

cdk-generate-synthetic-examples@^0.1.299:
version "0.1.299"
Expand Down
Loading