Skip to content

Commit a31513a

Browse files
chore: use externally published version of cdk-assets (#31119)
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*
1 parent 1fca1e5 commit a31513a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+69
-4930
lines changed

.github/workflows/request-cli-integ-test.yml

-7
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ jobs:
2727
- packages/aws-cdk/bin/**
2828
- packages/aws-cdk/lib/**
2929
- packages/aws-cdk/test/**
30-
- packages/cdk-assets/bin/**
31-
- packages/cdk-assets/lib/**
32-
- packages/cdk-assets/test/**
33-
- packages/aws-cdk-lib/cloud-assembly-schema/lib/**
34-
- packages/aws-cdk-lib/cloud-assembly-schema/schema/**
35-
- packages/aws-cdk-lib/cloud-assembly-schema/scripts/**
36-
- packages/aws-cdk-lib/cloud-assembly-schema/test/**
3730
- packages/@aws-cdk/cloudformation-diff/lib/**
3831
- packages/@aws-cdk/cloudformation-diff/test/**
3932
- packages/@aws-cdk-testing/cli-integ/bin/**

lerna.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"npmClient": "yarn",
33
"packages": [
44
"packages/aws-cdk-lib",
5-
"packages/cdk-assets",
65
"packages/aws-cdk",
76
"packages/cdk",
87
"packages/@aws-cdk/*",
@@ -25,4 +24,4 @@
2524
"rejectCycles": true,
2625
"version": "0.0.0",
2726
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
28-
}
27+
}

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
"packages/aws-cdk-lib",
7373
"packages/aws-cdk",
7474
"packages/cdk",
75-
"packages/cdk-assets",
7675
"packages/@aws-cdk/*",
7776
"packages/awslint",
7877
"packages/@aws-cdk-testing/*",

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

+10
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,16 @@ This product includes software developed at
501501
Amazon Web Services, Inc. (http://aws.amazon.com/).
502502

503503

504+
----------------
505+
506+
** [email protected] - https://www.npmjs.com/package/aws-sdk/v/2.1675.0 | Apache-2.0
507+
AWS SDK for JavaScript
508+
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
509+
510+
This product includes software developed at
511+
Amazon Web Services, Inc. (http://aws.amazon.com/).
512+
513+
504514
----------------
505515

506516
** [email protected] - https://www.npmjs.com/package/balanced-match/v/1.0.2 | MIT

packages/@aws-cdk/integ-runner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@aws-cdk/cloudformation-diff": "0.0.0",
7676
"@aws-cdk/cx-api": "0.0.0",
7777
"@aws-cdk/aws-service-spec": "^0.1.17",
78-
"cdk-assets": "0.0.0",
78+
"cdk-assets": "^2.151.2",
7979
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
8080
"aws-cdk": "0.0.0",
8181
"chalk": "^4",
7.64 MB
Binary file not shown.

packages/aws-cdk-lib/jest.config.js

+1-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/aws-cdk/THIRD_PARTY_LICENSES

+10
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,16 @@ This product includes software developed at
294294
Amazon Web Services, Inc. (http://aws.amazon.com/).
295295

296296

297+
----------------
298+
299+
** [email protected] - https://www.npmjs.com/package/aws-sdk/v/2.1675.0 | Apache-2.0
300+
AWS SDK for JavaScript
301+
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
302+
303+
This product includes software developed at
304+
Amazon Web Services, Inc. (http://aws.amazon.com/).
305+
306+
297307
----------------
298308

299309
** [email protected] - https://www.npmjs.com/package/balanced-match/v/1.0.2 | MIT

packages/aws-cdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"archiver": "^5.3.2",
105105
"aws-sdk": "^2.1653.0",
106106
"camelcase": "^6.3.0",
107-
"cdk-assets": "0.0.0",
107+
"cdk-assets": "^2.151.2",
108108
"cdk-from-cfn": "^0.162.0",
109109
"chalk": "^4",
110110
"chokidar": "^3.6.0",

packages/aws-cdk/tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
"references": [
3636
{
3737
"path": "../@aws-cdk/cloudformation-diff"
38-
},
39-
{
40-
"path": "../cdk-assets"
4138
}
4239
]
4340
}

packages/cdk-assets/.eslintrc.js

-3
This file was deleted.

packages/cdk-assets/.gitignore

-28
This file was deleted.

packages/cdk-assets/.npmignore

-30
This file was deleted.

packages/cdk-assets/LICENSE

-201
This file was deleted.

packages/cdk-assets/NOTICE

-2
This file was deleted.

0 commit comments

Comments
 (0)