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: use externally published version of cdk-assets #31119

Merged
merged 6 commits into from
Aug 15, 2024
Merged

chore: use externally published version of cdk-assets #31119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
071dbc5
chore: use externally published cloud-assembly-schema
TheRealAmazonKendra Aug 8, 2024
86357d5
update pkglint
TheRealAmazonKendra Aug 8, 2024
d58c781
more attributions
TheRealAmazonKendra Aug 8, 2024
faedadd
newer version
TheRealAmazonKendra Aug 13, 2024
ca1fee3
for the pipeline
TheRealAmazonKendra Aug 14, 2024
6e5a790
Merge branch 'main' into TheRealAmazonKendra/cdk-assets
TheRealAmazonKendra Aug 15, 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
7 changes: 0 additions & 7 deletions .github/workflows/request-cli-integ-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ jobs:
- packages/aws-cdk/bin/**
- packages/aws-cdk/lib/**
- packages/aws-cdk/test/**
- packages/cdk-assets/bin/**
- packages/cdk-assets/lib/**
- packages/cdk-assets/test/**
- packages/aws-cdk-lib/cloud-assembly-schema/lib/**
- packages/aws-cdk-lib/cloud-assembly-schema/schema/**
- packages/aws-cdk-lib/cloud-assembly-schema/scripts/**
- packages/aws-cdk-lib/cloud-assembly-schema/test/**
Comment on lines -34 to -36
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cloud assembly schema is removed from here (and a few other places), but this PR doesn't delete that package and the title doesn't suggest that we're using the externally published version of cloud-assembly-schema as well. Can we update the PR title to reflect that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cloud assembly schema was removed in a previous PR.

- packages/@aws-cdk/cloudformation-diff/lib/**
- packages/@aws-cdk/cloudformation-diff/test/**
- packages/@aws-cdk-testing/cli-integ/bin/**
Expand Down
3 changes: 1 addition & 2 deletions lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"npmClient": "yarn",
"packages": [
"packages/aws-cdk-lib",
"packages/cdk-assets",
"packages/aws-cdk",
"packages/cdk",
"packages/@aws-cdk/*",
Expand All @@ -25,4 +24,4 @@
"rejectCycles": true,
"version": "0.0.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
}
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
"packages/aws-cdk-lib",
"packages/aws-cdk",
"packages/cdk",
"packages/cdk-assets",
"packages/@aws-cdk/*",
"packages/awslint",
"packages/@aws-cdk-testing/*",
Expand Down
10 changes: 10 additions & 0 deletions 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 @@ -501,6 +501,16 @@ This product includes software developed at
Amazon Web Services, Inc. (http://aws.amazon.com/).


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

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

This product includes software developed at
Amazon Web Services, Inc. (http://aws.amazon.com/).


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

** balanced-match@1.0.2 - https://www.npmjs.com/package/balanced-match/v/1.0.2 | MIT
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/integ-runner/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/aws-service-spec": "^0.1.17",
"cdk-assets": "0.0.0",
"cdk-assets": "^2.151.2",
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
"aws-cdk": "0.0.0",
"chalk": "^4",
Expand Down
Binary file added packages/aws-cdk-lib/.jsii.tabl.json.gz
View file
Open in desktop
Binary file not shown.
19 changes: 1 addition & 18 deletions packages/aws-cdk-lib/jest.config.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions packages/aws-cdk/THIRD_PARTY_LICENSES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,16 @@ This product includes software developed at
Amazon Web Services, Inc. (http://aws.amazon.com/).


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

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

This product includes software developed at
Amazon Web Services, Inc. (http://aws.amazon.com/).


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

** balanced-match@1.0.2 - https://www.npmjs.com/package/balanced-match/v/1.0.2 | MIT
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"archiver": "^5.3.2",
"aws-sdk": "^2.1653.0",
"camelcase": "^6.3.0",
"cdk-assets": "0.0.0",
"cdk-assets": "^2.151.2",
"cdk-from-cfn": "^0.162.0",
"chalk": "^4",
"chokidar": "^3.6.0",
Expand Down
3 changes: 0 additions & 3 deletions packages/aws-cdk/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
"references": [
{
"path": "../@aws-cdk/cloudformation-diff"
},
{
"path": "../cdk-assets"
}
]
}
3 changes: 0 additions & 3 deletions packages/cdk-assets/.eslintrc.js
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions packages/cdk-assets/.gitignore
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions packages/cdk-assets/.npmignore
View file
Open in desktop

This file was deleted.

201 changes: 0 additions & 201 deletions packages/cdk-assets/LICENSE
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions packages/cdk-assets/NOTICE
View file
Open in desktop

This file was deleted.

Loading
Loading