Skip to content

Commit

Permalink
chore: use externally published version of cdk-assets (#31119)
Browse files Browse the repository at this point in the history
This PR only includes the removal of cdk-assets. In order to keep PRs small and clean, this does not include the documentation updates for how to find and contribute to cdk-assets for cloud-assembly-schema. That will be a separate PR.

### Checklist
- [ ] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)

----

*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 Aug 15, 2024
1 parent 1fca1e5 commit a31513a
Show file tree
Hide file tree
Showing 63 changed files with 69 additions and 4,930 deletions.
7 changes: 0 additions & 7 deletions .github/workflows/request-cli-integ-test.yml
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/**
- 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
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
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
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
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
Binary file not shown.
19 changes: 1 addition & 18 deletions packages/aws-cdk-lib/jest.config.js

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
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
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
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

This file was deleted.

28 changes: 0 additions & 28 deletions packages/cdk-assets/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions packages/cdk-assets/.npmignore

This file was deleted.

201 changes: 0 additions & 201 deletions packages/cdk-assets/LICENSE

This file was deleted.

2 changes: 0 additions & 2 deletions packages/cdk-assets/NOTICE

This file was deleted.

Loading

0 comments on commit a31513a

Please sign in to comment.