cleanup references to cdk-assets

aws · Jun 27, 2024 · 4f1fe49 · 4f1fe49
1 parent 118df88
commit 4f1fe49
Show file tree

Hide file tree

Showing 13 changed files with 2,439 additions and 469 deletions.
diff --git a/.github/workflows/request-cli-integ-test.yml b/.github/workflows/request-cli-integ-test.yml
@@ -27,9 +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/**

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,6 @@
   "npmClient": "yarn",
   "packages": [
     "packages/aws-cdk-lib",
-    "packages/cdk-assets",
     "packages/aws-cdk",
     "packages/cdk",
     "packages/@aws-cdk/*",
@@ -25,4 +24,4 @@
   "rejectCycles": true,
   "version": "0.0.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
-}
+}
diff --git a/package.json b/package.json
@@ -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/*",
@@ -177,4 +176,4 @@
   "dependencies": {
     "string-width": "^4.2.3"
   }
-}
+}
diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
@@ -207,7 +207,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l
 
 ----------------
 
-** @jsii/check-node@1.97.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.97.0 | Apache-2.0
+** @jsii/check-node@1.101.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.101.0 | Apache-2.0
 jsii
 Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
@@ -266,7 +266,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----------------
 
-** ajv@8.12.0 - https://www.npmjs.com/package/ajv/v/8.12.0 | MIT
+** ajv@8.16.0 - https://www.npmjs.com/package/ajv/v/8.16.0 | MIT
 The MIT License (MIT)
 
 Copyright (c) 2015-2021 Evgeny Poberezkin
@@ -493,7 +493,17 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 ----------------
 
-** aws-sdk@2.1596.0 - https://www.npmjs.com/package/aws-sdk/v/2.1596.0 | Apache-2.0
+** aws-sdk@2.1648.0 - https://www.npmjs.com/package/aws-sdk/v/2.1648.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/).
+
+
+----------------
+
+** aws-sdk@2.1649.0 - https://www.npmjs.com/package/aws-sdk/v/2.1649.0 | Apache-2.0
 AWS SDK for JavaScript
 Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
@@ -601,10 +611,10 @@ SOFTWARE.
 
 ----------------
 
-** braces@3.0.2 - https://www.npmjs.com/package/braces/v/3.0.2 | MIT
+** braces@3.0.3 - https://www.npmjs.com/package/braces/v/3.0.3 | MIT
 The MIT License (MIT)
 
-Copyright (c) 2014-2018, Jon Schlinkert.
+Copyright (c) 2014-present, Jon Schlinkert.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -691,7 +701,14 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ----------------
 
-** cdk-from-cfn@0.156.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.156.0 | MIT OR Apache-2.0
+** cdk-assets@2.147.1 - https://www.npmjs.com/package/cdk-assets/v/2.147.1 | Apache-2.0
+AWS Cloud Development Kit (AWS CDK)
+Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+
+----------------
+
+** cdk-from-cfn@0.162.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.162.0 | MIT OR Apache-2.0
 
 ----------------
 
@@ -1123,7 +1140,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ----------------
 
-** debug@4.3.4 - https://www.npmjs.com/package/debug/v/4.3.4 | MIT
+** debug@4.3.5 - https://www.npmjs.com/package/debug/v/4.3.5 | MIT
 (The MIT License)
 
 Copyright (c) 2014-2017 TJ Holowaychuk <tj@vision-media.ca>
@@ -1390,7 +1407,7 @@ SOFTWARE.
 
 ----------------
 
-** fill-range@7.0.1 - https://www.npmjs.com/package/fill-range/v/7.0.1 | MIT
+** fill-range@7.1.1 - https://www.npmjs.com/package/fill-range/v/7.1.1 | MIT
 The MIT License (MIT)
 
 Copyright (c) 2014-present, Jon Schlinkert.
@@ -2315,26 +2332,6 @@ licenses; we recommend you read them, as their terms may differ from the
 terms above.
 
 
-----------------
-
-** lru-cache@6.0.0 - https://www.npmjs.com/package/lru-cache/v/6.0.0 | ISC
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ----------------
 
 ** lru-cache@7.18.3 - https://www.npmjs.com/package/lru-cache/v/7.18.3 | ISC
@@ -3094,10 +3091,10 @@ THE SOFTWARE.
 
 ----------------
 
-** sax@1.3.0 - https://www.npmjs.com/package/sax/v/1.3.0 | ISC
+** sax@1.4.1 - https://www.npmjs.com/package/sax/v/1.4.1 | ISC
 The ISC License
 
-Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
+Copyright (c) 2010-2024 Isaac Z. Schlueter and Contributors
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -3116,7 +3113,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 `String.fromCodePoint` by Mathias Bynens used according to terms of MIT
 License, as follows:
 
-Copyright (c) 2010-2022 Mathias Bynens <https://mathiasbynens.be/>
+Copyright (c) 2010-2024 Mathias Bynens <https://mathiasbynens.be/>
 
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
@@ -3140,7 +3137,7 @@ Copyright (c) 2010-2022 Mathias Bynens <https://mathiasbynens.be/>
 
 ----------------
 
-** semver@7.6.0 - https://www.npmjs.com/package/semver/v/7.6.0 | ISC
+** semver@7.6.2 - https://www.npmjs.com/package/semver/v/7.6.2 | ISC
 The ISC License
 
 Copyright (c) Isaac Z. Schlueter and Contributors
@@ -3545,7 +3542,7 @@ THE SOFTWARE.
 
 ----------------
 
-** tslib@2.6.2 - https://www.npmjs.com/package/tslib/v/2.6.2 | 0BSD
+** tslib@2.6.3 - https://www.npmjs.com/package/tslib/v/2.6.3 | 0BSD
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -3723,26 +3720,6 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 THIS SOFTWARE.
 
 
-----------------
-
-** yallist@4.0.0 - https://www.npmjs.com/package/yallist/v/4.0.0 | ISC
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
 ----------------
 
 ** yaml@1.10.2 - https://www.npmjs.com/package/yaml/v/1.10.2 | ISC

diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json
@@ -43,7 +43,7 @@
     }
   },
   "scripts": {
-    "attribute": "node-bundle validate --external=fsevents:optional --entrypoint=lib/index.js --fix --dont-attribute \"^@aws-cdk/|^cdk-assets$|^cdk-cli-wrapper$|^aws-cdk$\"",
+    "attribute": "node-bundle validate --external=fsevents:optional --entrypoint=lib/index.js --fix --dont-attribute \"^@aws-cdk/|^cdk-cli-wrapper$|^aws-cdk$\"",
     "awslint": "cdk-awslint",
     "build": "cdk-build",
     "build+extract": "yarn build && yarn rosetta:extract",
@@ -122,4 +122,4 @@
   },
   "dependencies": {},
   "peerDependencies": {}
-}
+}