diff --git a/packages/@aws-cdk/cli-lib-alpha/.gitignore b/packages/@aws-cdk/cli-lib-alpha/.gitignore index e728027e0ff5f..cfc0e3839dfa6 100644 --- a/packages/@aws-cdk/cli-lib-alpha/.gitignore +++ b/packages/@aws-cdk/cli-lib-alpha/.gitignore @@ -9,6 +9,7 @@ dist tsconfig.json # Generated by generate.sh +resources/ build-info.json .LAST_BUILD diff --git a/packages/@aws-cdk/cli-lib-alpha/.npmignore b/packages/@aws-cdk/cli-lib-alpha/.npmignore index a3afe6f7b23d6..618688cd6d5a9 100644 --- a/packages/@aws-cdk/cli-lib-alpha/.npmignore +++ b/packages/@aws-cdk/cli-lib-alpha/.npmignore @@ -17,22 +17,21 @@ tsconfig.json # Make the linter happy, but... !*.js -# ... we don't actualy want unbundled files +# ... we don't actually want unbundled files *.js *.ts # Explicitly allow all required files +!resources/** +!db.json.gz !lib/main.js !lib/bridge.js !lib/setup-sandbox.js -!lib/api/bootstrap/bootstrap-template.yaml !*.d.ts !*.lit.ts !rosetta/ !.jsii !.jsii.tabl.json !.warnings.jsii.js -!build-info.json !NOTICE !THIRD_PARTY_LICENSES -!db.json.gz diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES index 83df0b8ecbb3d..db7cdbb6dbd88 100644 --- a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES +++ b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES @@ -1442,7 +1442,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-cognito-identity@3.685.0 - https://www.npmjs.com/package/@aws-sdk/client-cognito-identity/v/3.685.0 | Apache-2.0 +** @aws-sdk/client-cognito-identity@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-cognito-identity/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -1648,7 +1648,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-cognito-identity@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-cognito-identity/v/3.699.0 | Apache-2.0 +** @aws-sdk/client-cognito-identity@3.716.0 - https://www.npmjs.com/package/@aws-sdk/client-cognito-identity/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -2060,7 +2060,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-ecr@3.682.0 - https://www.npmjs.com/package/@aws-sdk/client-ecr/v/3.682.0 | Apache-2.0 +** @aws-sdk/client-ecr@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-ecr/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -2266,7 +2266,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-ecr@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-ecr/v/3.699.0 | Apache-2.0 +** @aws-sdk/client-ecr@3.720.0 - https://www.npmjs.com/package/@aws-sdk/client-ecr/v/3.720.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -3708,7 +3708,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-s3@3.685.0 - https://www.npmjs.com/package/@aws-sdk/client-s3/v/3.685.0 | Apache-2.0 +** @aws-sdk/client-s3@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-s3/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -3914,7 +3914,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-s3@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-s3/v/3.699.0 | Apache-2.0 +** @aws-sdk/client-s3@3.717.0 - https://www.npmjs.com/package/@aws-sdk/client-s3/v/3.717.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -4120,7 +4120,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-secrets-manager@3.682.0 - https://www.npmjs.com/package/@aws-sdk/client-secrets-manager/v/3.682.0 | Apache-2.0 +** @aws-sdk/client-secrets-manager@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-secrets-manager/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -4326,7 +4326,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-secrets-manager@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-secrets-manager/v/3.699.0 | Apache-2.0 +** @aws-sdk/client-secrets-manager@3.716.0 - https://www.npmjs.com/package/@aws-sdk/client-secrets-manager/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -4944,7 +4944,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-sso-oidc@3.682.0 - https://www.npmjs.com/package/@aws-sdk/client-sso-oidc/v/3.682.0 | Apache-2.0 +** @aws-sdk/client-sso-oidc@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-sso-oidc/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -5150,7 +5150,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-sso-oidc@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-sso-oidc/v/3.699.0 | Apache-2.0 +** @aws-sdk/client-sso-oidc@3.716.0 - https://www.npmjs.com/package/@aws-sdk/client-sso-oidc/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -5356,7 +5356,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-sso@3.682.0 - https://www.npmjs.com/package/@aws-sdk/client-sso/v/3.682.0 | Apache-2.0 +** @aws-sdk/client-sso@3.696.0 - https://www.npmjs.com/package/@aws-sdk/client-sso/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -5562,7 +5562,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-sso@3.696.0 - https://www.npmjs.com/package/@aws-sdk/client-sso/v/3.696.0 | Apache-2.0 +** @aws-sdk/client-sso@3.716.0 - https://www.npmjs.com/package/@aws-sdk/client-sso/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -5768,7 +5768,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-sts@3.682.0 - https://www.npmjs.com/package/@aws-sdk/client-sts/v/3.682.0 | Apache-2.0 +** @aws-sdk/client-sts@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-sts/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -5974,7 +5974,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/client-sts@3.699.0 - https://www.npmjs.com/package/@aws-sdk/client-sts/v/3.699.0 | Apache-2.0 +** @aws-sdk/client-sts@3.716.0 - https://www.npmjs.com/package/@aws-sdk/client-sts/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -6180,15 +6180,15 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/core@3.679.0 - https://www.npmjs.com/package/@aws-sdk/core/v/3.679.0 | Apache-2.0 +** @aws-sdk/core@3.696.0 - https://www.npmjs.com/package/@aws-sdk/core/v/3.696.0 | Apache-2.0 ---------------- -** @aws-sdk/core@3.696.0 - https://www.npmjs.com/package/@aws-sdk/core/v/3.696.0 | Apache-2.0 +** @aws-sdk/core@3.716.0 - https://www.npmjs.com/package/@aws-sdk/core/v/3.716.0 | Apache-2.0 ---------------- -** @aws-sdk/credential-provider-cognito-identity@3.685.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-cognito-identity/v/3.685.0 | Apache-2.0 +** @aws-sdk/credential-provider-cognito-identity@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-cognito-identity/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -6394,7 +6394,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/credential-provider-cognito-identity@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-cognito-identity/v/3.699.0 | Apache-2.0 +** @aws-sdk/credential-provider-cognito-identity@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-cognito-identity/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -6600,7 +6600,7 @@ The @aws-cdk/cli-lib-alpha package includes the following third-party software/l ---------------- -** @aws-sdk/credential-provider-env@3.679.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-env/v/3.679.0 | Apache-2.0 +** @aws-sdk/credential-provider-env@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-env/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -6805,7 +6805,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-env@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-env/v/3.696.0 | Apache-2.0 +** @aws-sdk/credential-provider-env@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-env/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -7010,15 +7010,15 @@ Apache License ---------------- -** @aws-sdk/credential-provider-http@3.679.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-http/v/3.679.0 | Apache-2.0 +** @aws-sdk/credential-provider-http@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-http/v/3.696.0 | Apache-2.0 ---------------- -** @aws-sdk/credential-provider-http@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-http/v/3.696.0 | Apache-2.0 +** @aws-sdk/credential-provider-http@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-http/v/3.716.0 | Apache-2.0 ---------------- -** @aws-sdk/credential-provider-ini@3.682.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-ini/v/3.682.0 | Apache-2.0 +** @aws-sdk/credential-provider-ini@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-ini/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -7223,7 +7223,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-ini@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-ini/v/3.699.0 | Apache-2.0 +** @aws-sdk/credential-provider-ini@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-ini/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -7428,7 +7428,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-node@3.682.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-node/v/3.682.0 | Apache-2.0 +** @aws-sdk/credential-provider-node@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-node/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -7633,7 +7633,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-node@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-node/v/3.699.0 | Apache-2.0 +** @aws-sdk/credential-provider-node@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-node/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -7838,7 +7838,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-process@3.679.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-process/v/3.679.0 | Apache-2.0 +** @aws-sdk/credential-provider-process@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-process/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -8043,7 +8043,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-process@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-process/v/3.696.0 | Apache-2.0 +** @aws-sdk/credential-provider-process@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-process/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -8248,7 +8248,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-sso@3.682.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-sso/v/3.682.0 | Apache-2.0 +** @aws-sdk/credential-provider-sso@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-sso/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -8453,7 +8453,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-sso@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-sso/v/3.699.0 | Apache-2.0 +** @aws-sdk/credential-provider-sso@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-sso/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -8658,7 +8658,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-web-identity@3.679.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-web-identity/v/3.679.0 | Apache-2.0 +** @aws-sdk/credential-provider-web-identity@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-web-identity/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -8863,7 +8863,7 @@ Apache License ---------------- -** @aws-sdk/credential-provider-web-identity@3.696.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-web-identity/v/3.696.0 | Apache-2.0 +** @aws-sdk/credential-provider-web-identity@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-provider-web-identity/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -9068,7 +9068,7 @@ Apache License ---------------- -** @aws-sdk/credential-providers@3.685.0 - https://www.npmjs.com/package/@aws-sdk/credential-providers/v/3.685.0 | Apache-2.0 +** @aws-sdk/credential-providers@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-providers/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -9273,7 +9273,7 @@ Apache License ---------------- -** @aws-sdk/credential-providers@3.699.0 - https://www.npmjs.com/package/@aws-sdk/credential-providers/v/3.699.0 | Apache-2.0 +** @aws-sdk/credential-providers@3.716.0 - https://www.npmjs.com/package/@aws-sdk/credential-providers/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -9683,7 +9683,7 @@ Apache License ---------------- -** @aws-sdk/lib-storage@3.685.0 - https://www.npmjs.com/package/@aws-sdk/lib-storage/v/3.685.0 | Apache-2.0 +** @aws-sdk/lib-storage@3.699.0 - https://www.npmjs.com/package/@aws-sdk/lib-storage/v/3.699.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -9888,7 +9888,7 @@ Apache License ---------------- -** @aws-sdk/lib-storage@3.699.0 - https://www.npmjs.com/package/@aws-sdk/lib-storage/v/3.699.0 | Apache-2.0 +** @aws-sdk/lib-storage@3.717.0 - https://www.npmjs.com/package/@aws-sdk/lib-storage/v/3.717.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -10093,7 +10093,7 @@ Apache License ---------------- -** @aws-sdk/middleware-bucket-endpoint@3.679.0 - https://www.npmjs.com/package/@aws-sdk/middleware-bucket-endpoint/v/3.679.0 | Apache-2.0 +** @aws-sdk/middleware-bucket-endpoint@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-bucket-endpoint/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -10299,7 +10299,7 @@ Apache License ---------------- -** @aws-sdk/middleware-bucket-endpoint@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-bucket-endpoint/v/3.696.0 | Apache-2.0 +** @aws-sdk/middleware-bucket-endpoint@3.714.0 - https://www.npmjs.com/package/@aws-sdk/middleware-bucket-endpoint/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -10505,7 +10505,7 @@ Apache License ---------------- -** @aws-sdk/middleware-expect-continue@3.679.0 - https://www.npmjs.com/package/@aws-sdk/middleware-expect-continue/v/3.679.0 | Apache-2.0 +** @aws-sdk/middleware-expect-continue@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-expect-continue/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -10711,7 +10711,7 @@ Apache License ---------------- -** @aws-sdk/middleware-expect-continue@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-expect-continue/v/3.696.0 | Apache-2.0 +** @aws-sdk/middleware-expect-continue@3.714.0 - https://www.npmjs.com/package/@aws-sdk/middleware-expect-continue/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -10917,7 +10917,7 @@ Apache License ---------------- -** @aws-sdk/middleware-flexible-checksums@3.682.0 - https://www.npmjs.com/package/@aws-sdk/middleware-flexible-checksums/v/3.682.0 | Apache-2.0 +** @aws-sdk/middleware-flexible-checksums@3.697.0 - https://www.npmjs.com/package/@aws-sdk/middleware-flexible-checksums/v/3.697.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -11123,7 +11123,7 @@ Apache License ---------------- -** @aws-sdk/middleware-flexible-checksums@3.697.0 - https://www.npmjs.com/package/@aws-sdk/middleware-flexible-checksums/v/3.697.0 | Apache-2.0 +** @aws-sdk/middleware-flexible-checksums@3.717.0 - https://www.npmjs.com/package/@aws-sdk/middleware-flexible-checksums/v/3.717.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -11329,7 +11329,7 @@ Apache License ---------------- -** @aws-sdk/middleware-host-header@3.679.0 - https://www.npmjs.com/package/@aws-sdk/middleware-host-header/v/3.679.0 | Apache-2.0 +** @aws-sdk/middleware-host-header@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-host-header/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -11535,7 +11535,7 @@ Apache License ---------------- -** @aws-sdk/middleware-host-header@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-host-header/v/3.696.0 | Apache-2.0 +** @aws-sdk/middleware-host-header@3.714.0 - https://www.npmjs.com/package/@aws-sdk/middleware-host-header/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -11741,7 +11741,7 @@ Apache License ---------------- -** @aws-sdk/middleware-location-constraint@3.679.0 - https://www.npmjs.com/package/@aws-sdk/middleware-location-constraint/v/3.679.0 | Apache-2.0 +** @aws-sdk/middleware-location-constraint@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-location-constraint/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -11947,7 +11947,7 @@ Apache License ---------------- -** @aws-sdk/middleware-location-constraint@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-location-constraint/v/3.696.0 | Apache-2.0 +** @aws-sdk/middleware-location-constraint@3.714.0 - https://www.npmjs.com/package/@aws-sdk/middleware-location-constraint/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -12153,7 +12153,7 @@ Apache License ---------------- -** @aws-sdk/middleware-logger@3.679.0 - https://www.npmjs.com/package/@aws-sdk/middleware-logger/v/3.679.0 | Apache-2.0 +** @aws-sdk/middleware-logger@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-logger/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -12358,7 +12358,7 @@ Apache License ---------------- -** @aws-sdk/middleware-logger@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-logger/v/3.696.0 | Apache-2.0 +** @aws-sdk/middleware-logger@3.714.0 - https://www.npmjs.com/package/@aws-sdk/middleware-logger/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -12563,7 +12563,7 @@ Apache License ---------------- -** @aws-sdk/middleware-recursion-detection@3.679.0 - https://www.npmjs.com/package/@aws-sdk/middleware-recursion-detection/v/3.679.0 | Apache-2.0 +** @aws-sdk/middleware-recursion-detection@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-recursion-detection/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -12769,7 +12769,7 @@ Apache License ---------------- -** @aws-sdk/middleware-recursion-detection@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-recursion-detection/v/3.696.0 | Apache-2.0 +** @aws-sdk/middleware-recursion-detection@3.714.0 - https://www.npmjs.com/package/@aws-sdk/middleware-recursion-detection/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -13384,212 +13384,6 @@ Apache License limitations under the License. ----------------- - -** @aws-sdk/middleware-sdk-s3@3.685.0 - https://www.npmjs.com/package/@aws-sdk/middleware-sdk-s3/v/3.685.0 | Apache-2.0 - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ---------------- ** @aws-sdk/middleware-sdk-s3@3.696.0 - https://www.npmjs.com/package/@aws-sdk/middleware-sdk-s3/v/3.696.0 | Apache-2.0 @@ -13798,7 +13592,7 @@ Apache License ---------------- -** @aws-sdk/middleware-ssec@3.679.0 - https://www.npmjs.com/package/@aws-sdk/middleware-ssec/v/3.679.0 | Apache-2.0 +** @aws-sdk/middleware-sdk-s3@3.716.0 - https://www.npmjs.com/package/@aws-sdk/middleware-sdk-s3/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -13987,7 +13781,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14210,7 +14004,7 @@ Apache License ---------------- -** @aws-sdk/middleware-user-agent@3.682.0 - https://www.npmjs.com/package/@aws-sdk/middleware-user-agent/v/3.682.0 | Apache-2.0 +** @aws-sdk/middleware-ssec@3.714.0 - https://www.npmjs.com/package/@aws-sdk/middleware-ssec/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -14399,7 +14193,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14622,8 +14416,8 @@ Apache License ---------------- -** @aws-sdk/region-config-resolver@3.679.0 - https://www.npmjs.com/package/@aws-sdk/region-config-resolver/v/3.679.0 | Apache-2.0 -Apache License +** @aws-sdk/middleware-user-agent@3.716.0 - https://www.npmjs.com/package/@aws-sdk/middleware-user-agent/v/3.716.0 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -14811,7 +14605,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14825,6 +14619,7 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- ** @aws-sdk/region-config-resolver@3.696.0 - https://www.npmjs.com/package/@aws-sdk/region-config-resolver/v/3.696.0 | Apache-2.0 @@ -15032,8 +14827,8 @@ Apache License ---------------- -** @aws-sdk/signature-v4-multi-region@3.685.0 - https://www.npmjs.com/package/@aws-sdk/signature-v4-multi-region/v/3.685.0 | Apache-2.0 - Apache License +** @aws-sdk/region-config-resolver@3.714.0 - https://www.npmjs.com/package/@aws-sdk/region-config-resolver/v/3.714.0 | Apache-2.0 +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -15221,7 +15016,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15235,7 +15030,6 @@ Apache License See the License for the specific language governing permissions and limitations under the License. - ---------------- ** @aws-sdk/signature-v4-multi-region@3.696.0 - https://www.npmjs.com/package/@aws-sdk/signature-v4-multi-region/v/3.696.0 | Apache-2.0 @@ -15444,8 +15238,8 @@ Apache License ---------------- -** @aws-sdk/token-providers@3.679.0 - https://www.npmjs.com/package/@aws-sdk/token-providers/v/3.679.0 | Apache-2.0 -Apache License +** @aws-sdk/signature-v4-multi-region@3.716.0 - https://www.npmjs.com/package/@aws-sdk/signature-v4-multi-region/v/3.716.0 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -15633,7 +15427,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15647,6 +15441,7 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- ** @aws-sdk/token-providers@3.699.0 - https://www.npmjs.com/package/@aws-sdk/token-providers/v/3.699.0 | Apache-2.0 @@ -15854,7 +15649,7 @@ Apache License ---------------- -** @aws-sdk/util-arn-parser@3.679.0 - https://www.npmjs.com/package/@aws-sdk/util-arn-parser/v/3.679.0 | Apache-2.0 +** @aws-sdk/token-providers@3.714.0 - https://www.npmjs.com/package/@aws-sdk/token-providers/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -16264,7 +16059,7 @@ Apache License ---------------- -** @aws-sdk/util-endpoints@3.679.0 - https://www.npmjs.com/package/@aws-sdk/util-endpoints/v/3.679.0 | Apache-2.0 +** @aws-sdk/util-endpoints@3.696.0 - https://www.npmjs.com/package/@aws-sdk/util-endpoints/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -16469,7 +16264,7 @@ Apache License ---------------- -** @aws-sdk/util-endpoints@3.696.0 - https://www.npmjs.com/package/@aws-sdk/util-endpoints/v/3.696.0 | Apache-2.0 +** @aws-sdk/util-endpoints@3.714.0 - https://www.npmjs.com/package/@aws-sdk/util-endpoints/v/3.714.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -16879,7 +16674,7 @@ Apache License ---------------- -** @aws-sdk/util-user-agent-node@3.682.0 - https://www.npmjs.com/package/@aws-sdk/util-user-agent-node/v/3.682.0 | Apache-2.0 +** @aws-sdk/util-user-agent-node@3.696.0 - https://www.npmjs.com/package/@aws-sdk/util-user-agent-node/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -17085,7 +16880,7 @@ Apache License ---------------- -** @aws-sdk/util-user-agent-node@3.696.0 - https://www.npmjs.com/package/@aws-sdk/util-user-agent-node/v/3.696.0 | Apache-2.0 +** @aws-sdk/util-user-agent-node@3.716.0 - https://www.npmjs.com/package/@aws-sdk/util-user-agent-node/v/3.716.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -17291,7 +17086,7 @@ Apache License ---------------- -** @aws-sdk/xml-builder@3.679.0 - https://www.npmjs.com/package/@aws-sdk/xml-builder/v/3.679.0 | Apache-2.0 +** @aws-sdk/xml-builder@3.696.0 - https://www.npmjs.com/package/@aws-sdk/xml-builder/v/3.696.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -17496,7 +17291,7 @@ Apache License ---------------- -** @aws-sdk/xml-builder@3.696.0 - https://www.npmjs.com/package/@aws-sdk/xml-builder/v/3.696.0 | Apache-2.0 +** @aws-sdk/xml-builder@3.709.0 - https://www.npmjs.com/package/@aws-sdk/xml-builder/v/3.709.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -17915,7 +17710,7 @@ Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. ---------------- -** @smithy/abort-controller@3.1.6 - https://www.npmjs.com/package/@smithy/abort-controller/v/3.1.6 | Apache-2.0 +** @smithy/abort-controller@3.1.8 - https://www.npmjs.com/package/@smithy/abort-controller/v/3.1.8 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -18120,7 +17915,7 @@ Apache License ---------------- -** @smithy/abort-controller@3.1.8 - https://www.npmjs.com/package/@smithy/abort-controller/v/3.1.8 | Apache-2.0 +** @smithy/abort-controller@3.1.9 - https://www.npmjs.com/package/@smithy/abort-controller/v/3.1.9 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -18325,7 +18120,7 @@ Apache License ---------------- -** @smithy/config-resolver@3.0.10 - https://www.npmjs.com/package/@smithy/config-resolver/v/3.0.10 | Apache-2.0 +** @smithy/config-resolver@3.0.12 - https://www.npmjs.com/package/@smithy/config-resolver/v/3.0.12 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -18530,7 +18325,7 @@ Apache License ---------------- -** @smithy/config-resolver@3.0.12 - https://www.npmjs.com/package/@smithy/config-resolver/v/3.0.12 | Apache-2.0 +** @smithy/config-resolver@3.0.13 - https://www.npmjs.com/package/@smithy/config-resolver/v/3.0.13 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -18735,7 +18530,7 @@ Apache License ---------------- -** @smithy/core@2.5.1 - https://www.npmjs.com/package/@smithy/core/v/2.5.1 | Apache-2.0 +** @smithy/core@2.5.3 - https://www.npmjs.com/package/@smithy/core/v/2.5.3 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -18941,7 +18736,7 @@ Apache License ---------------- -** @smithy/core@2.5.3 - https://www.npmjs.com/package/@smithy/core/v/2.5.3 | Apache-2.0 +** @smithy/core@2.5.6 - https://www.npmjs.com/package/@smithy/core/v/2.5.6 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -19147,7 +18942,7 @@ Apache License ---------------- -** @smithy/credential-provider-imds@3.2.5 - https://www.npmjs.com/package/@smithy/credential-provider-imds/v/3.2.5 | Apache-2.0 +** @smithy/credential-provider-imds@3.2.7 - https://www.npmjs.com/package/@smithy/credential-provider-imds/v/3.2.7 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -19352,7 +19147,7 @@ Apache License ---------------- -** @smithy/credential-provider-imds@3.2.7 - https://www.npmjs.com/package/@smithy/credential-provider-imds/v/3.2.7 | Apache-2.0 +** @smithy/credential-provider-imds@3.2.8 - https://www.npmjs.com/package/@smithy/credential-provider-imds/v/3.2.8 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -19557,7 +19352,7 @@ Apache License ---------------- -** @smithy/eventstream-codec@3.1.7 - https://www.npmjs.com/package/@smithy/eventstream-codec/v/3.1.7 | Apache-2.0 +** @smithy/eventstream-codec@3.1.10 - https://www.npmjs.com/package/@smithy/eventstream-codec/v/3.1.10 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -20175,7 +19970,7 @@ Apache License ---------------- -** @smithy/eventstream-serde-config-resolver@3.0.8 - https://www.npmjs.com/package/@smithy/eventstream-serde-config-resolver/v/3.0.8 | Apache-2.0 +** @smithy/eventstream-serde-config-resolver@3.0.11 - https://www.npmjs.com/package/@smithy/eventstream-serde-config-resolver/v/3.0.11 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -20381,7 +20176,7 @@ Apache License ---------------- -** @smithy/eventstream-serde-node@3.0.10 - https://www.npmjs.com/package/@smithy/eventstream-serde-node/v/3.0.10 | Apache-2.0 +** @smithy/eventstream-serde-node@3.0.12 - https://www.npmjs.com/package/@smithy/eventstream-serde-node/v/3.0.12 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -20587,7 +20382,7 @@ Apache License ---------------- -** @smithy/eventstream-serde-node@3.0.12 - https://www.npmjs.com/package/@smithy/eventstream-serde-node/v/3.0.12 | Apache-2.0 +** @smithy/eventstream-serde-node@3.0.13 - https://www.npmjs.com/package/@smithy/eventstream-serde-node/v/3.0.13 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -20793,7 +20588,7 @@ Apache License ---------------- -** @smithy/eventstream-serde-universal@3.0.10 - https://www.npmjs.com/package/@smithy/eventstream-serde-universal/v/3.0.10 | Apache-2.0 +** @smithy/eventstream-serde-universal@3.0.12 - https://www.npmjs.com/package/@smithy/eventstream-serde-universal/v/3.0.12 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -20999,7 +20794,7 @@ Apache License ---------------- -** @smithy/eventstream-serde-universal@3.0.12 - https://www.npmjs.com/package/@smithy/eventstream-serde-universal/v/3.0.12 | Apache-2.0 +** @smithy/eventstream-serde-universal@3.0.13 - https://www.npmjs.com/package/@smithy/eventstream-serde-universal/v/3.0.13 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -21205,7 +21000,7 @@ Apache License ---------------- -** @smithy/fetch-http-handler@4.0.0 - https://www.npmjs.com/package/@smithy/fetch-http-handler/v/4.0.0 | Apache-2.0 +** @smithy/fetch-http-handler@4.1.1 - https://www.npmjs.com/package/@smithy/fetch-http-handler/v/4.1.1 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -21410,7 +21205,7 @@ Apache License ---------------- -** @smithy/fetch-http-handler@4.1.1 - https://www.npmjs.com/package/@smithy/fetch-http-handler/v/4.1.1 | Apache-2.0 +** @smithy/fetch-http-handler@4.1.2 - https://www.npmjs.com/package/@smithy/fetch-http-handler/v/4.1.2 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -21820,7 +21615,7 @@ Apache License ---------------- -** @smithy/hash-node@3.0.8 - https://www.npmjs.com/package/@smithy/hash-node/v/3.0.8 | Apache-2.0 +** @smithy/hash-node@3.0.11 - https://www.npmjs.com/package/@smithy/hash-node/v/3.0.11 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -22025,7 +21820,7 @@ Apache License ---------------- -** @smithy/hash-stream-node@3.1.7 - https://www.npmjs.com/package/@smithy/hash-stream-node/v/3.1.7 | Apache-2.0 +** @smithy/hash-stream-node@3.1.10 - https://www.npmjs.com/package/@smithy/hash-stream-node/v/3.1.10 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -22845,7 +22640,7 @@ Apache License ---------------- -** @smithy/middleware-content-length@3.0.10 - https://www.npmjs.com/package/@smithy/middleware-content-length/v/3.0.10 | Apache-2.0 +** @smithy/middleware-content-length@3.0.12 - https://www.npmjs.com/package/@smithy/middleware-content-length/v/3.0.12 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -23050,7 +22845,7 @@ Apache License ---------------- -** @smithy/middleware-content-length@3.0.12 - https://www.npmjs.com/package/@smithy/middleware-content-length/v/3.0.12 | Apache-2.0 +** @smithy/middleware-content-length@3.0.13 - https://www.npmjs.com/package/@smithy/middleware-content-length/v/3.0.13 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -23460,7 +23255,7 @@ Apache License ---------------- -** @smithy/middleware-endpoint@3.2.1 - https://www.npmjs.com/package/@smithy/middleware-endpoint/v/3.2.1 | Apache-2.0 +** @smithy/middleware-endpoint@3.2.3 - https://www.npmjs.com/package/@smithy/middleware-endpoint/v/3.2.3 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -23665,7 +23460,7 @@ Apache License ---------------- -** @smithy/middleware-endpoint@3.2.3 - https://www.npmjs.com/package/@smithy/middleware-endpoint/v/3.2.3 | Apache-2.0 +** @smithy/middleware-endpoint@3.2.7 - https://www.npmjs.com/package/@smithy/middleware-endpoint/v/3.2.7 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -23870,7 +23665,7 @@ Apache License ---------------- -** @smithy/middleware-retry@3.0.25 - https://www.npmjs.com/package/@smithy/middleware-retry/v/3.0.25 | Apache-2.0 +** @smithy/middleware-retry@3.0.27 - https://www.npmjs.com/package/@smithy/middleware-retry/v/3.0.27 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -24076,7 +23871,7 @@ Apache License ---------------- -** @smithy/middleware-retry@3.0.27 - https://www.npmjs.com/package/@smithy/middleware-retry/v/3.0.27 | Apache-2.0 +** @smithy/middleware-retry@3.0.32 - https://www.npmjs.com/package/@smithy/middleware-retry/v/3.0.32 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -24486,6 +24281,212 @@ Apache License limitations under the License. +---------------- + +** @smithy/middleware-serde@3.0.11 - https://www.npmjs.com/package/@smithy/middleware-serde/v/3.0.11 | Apache-2.0 + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + ---------------- ** @smithy/middleware-serde@3.0.8 - https://www.npmjs.com/package/@smithy/middleware-serde/v/3.0.8 | Apache-2.0 @@ -24899,7 +24900,7 @@ Apache License ---------------- -** @smithy/middleware-stack@3.0.8 - https://www.npmjs.com/package/@smithy/middleware-stack/v/3.0.8 | Apache-2.0 +** @smithy/middleware-stack@3.0.11 - https://www.npmjs.com/package/@smithy/middleware-stack/v/3.0.11 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -25309,7 +25310,7 @@ Apache License ---------------- -** @smithy/node-config-provider@3.1.9 - https://www.npmjs.com/package/@smithy/node-config-provider/v/3.1.9 | Apache-2.0 +** @smithy/node-config-provider@3.1.12 - https://www.npmjs.com/package/@smithy/node-config-provider/v/3.1.12 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -25514,7 +25515,7 @@ Apache License ---------------- -** @smithy/node-http-handler@3.2.5 - https://www.npmjs.com/package/@smithy/node-http-handler/v/3.2.5 | Apache-2.0 +** @smithy/node-config-provider@3.1.9 - https://www.npmjs.com/package/@smithy/node-config-provider/v/3.1.9 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -25703,7 +25704,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25924,7 +25925,7 @@ Apache License ---------------- -** @smithy/property-provider@3.1.10 - https://www.npmjs.com/package/@smithy/property-provider/v/3.1.10 | Apache-2.0 +** @smithy/node-http-handler@3.3.3 - https://www.npmjs.com/package/@smithy/node-http-handler/v/3.3.3 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -26129,7 +26130,7 @@ Apache License ---------------- -** @smithy/property-provider@3.1.8 - https://www.npmjs.com/package/@smithy/property-provider/v/3.1.8 | Apache-2.0 +** @smithy/property-provider@3.1.10 - https://www.npmjs.com/package/@smithy/property-provider/v/3.1.10 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -26334,8 +26335,8 @@ Apache License ---------------- -** @smithy/protocol-http@4.1.5 - https://www.npmjs.com/package/@smithy/protocol-http/v/4.1.5 | Apache-2.0 - Apache License +** @smithy/property-provider@3.1.11 - https://www.npmjs.com/package/@smithy/property-provider/v/3.1.11 | Apache-2.0 +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -26523,7 +26524,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26537,6 +26538,210 @@ Apache License See the License for the specific language governing permissions and limitations under the License. +---------------- + +** @smithy/property-provider@3.1.8 - https://www.npmjs.com/package/@smithy/property-provider/v/3.1.8 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. ---------------- @@ -26746,7 +26951,7 @@ Apache License ---------------- -** @smithy/querystring-builder@3.0.10 - https://www.npmjs.com/package/@smithy/querystring-builder/v/3.0.10 | Apache-2.0 +** @smithy/protocol-http@4.1.8 - https://www.npmjs.com/package/@smithy/protocol-http/v/4.1.8 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -26935,7 +27140,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26952,7 +27157,7 @@ Apache License ---------------- -** @smithy/querystring-builder@3.0.8 - https://www.npmjs.com/package/@smithy/querystring-builder/v/3.0.8 | Apache-2.0 +** @smithy/querystring-builder@3.0.10 - https://www.npmjs.com/package/@smithy/querystring-builder/v/3.0.10 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -27158,7 +27363,7 @@ Apache License ---------------- -** @smithy/querystring-parser@3.0.10 - https://www.npmjs.com/package/@smithy/querystring-parser/v/3.0.10 | Apache-2.0 +** @smithy/querystring-builder@3.0.11 - https://www.npmjs.com/package/@smithy/querystring-builder/v/3.0.11 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -27364,7 +27569,7 @@ Apache License ---------------- -** @smithy/querystring-parser@3.0.8 - https://www.npmjs.com/package/@smithy/querystring-parser/v/3.0.8 | Apache-2.0 +** @smithy/querystring-parser@3.0.10 - https://www.npmjs.com/package/@smithy/querystring-parser/v/3.0.10 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -27570,7 +27775,7 @@ Apache License ---------------- -** @smithy/service-error-classification@3.0.10 - https://www.npmjs.com/package/@smithy/service-error-classification/v/3.0.10 | Apache-2.0 +** @smithy/querystring-parser@3.0.11 - https://www.npmjs.com/package/@smithy/querystring-parser/v/3.0.11 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -27776,7 +27981,7 @@ Apache License ---------------- -** @smithy/service-error-classification@3.0.8 - https://www.npmjs.com/package/@smithy/service-error-classification/v/3.0.8 | Apache-2.0 +** @smithy/querystring-parser@3.0.8 - https://www.npmjs.com/package/@smithy/querystring-parser/v/3.0.8 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -27982,8 +28187,8 @@ Apache License ---------------- -** @smithy/shared-ini-file-loader@3.1.11 - https://www.npmjs.com/package/@smithy/shared-ini-file-loader/v/3.1.11 | Apache-2.0 -Apache License +** @smithy/service-error-classification@3.0.10 - https://www.npmjs.com/package/@smithy/service-error-classification/v/3.0.10 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -28185,10 +28390,11 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/shared-ini-file-loader@3.1.8 - https://www.npmjs.com/package/@smithy/shared-ini-file-loader/v/3.1.8 | Apache-2.0 -Apache License +** @smithy/service-error-classification@3.0.11 - https://www.npmjs.com/package/@smithy/service-error-classification/v/3.0.11 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -28390,10 +28596,11 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/shared-ini-file-loader@3.1.9 - https://www.npmjs.com/package/@smithy/shared-ini-file-loader/v/3.1.9 | Apache-2.0 -Apache License +** @smithy/service-error-classification@3.0.8 - https://www.npmjs.com/package/@smithy/service-error-classification/v/3.0.8 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -28595,9 +28802,10 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/signature-v4@4.2.1 - https://www.npmjs.com/package/@smithy/signature-v4/v/4.2.1 | Apache-2.0 +** @smithy/shared-ini-file-loader@3.1.11 - https://www.npmjs.com/package/@smithy/shared-ini-file-loader/v/3.1.11 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -28802,7 +29010,7 @@ Apache License ---------------- -** @smithy/signature-v4@4.2.3 - https://www.npmjs.com/package/@smithy/signature-v4/v/4.2.3 | Apache-2.0 +** @smithy/shared-ini-file-loader@3.1.12 - https://www.npmjs.com/package/@smithy/shared-ini-file-loader/v/3.1.12 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -29007,8 +29215,8 @@ Apache License ---------------- -** @smithy/smithy-client@3.4.2 - https://www.npmjs.com/package/@smithy/smithy-client/v/3.4.2 | Apache-2.0 - Apache License +** @smithy/shared-ini-file-loader@3.1.8 - https://www.npmjs.com/package/@smithy/shared-ini-file-loader/v/3.1.8 | Apache-2.0 +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -29196,7 +29404,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29210,11 +29418,10 @@ Apache License See the License for the specific language governing permissions and limitations under the License. - ---------------- -** @smithy/smithy-client@3.4.4 - https://www.npmjs.com/package/@smithy/smithy-client/v/3.4.4 | Apache-2.0 - Apache License +** @smithy/shared-ini-file-loader@3.1.9 - https://www.npmjs.com/package/@smithy/shared-ini-file-loader/v/3.1.9 | Apache-2.0 +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -29402,7 +29609,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29416,11 +29623,10 @@ Apache License See the License for the specific language governing permissions and limitations under the License. - ---------------- -** @smithy/types@3.5.0 - https://www.npmjs.com/package/@smithy/types/v/3.5.0 | Apache-2.0 - Apache License +** @smithy/signature-v4@4.2.3 - https://www.npmjs.com/package/@smithy/signature-v4/v/4.2.3 | Apache-2.0 +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -29608,7 +29814,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29622,11 +29828,10 @@ Apache License See the License for the specific language governing permissions and limitations under the License. - ---------------- -** @smithy/url-parser@3.0.10 - https://www.npmjs.com/package/@smithy/url-parser/v/3.0.10 | Apache-2.0 - Apache License +** @smithy/signature-v4@4.2.4 - https://www.npmjs.com/package/@smithy/signature-v4/v/4.2.4 | Apache-2.0 +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -29828,10 +30033,9 @@ Apache License See the License for the specific language governing permissions and limitations under the License. - ---------------- -** @smithy/url-parser@3.0.8 - https://www.npmjs.com/package/@smithy/url-parser/v/3.0.8 | Apache-2.0 +** @smithy/smithy-client@3.4.4 - https://www.npmjs.com/package/@smithy/smithy-client/v/3.4.4 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -30020,7 +30224,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30037,8 +30241,8 @@ Apache License ---------------- -** @smithy/util-base64@3.0.0 - https://www.npmjs.com/package/@smithy/util-base64/v/3.0.0 | Apache-2.0 -Apache License +** @smithy/smithy-client@3.5.2 - https://www.npmjs.com/package/@smithy/smithy-client/v/3.5.2 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -30226,7 +30430,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30240,10 +30444,11 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/util-body-length-node@3.0.0 - https://www.npmjs.com/package/@smithy/util-body-length-node/v/3.0.0 | Apache-2.0 -Apache License +** @smithy/types@3.5.0 - https://www.npmjs.com/package/@smithy/types/v/3.5.0 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -30431,7 +30636,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30445,10 +30650,11 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/util-buffer-from@2.2.0 - https://www.npmjs.com/package/@smithy/util-buffer-from/v/2.2.0 | Apache-2.0 -Apache License +** @smithy/url-parser@3.0.10 - https://www.npmjs.com/package/@smithy/url-parser/v/3.0.10 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -30650,10 +30856,11 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/util-buffer-from@3.0.0 - https://www.npmjs.com/package/@smithy/util-buffer-from/v/3.0.0 | Apache-2.0 -Apache License +** @smithy/url-parser@3.0.11 - https://www.npmjs.com/package/@smithy/url-parser/v/3.0.11 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -30855,214 +31062,10 @@ Apache License See the License for the specific language governing permissions and limitations under the License. ----------------- - -** @smithy/util-config-provider@3.0.0 - https://www.npmjs.com/package/@smithy/util-config-provider/v/3.0.0 | Apache-2.0 -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---------------- -** @smithy/util-defaults-mode-node@3.0.25 - https://www.npmjs.com/package/@smithy/util-defaults-mode-node/v/3.0.25 | Apache-2.0 +** @smithy/url-parser@3.0.8 - https://www.npmjs.com/package/@smithy/url-parser/v/3.0.8 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -31268,8 +31271,8 @@ Apache License ---------------- -** @smithy/util-defaults-mode-node@3.0.27 - https://www.npmjs.com/package/@smithy/util-defaults-mode-node/v/3.0.27 | Apache-2.0 - Apache License +** @smithy/util-base64@3.0.0 - https://www.npmjs.com/package/@smithy/util-base64/v/3.0.0 | Apache-2.0 +Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -31471,10 +31474,9 @@ Apache License See the License for the specific language governing permissions and limitations under the License. - ---------------- -** @smithy/util-endpoints@2.1.4 - https://www.npmjs.com/package/@smithy/util-endpoints/v/2.1.4 | Apache-2.0 +** @smithy/util-body-length-node@3.0.0 - https://www.npmjs.com/package/@smithy/util-body-length-node/v/3.0.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -31663,7 +31665,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31679,7 +31681,7 @@ Apache License ---------------- -** @smithy/util-endpoints@2.1.6 - https://www.npmjs.com/package/@smithy/util-endpoints/v/2.1.6 | Apache-2.0 +** @smithy/util-buffer-from@2.2.0 - https://www.npmjs.com/package/@smithy/util-buffer-from/v/2.2.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -31868,7 +31870,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31884,7 +31886,7 @@ Apache License ---------------- -** @smithy/util-hex-encoding@3.0.0 - https://www.npmjs.com/package/@smithy/util-hex-encoding/v/3.0.0 | Apache-2.0 +** @smithy/util-buffer-from@3.0.0 - https://www.npmjs.com/package/@smithy/util-buffer-from/v/3.0.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -32089,7 +32091,7 @@ Apache License ---------------- -** @smithy/util-middleware@3.0.10 - https://www.npmjs.com/package/@smithy/util-middleware/v/3.0.10 | Apache-2.0 +** @smithy/util-config-provider@3.0.0 - https://www.npmjs.com/package/@smithy/util-config-provider/v/3.0.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -32278,7 +32280,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -32294,8 +32296,8 @@ Apache License ---------------- -** @smithy/util-middleware@3.0.8 - https://www.npmjs.com/package/@smithy/util-middleware/v/3.0.8 | Apache-2.0 -Apache License +** @smithy/util-defaults-mode-node@3.0.27 - https://www.npmjs.com/package/@smithy/util-defaults-mode-node/v/3.0.27 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -32483,7 +32485,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -32497,10 +32499,11 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/util-retry@3.0.10 - https://www.npmjs.com/package/@smithy/util-retry/v/3.0.10 | Apache-2.0 -Apache License +** @smithy/util-defaults-mode-node@3.0.32 - https://www.npmjs.com/package/@smithy/util-defaults-mode-node/v/3.0.32 | Apache-2.0 + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -32688,7 +32691,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -32702,9 +32705,10 @@ Apache License See the License for the specific language governing permissions and limitations under the License. + ---------------- -** @smithy/util-retry@3.0.7 - https://www.npmjs.com/package/@smithy/util-retry/v/3.0.7 | Apache-2.0 +** @smithy/util-endpoints@2.1.6 - https://www.npmjs.com/package/@smithy/util-endpoints/v/2.1.6 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -32909,7 +32913,7 @@ Apache License ---------------- -** @smithy/util-retry@3.0.8 - https://www.npmjs.com/package/@smithy/util-retry/v/3.0.8 | Apache-2.0 +** @smithy/util-endpoints@2.1.7 - https://www.npmjs.com/package/@smithy/util-endpoints/v/2.1.7 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -33114,7 +33118,1032 @@ Apache License ---------------- -** @smithy/util-stream@3.2.1 - https://www.npmjs.com/package/@smithy/util-stream/v/3.2.1 | Apache-2.0 +** @smithy/util-hex-encoding@3.0.0 - https://www.npmjs.com/package/@smithy/util-hex-encoding/v/3.0.0 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------- + +** @smithy/util-middleware@3.0.10 - https://www.npmjs.com/package/@smithy/util-middleware/v/3.0.10 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------- + +** @smithy/util-middleware@3.0.11 - https://www.npmjs.com/package/@smithy/util-middleware/v/3.0.11 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------- + +** @smithy/util-middleware@3.0.8 - https://www.npmjs.com/package/@smithy/util-middleware/v/3.0.8 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------- + +** @smithy/util-retry@3.0.10 - https://www.npmjs.com/package/@smithy/util-retry/v/3.0.10 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------- + +** @smithy/util-retry@3.0.11 - https://www.npmjs.com/package/@smithy/util-retry/v/3.0.11 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -33303,7 +34332,212 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------- + +** @smithy/util-retry@3.0.7 - https://www.npmjs.com/package/@smithy/util-retry/v/3.0.7 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -33524,6 +34758,211 @@ Apache License ---------------- +** @smithy/util-stream@3.3.3 - https://www.npmjs.com/package/@smithy/util-stream/v/3.3.3 | Apache-2.0 +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------- + ** @smithy/util-uri-escape@3.0.0 - https://www.npmjs.com/package/@smithy/util-uri-escape/v/3.0.0 | Apache-2.0 Apache License Version 2.0, January 2004 @@ -34139,7 +35578,7 @@ Apache License ---------------- -** @smithy/util-waiter@3.1.7 - https://www.npmjs.com/package/@smithy/util-waiter/v/3.1.7 | Apache-2.0 +** @smithy/util-waiter@3.1.9 - https://www.npmjs.com/package/@smithy/util-waiter/v/3.1.9 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -34344,7 +35783,7 @@ Apache License ---------------- -** @smithy/util-waiter@3.1.9 - https://www.npmjs.com/package/@smithy/util-waiter/v/3.1.9 | Apache-2.0 +** @smithy/util-waiter@3.2.0 - https://www.npmjs.com/package/@smithy/util-waiter/v/3.2.0 | Apache-2.0 Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/packages/@aws-cdk/cli-lib-alpha/build-tools/copy-cli-resources.sh b/packages/@aws-cdk/cli-lib-alpha/build-tools/copy-cli-resources.sh index d04e7fe939da4..aef85d7324e4e 100755 --- a/packages/@aws-cdk/cli-lib-alpha/build-tools/copy-cli-resources.sh +++ b/packages/@aws-cdk/cli-lib-alpha/build-tools/copy-cli-resources.sh @@ -3,10 +3,8 @@ set -euo pipefail aws_cdk="$1" -# Copy all resources that aws_cdk/generate.sh produced, and some othersCall the generator for the -cp $aws_cdk/build-info.json ./ -cp -R $aws_cdk/lib/init-templates ./lib/ - -mkdir -p ./lib/api/bootstrap/ && cp $aws_cdk/lib/api/bootstrap/bootstrap-template.yaml ./lib/api/bootstrap/ +# Copy the various resource files from the CLI +cp -R $aws_cdk/resources ./resources cp $aws_cdk/lib/index_bg.wasm ./lib/ +cp $aws_cdk/build-info.json ./ cp $aws_cdk/db.json.gz ./ diff --git a/packages/@aws-cdk/cli-lib-alpha/lib/cli.ts b/packages/@aws-cdk/cli-lib-alpha/lib/cli.ts index 1b96fa146ec4c..e06f6aeb4e7b2 100644 --- a/packages/@aws-cdk/cli-lib-alpha/lib/cli.ts +++ b/packages/@aws-cdk/cli-lib-alpha/lib/cli.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import { exec as runCli } from 'aws-cdk/lib'; // eslint-disable-next-line import/no-extraneous-dependencies -import { createAssembly, prepareContext, prepareDefaultEnvironment } from 'aws-cdk/lib/api/cxapp/exec'; +import { createAssembly, prepareContext, prepareDefaultEnvironment } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/exec'; import { SharedOptions, DeployOptions, DestroyOptions, BootstrapOptions, SynthOptions, ListOptions, StackActivityProgress, HotswapMode } from './commands'; /** diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json index a72dc5f7c736e..f0de52cf90167 100644 --- a/packages/@aws-cdk/cli-lib-alpha/package.json +++ b/packages/@aws-cdk/cli-lib-alpha/package.json @@ -84,6 +84,7 @@ "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/tmp-toolkit-helpers": "0.0.0", "aws-cdk-lib": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.14", diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/.eslintrc.js b/packages/@aws-cdk/tmp-toolkit-helpers/.eslintrc.js new file mode 100644 index 0000000000000..edea2a8c01665 --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/.eslintrc.js @@ -0,0 +1,4 @@ +const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc'); +baseConfig.parserOptions.project = __dirname + '/tsconfig.json'; +baseConfig.ignorePatterns.push('resources/init-templates/**/typescript/**/*.ts'); +module.exports = baseConfig; diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/.gitignore new file mode 100644 index 0000000000000..ea294d133e5c1 --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/.gitignore @@ -0,0 +1,33 @@ +*.js +*.js.map +*.d.ts +*.d.ts.map +*.gz +node_modules +dist +.jsii + +.LAST_BUILD +.nyc_output +coverage +nyc.config.js +.LAST_PACKAGE +*.snk +junit.xml + +assets.json +npm-shrinkwrap.json +!.eslintrc.js +!jest.config.js + +# Wasm +lib/**/*.wasm + +# Resources +resources/build-info.json +!resources/init-templates/**/javascript/**/* +resources/init-templates/.init-version.json +resources/init-templates/.recommended-feature-flags.json +resources/init-templates/**/*.hook.js +resources/init-templates/**/*.hook.d.ts +resources/init-templates/.*.json diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/.npmignore b/packages/@aws-cdk/tmp-toolkit-helpers/.npmignore new file mode 100644 index 0000000000000..7a6f445dbbe78 --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/.npmignore @@ -0,0 +1,27 @@ +# Ignore artifacts +dist +.LAST_PACKAGE +.LAST_BUILD +*.snk +*.ts +!*.d.ts +!*.js +coverage +.nyc_output +*.tgz + +# Ignore configs and test files +.eslintrc.js +tsconfig.json +*.tsbuildinfo +junit.xml + +# Include .jsii +!.jsii + +# exclude cdk artifacts +**/cdk.out +**/*.snapshot + +# include all resources +resource/** diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/LICENSE b/packages/@aws-cdk/tmp-toolkit-helpers/LICENSE new file mode 100644 index 0000000000000..5ccf0c6780bab --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/NOTICE b/packages/@aws-cdk/tmp-toolkit-helpers/NOTICE new file mode 100644 index 0000000000000..62c4308b020b7 --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/NOTICE @@ -0,0 +1,16 @@ +AWS Cloud Development Kit (AWS CDK) +Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Third party attributions of this package can be found in the THIRD_PARTY_LICENSES file diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/README.md new file mode 100644 index 0000000000000..5f7d5ea01e20c --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/README.md @@ -0,0 +1,22 @@ +# AWS CDK Programmatic Toolkit Helpers + + +--- + +![@aws-cdk/tmp-toolkit-helpers: Experimental](https://img.shields.io/badge/@aws--cdk/toolkit-experimental-important.svg?style=for-the-badge) + +> The APIs in this module are experimental and under active development. +> They are subject to non-backward compatible changes or removal in any future version. These are +> not subject to the [Semantic Versioning](https://semver.org/) model and breaking changes will be +> announced in the release notes. This means that while you may use them, you may need to update +> your source code when upgrading to a newer version of this package. + +--- + + + +A temporary private package to hold CLI and Toolkit library files. +The package is used by the Programmatic Toolkit package `@aws-cdk/toolkit` and the AWS CDK CLI `aws-cdk`. + +**Do not rely on this package!** +It's contents will gradually be moved over to `@aws-cdk/toolkit` and eventually the package will seize to exist. diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/generate.sh b/packages/@aws-cdk/tmp-toolkit-helpers/generate.sh new file mode 100755 index 0000000000000..efc7fea40f342 --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/generate.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -euo pipefail + +# Copy the current 'aws-cdk-lib' version out from the monorepo. +cdk_version=$(node -p 'require("aws-cdk-lib/package.json").version') +constructs_range=$(node -p 'require("aws-cdk-lib/package.json").peerDependencies.constructs') +echo '{"aws-cdk-lib": "'"$cdk_version"'", "constructs": "'"$constructs_range"'"}' > resources/init-templates/.init-version.json + +# Copy the recommended-feature-flags.json file out from aws-cdk-lib. +path=$(node -p 'require.resolve("aws-cdk-lib/recommended-feature-flags.json")') +cp $path resources/init-templates/.recommended-feature-flags.json + +# Copy the service-spec database out from @aws-cdk/aws-service-spec. +path=$(node -p 'require.resolve("@aws-cdk/aws-service-spec/db.json.gz")') +cp $path ./ diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/jest.config.js b/packages/@aws-cdk/tmp-toolkit-helpers/jest.config.js new file mode 100644 index 0000000000000..69a39a35b373a --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/jest.config.js @@ -0,0 +1,9 @@ +const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config'); +module.exports = { + ...baseConfig, + coverageThreshold: { + global: { + ...baseConfig.coverageThreshold.global, + }, + }, +}; diff --git a/packages/aws-cdk/lib/assets.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/assets.ts similarity index 95% rename from packages/aws-cdk/lib/assets.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/assets.ts index e1bdd5ce4fb3c..9dc1af0510d5c 100644 --- a/packages/aws-cdk/lib/assets.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/assets.ts @@ -1,13 +1,12 @@ -// eslint-disable-next-line max-len import * as path from 'path'; import * as cxschema from '@aws-cdk/cloud-assembly-schema'; import * as cxapi from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; -import { EnvironmentResources } from './api/environment-resources'; -import { ToolkitInfo } from './api/toolkit-info'; +import { EnvironmentResources } from './environment-resources'; import { debug } from './logging'; -import { ToolkitError } from './toolkit/error'; -import { AssetManifestBuilder } from './util/asset-manifest-builder'; +import { ToolkitInfo } from './toolkit-info'; +import { ToolkitError } from '../toolkit/error'; +import { AssetManifestBuilder } from '../util/asset-manifest-builder'; /** * Take the metadata assets from the given stack and add them to the given asset manifest diff --git a/packages/aws-cdk/lib/api/aws-auth/account-cache.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/account-cache.ts similarity index 98% rename from packages/aws-cdk/lib/api/aws-auth/account-cache.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/account-cache.ts index aea859646751f..309b0733dd894 100644 --- a/packages/aws-cdk/lib/api/aws-auth/account-cache.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/account-cache.ts @@ -1,8 +1,8 @@ import * as path from 'path'; import * as fs from 'fs-extra'; import { Account } from './sdk-provider'; -import { debug } from '../../logging'; import { cdkCacheDir } from '../../util/directories'; +import { debug } from '../logging'; /** * Disk cache which maps access key IDs to account IDs. diff --git a/packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/awscli-compatible.ts similarity index 99% rename from packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/awscli-compatible.ts index fd6f255d0523d..a6959020e7adf 100644 --- a/packages/aws-cdk/lib/api/aws-auth/awscli-compatible.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/awscli-compatible.ts @@ -8,8 +8,8 @@ import { ProxyAgent } from 'proxy-agent'; import { makeCachingProvider } from './provider-caching'; import type { SdkHttpOptions } from './sdk-provider'; import { readIfPossible } from './util'; -import { debug } from '../../logging'; import { AuthenticationError } from '../../toolkit/error'; +import { debug } from '../logging'; const DEFAULT_CONNECTION_TIMEOUT = 10000; const DEFAULT_TIMEOUT = 300000; diff --git a/packages/aws-cdk/lib/api/aws-auth/cached.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/cached.ts similarity index 100% rename from packages/aws-cdk/lib/api/aws-auth/cached.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/cached.ts diff --git a/packages/aws-cdk/lib/api/aws-auth/credential-plugins.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/credential-plugins.ts similarity index 99% rename from packages/aws-cdk/lib/api/aws-auth/credential-plugins.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/credential-plugins.ts index 84303ffb4c5ca..28aa40d60afb5 100644 --- a/packages/aws-cdk/lib/api/aws-auth/credential-plugins.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/credential-plugins.ts @@ -2,9 +2,9 @@ import { inspect, format } from 'util'; import type { CredentialProviderSource, ForReading, ForWriting, PluginProviderResult, SDKv2CompatibleCredentials, SDKv3CompatibleCredentialProvider, SDKv3CompatibleCredentials } from '@aws-cdk/cli-plugin-contract'; import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@smithy/types'; import { credentialsAboutToExpire, makeCachingProvider } from './provider-caching'; -import { debug, warning, info } from '../../logging'; import { AuthenticationError } from '../../toolkit/error'; import { formatErrorMessage } from '../../util/error'; +import { debug, warning, info } from '../logging'; import { Mode } from '../plugin/mode'; import { PluginHost } from '../plugin/plugin'; diff --git a/packages/aws-cdk/lib/api/aws-auth/index.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/index.ts similarity index 100% rename from packages/aws-cdk/lib/api/aws-auth/index.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/index.ts diff --git a/packages/aws-cdk/lib/api/aws-auth/provider-caching.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/provider-caching.ts similarity index 100% rename from packages/aws-cdk/lib/api/aws-auth/provider-caching.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/provider-caching.ts diff --git a/packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-logger.ts similarity index 98% rename from packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-logger.ts index ce1b981bab0d1..c13b025392ca8 100644 --- a/packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-logger.ts @@ -1,6 +1,6 @@ import { inspect } from 'util'; import { Logger } from '@smithy/types'; -import { trace } from '../../logging'; +import { trace } from '../logging'; export class SdkToCliLogger implements Logger { public trace(..._content: any[]) { diff --git a/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-provider.ts similarity index 99% rename from packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-provider.ts index 551908e5b3e71..e4433fe640d2d 100644 --- a/packages/aws-cdk/lib/api/aws-auth/sdk-provider.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-provider.ts @@ -10,10 +10,10 @@ import { cached } from './cached'; import { CredentialPlugins } from './credential-plugins'; import { makeCachingProvider } from './provider-caching'; import { SDK } from './sdk'; -import { debug, warning } from '../../logging'; import { AuthenticationError } from '../../toolkit/error'; import { formatErrorMessage } from '../../util/error'; import { traceMethods } from '../../util/tracing'; +import { debug, warning } from '../logging'; import { Mode } from '../plugin/mode'; export type AssumeRoleAdditionalOptions = Partial>; diff --git a/packages/aws-cdk/lib/api/aws-auth/sdk.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk.ts similarity index 99% rename from packages/aws-cdk/lib/api/aws-auth/sdk.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk.ts index 27c98d4cdbb51..663e1c4f8890d 100644 --- a/packages/aws-cdk/lib/api/aws-auth/sdk.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk.ts @@ -318,10 +318,10 @@ import { AccountAccessKeyCache } from './account-cache'; import { cachedAsync } from './cached'; import { Account } from './sdk-provider'; import { defaultCliUserAgent } from './user-agent'; -import { debug } from '../../logging'; import { AuthenticationError } from '../../toolkit/error'; import { formatErrorMessage } from '../../util/error'; import { traceMethods } from '../../util/tracing'; +import { debug } from '../logging'; export interface S3ClientOptions { /** diff --git a/packages/aws-cdk/lib/api/aws-auth/user-agent.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/user-agent.ts similarity index 100% rename from packages/aws-cdk/lib/api/aws-auth/user-agent.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/user-agent.ts diff --git a/packages/aws-cdk/lib/api/aws-auth/util.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/util.ts similarity index 91% rename from packages/aws-cdk/lib/api/aws-auth/util.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/util.ts index b5c6f57b7032b..c94fd4790c876 100644 --- a/packages/aws-cdk/lib/api/aws-auth/util.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/util.ts @@ -1,5 +1,5 @@ import * as fs from 'fs-extra'; -import { debug } from '../../logging'; +import { debug } from '../logging'; /** * Read a file if it exists, or return undefined diff --git a/packages/aws-cdk/lib/api/bootstrap/bootstrap-environment.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/bootstrap-environment.ts similarity index 97% rename from packages/aws-cdk/lib/api/bootstrap/bootstrap-environment.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/bootstrap-environment.ts index ad0acf18bf477..10b9e5bc22fc8 100644 --- a/packages/aws-cdk/lib/api/bootstrap/bootstrap-environment.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/bootstrap-environment.ts @@ -1,15 +1,14 @@ import { info } from 'console'; -import * as path from 'path'; import * as cxapi from '@aws-cdk/cx-api'; import type { BootstrapEnvironmentOptions, BootstrappingParameters } from './bootstrap-props'; import { BootstrapStack, bootstrapVersionFromTemplate } from './deploy-bootstrap'; import { legacyBootstrapTemplate } from './legacy-template'; -import { warning } from '../../logging'; -import { loadStructuredFile, serializeStructure } from '../../serialize'; import { ToolkitError } from '../../toolkit/error'; -import { rootDir } from '../../util/directories'; +import { resourcePath } from '../../util/directories'; +import { loadStructuredFile, serializeStructure } from '../../util/serialize'; import type { SDK, SdkProvider } from '../aws-auth'; import type { SuccessfulDeployStackResult } from '../deploy-stack'; +import { warning } from '../logging'; import { Mode } from '../plugin/mode'; export type BootstrapSource = { source: 'legacy' } | { source: 'default' } | { source: 'custom'; templateFile: string }; @@ -344,7 +343,7 @@ export class Bootstrapper { case 'custom': return loadStructuredFile(this.source.templateFile); case 'default': - return loadStructuredFile(path.join(rootDir(), 'lib', 'api', 'bootstrap', 'bootstrap-template.yaml')); + return loadStructuredFile(resourcePath('bootstrap', 'bootstrap-template.yaml')); case 'legacy': return legacyBootstrapTemplate(params); } diff --git a/packages/aws-cdk/lib/api/bootstrap/bootstrap-props.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/bootstrap-props.ts similarity index 98% rename from packages/aws-cdk/lib/api/bootstrap/bootstrap-props.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/bootstrap-props.ts index 079a0322b73e5..233c19ac5d1fb 100644 --- a/packages/aws-cdk/lib/api/bootstrap/bootstrap-props.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/bootstrap-props.ts @@ -1,5 +1,5 @@ import { BootstrapSource } from './bootstrap-environment'; -import { Tag } from '../../cdk-toolkit'; +import { Tag } from '../deployments'; import { StringWithoutPlaceholders } from '../util/placeholders'; export const BUCKET_NAME_OUTPUT = 'BucketName'; diff --git a/packages/aws-cdk/lib/api/bootstrap/deploy-bootstrap.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/deploy-bootstrap.ts similarity index 99% rename from packages/aws-cdk/lib/api/bootstrap/deploy-bootstrap.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/deploy-bootstrap.ts index ad6ac4516c95c..1a089ee2e76a0 100644 --- a/packages/aws-cdk/lib/api/bootstrap/deploy-bootstrap.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/deploy-bootstrap.ts @@ -10,10 +10,10 @@ import { BootstrapEnvironmentOptions, DEFAULT_BOOTSTRAP_VARIANT, } from './bootstrap-props'; -import * as logging from '../../logging'; import type { SDK, SdkProvider } from '../aws-auth'; import { assertIsSuccessfulDeployStackResult, deployStack, SuccessfulDeployStackResult } from '../deploy-stack'; import { NoBootstrapStackEnvironmentResources } from '../environment-resources'; +import * as logging from '../logging'; import { Mode } from '../plugin/mode'; import { DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo } from '../toolkit-info'; diff --git a/packages/aws-cdk/lib/api/bootstrap/index.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/index.ts similarity index 100% rename from packages/aws-cdk/lib/api/bootstrap/index.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/index.ts diff --git a/packages/aws-cdk/lib/api/bootstrap/legacy-template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/legacy-template.ts similarity index 100% rename from packages/aws-cdk/lib/api/bootstrap/legacy-template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/legacy-template.ts diff --git a/packages/aws-cdk/lib/api/cxapp/cloud-assembly.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly.ts similarity index 99% rename from packages/aws-cdk/lib/api/cxapp/cloud-assembly.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly.ts index 4f0fa296ec123..b83cb3e54751e 100644 --- a/packages/aws-cdk/lib/api/cxapp/cloud-assembly.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly.ts @@ -2,9 +2,9 @@ import * as cxapi from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; import { minimatch } from 'minimatch'; import * as semver from 'semver'; -import { error, info, warning } from '../../logging'; import { ToolkitError } from '../../toolkit/error'; import { flatten } from '../../util'; +import { error, info, warning } from '../logging'; export enum DefaultSelection { /** diff --git a/packages/aws-cdk/lib/api/cxapp/cloud-executable.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-executable.ts similarity index 97% rename from packages/aws-cdk/lib/api/cxapp/cloud-executable.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-executable.ts index 5c0f1a2c2a289..1b2639655aa69 100644 --- a/packages/aws-cdk/lib/api/cxapp/cloud-executable.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-executable.ts @@ -1,10 +1,10 @@ import * as cxapi from '@aws-cdk/cx-api'; import { CloudAssembly } from './cloud-assembly'; import * as contextproviders from '../../context-providers'; -import { debug } from '../../logging'; -import { Configuration } from '../../settings'; import { ToolkitError } from '../../toolkit/error'; import { SdkProvider } from '../aws-auth'; +import { debug } from '../logging'; +import { Configuration } from '../settings'; /** * @returns output directory diff --git a/packages/aws-cdk/lib/api/cxapp/environments.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/environments.ts similarity index 100% rename from packages/aws-cdk/lib/api/cxapp/environments.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/environments.ts diff --git a/packages/aws-cdk/lib/api/cxapp/exec.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/exec.ts similarity index 97% rename from packages/aws-cdk/lib/api/cxapp/exec.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/exec.ts index b02ad38445a07..b4e9d5d98959f 100644 --- a/packages/aws-cdk/lib/api/cxapp/exec.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/exec.ts @@ -5,13 +5,12 @@ import * as cxschema from '@aws-cdk/cloud-assembly-schema'; import * as cxapi from '@aws-cdk/cx-api'; import * as fs from 'fs-extra'; import * as semver from 'semver'; -import { debug, warning } from '../../logging'; -import { Configuration, PROJECT_CONFIG, USER_DEFAULTS } from '../../settings'; import { ToolkitError } from '../../toolkit/error'; -import { loadTree, some } from '../../tree'; import { splitBySize } from '../../util/objects'; -import { versionNumber } from '../../version'; +import { loadTree, some } from '../../util/tree'; import { SdkProvider } from '../aws-auth'; +import { debug, warning } from '../logging'; +import { Configuration, PROJECT_CONFIG, USER_DEFAULTS } from '../settings'; import { RWLock, ILock } from '../util/rwlock'; export interface ExecProgramResult { @@ -20,7 +19,7 @@ export interface ExecProgramResult { } /** Invokes the cloud executable and returns JSON output */ -export async function execProgram(aws: SdkProvider, config: Configuration): Promise { +export async function execProgram(aws: SdkProvider, config: Configuration, cliVersionNumber: string): Promise { const env = await prepareDefaultEnvironment(aws); const context = await prepareContext(config, env); @@ -68,7 +67,7 @@ export async function execProgram(aws: SdkProvider, config: Configuration): Prom try { // Send version information env[cxapi.CLI_ASM_VERSION_ENV] = cxschema.Manifest.version(); - env[cxapi.CLI_VERSION_ENV] = versionNumber(); + env[cxapi.CLI_VERSION_ENV] = cliVersionNumber; debug('env:', env); diff --git a/packages/aws-cdk/lib/api/deploy-stack.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/deploy-stack.ts similarity index 99% rename from packages/aws-cdk/lib/api/deploy-stack.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/deploy-stack.ts index b9853737ec832..32772916d04fe 100644 --- a/packages/aws-cdk/lib/api/deploy-stack.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/deploy-stack.ts @@ -9,13 +9,13 @@ import type { } from '@aws-sdk/client-cloudformation'; import * as chalk from 'chalk'; import * as uuid from 'uuid'; +import { addMetadataAssetsToManifest } from './assets'; import type { SDK, SdkProvider, ICloudFormationClient } from './aws-auth'; import type { EnvironmentResources } from './environment-resources'; import { CfnEvaluationException } from './evaluate-cloudformation-template'; import { HotswapMode, HotswapPropertyOverrides, ICON } from './hotswap/common'; import { tryHotswapDeployment } from './hotswap-deployments'; -import { addMetadataAssetsToManifest } from '../assets'; -import { debug, info, warning } from '../logging'; +import { debug, info, warning } from './logging'; import { changeSetHasNoChanges, CloudFormationStack, @@ -27,10 +27,10 @@ import { ParameterChanges, ResourcesToImport, } from './util/cloudformation'; -import { StackActivityMonitor, type StackActivityProgress } from './util/cloudformation/stack-activity-monitor'; -import { type TemplateBodyParameter, makeBodyParameter } from './util/template-body-parameter'; import { AssetManifestBuilder } from '../util/asset-manifest-builder'; import { determineAllowCrossAccountAssetPublishing } from './util/checks'; +import { StackActivityMonitor, type StackActivityProgress } from './util/cloudformation/stack-activity-monitor'; +import { type TemplateBodyParameter, makeBodyParameter } from './util/template-body-parameter'; import { publishAssets } from '../util/asset-publishing'; import { StringWithoutPlaceholders } from './util/placeholders'; import { formatErrorMessage } from '../util/error'; diff --git a/packages/aws-cdk/lib/api/deployments.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/deployments.ts similarity index 99% rename from packages/aws-cdk/lib/api/deployments.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/deployments.ts index 32650ac7a3549..489f2e9239b69 100644 --- a/packages/aws-cdk/lib/api/deployments.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/deployments.ts @@ -5,11 +5,10 @@ import { AssetManifest, IManifestEntry } from 'cdk-assets'; import * as chalk from 'chalk'; import type { SdkProvider } from './aws-auth/sdk-provider'; import { type DeploymentMethod, deployStack, DeployStackResult, destroyStack } from './deploy-stack'; -import { type EnvironmentResources } from './environment-resources'; -import type { Tag } from '../cdk-toolkit'; -import { debug, warning } from '../logging'; import { EnvironmentAccess } from './environment-access'; +import { type EnvironmentResources } from './environment-resources'; import { HotswapMode, HotswapPropertyOverrides } from './hotswap/common'; +import { debug, warning } from './logging'; import { loadCurrentTemplate, loadCurrentTemplateWithNestedStacks, @@ -25,10 +24,6 @@ import { Template, uploadStackTemplateAssets, } from './util/cloudformation'; -import { StackActivityMonitor, StackActivityProgress } from './util/cloudformation/stack-activity-monitor'; -import { StackEventPoller } from './util/cloudformation/stack-event-poller'; -import { RollbackChoice } from './util/cloudformation/stack-status'; -import { makeBodyParameter } from './util/template-body-parameter'; import { AssetManifestBuilder } from '../util/asset-manifest-builder'; import { buildAssets, @@ -38,10 +33,19 @@ import { type PublishAssetsOptions, PublishingAws, } from '../util/asset-publishing'; +import { StackActivityMonitor, StackActivityProgress } from './util/cloudformation/stack-activity-monitor'; +import { StackEventPoller } from './util/cloudformation/stack-event-poller'; +import { RollbackChoice } from './util/cloudformation/stack-status'; +import { makeBodyParameter } from './util/template-body-parameter'; import { formatErrorMessage } from '../util/error'; const BOOTSTRAP_STACK_VERSION_FOR_ROLLBACK = 23; +export interface Tag { + readonly Key: string; + readonly Value: string; +} + export interface DeployStackOptions { /** * Stack to deploy diff --git a/packages/aws-cdk/lib/diff.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/diff.ts similarity index 98% rename from packages/aws-cdk/lib/diff.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/diff.ts index dddeed2fa539f..54af51190ee67 100644 --- a/packages/aws-cdk/lib/diff.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/diff.ts @@ -11,9 +11,9 @@ import { } from '@aws-cdk/cloudformation-diff'; import * as cxapi from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; -import { NestedStackTemplates } from './api/nested-stack-helpers'; import { info, warning } from './logging'; -import { ToolkitError } from './toolkit/error'; +import { NestedStackTemplates } from './nested-stack-helpers'; +import { ToolkitError } from '../toolkit/error'; /** * Pretty-prints the differences between two template states to the console. diff --git a/packages/aws-cdk/lib/api/environment-access.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/environment-access.ts similarity index 99% rename from packages/aws-cdk/lib/api/environment-access.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/environment-access.ts index 6c463bec672f3..fcce4bb10e1b7 100644 --- a/packages/aws-cdk/lib/api/environment-access.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/environment-access.ts @@ -1,8 +1,8 @@ import * as cxapi from '@aws-cdk/cx-api'; import { SDK } from './aws-auth'; -import { warning } from '../logging'; import { CredentialsOptions, SdkForEnvironment, SdkProvider } from './aws-auth/sdk-provider'; import { EnvironmentResources, EnvironmentResourcesRegistry } from './environment-resources'; +import { warning } from './logging'; import { Mode } from './plugin/mode'; import { replaceEnvPlaceholders, StringWithoutPlaceholders } from './util/placeholders'; import { formatErrorMessage } from '../util/error'; diff --git a/packages/aws-cdk/lib/api/environment-resources.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/environment-resources.ts similarity index 99% rename from packages/aws-cdk/lib/api/environment-resources.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/environment-resources.ts index b8e733a4d683e..f37c99ca2d11a 100644 --- a/packages/aws-cdk/lib/api/environment-resources.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/environment-resources.ts @@ -1,8 +1,8 @@ import type { Environment } from '@aws-cdk/cx-api'; import type { SDK } from './aws-auth'; +import { debug, warning } from './logging'; +import { Notices } from './notices'; import { type EcrRepositoryInfo, ToolkitInfo } from './toolkit-info'; -import { debug, warning } from '../logging'; -import { Notices } from '../notices'; import { formatErrorMessage } from '../util/error'; /** diff --git a/packages/aws-cdk/lib/api/evaluate-cloudformation-template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/evaluate-cloudformation-template.ts similarity index 100% rename from packages/aws-cdk/lib/api/evaluate-cloudformation-template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/evaluate-cloudformation-template.ts diff --git a/packages/aws-cdk/lib/api/garbage-collection/garbage-collector.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/garbage-collector.ts similarity index 99% rename from packages/aws-cdk/lib/api/garbage-collection/garbage-collector.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/garbage-collector.ts index 5869071d4a6cd..b79e1618a3dc4 100644 --- a/packages/aws-cdk/lib/api/garbage-collection/garbage-collector.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/garbage-collector.ts @@ -3,8 +3,8 @@ import { ImageIdentifier } from '@aws-sdk/client-ecr'; import { Tag } from '@aws-sdk/client-s3'; import * as chalk from 'chalk'; import * as promptly from 'promptly'; -import { debug, info } from '../../logging'; import { IECRClient, IS3Client, SDK, SdkProvider } from '../aws-auth'; +import { debug, info } from '../logging'; import { DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo } from '../toolkit-info'; import { ProgressPrinter } from './progress-printer'; import { ActiveAssetCache, BackgroundStackRefresh, refreshStacks } from './stack-refresh'; diff --git a/packages/aws-cdk/lib/api/garbage-collection/progress-printer.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/progress-printer.ts similarity index 98% rename from packages/aws-cdk/lib/api/garbage-collection/progress-printer.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/progress-printer.ts index 9790dadeb0c5a..f5a274a65b033 100644 --- a/packages/aws-cdk/lib/api/garbage-collection/progress-printer.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/progress-printer.ts @@ -1,6 +1,6 @@ import * as chalk from 'chalk'; import { GcAsset as GCAsset } from './garbage-collector'; -import { info } from '../../logging'; +import { info } from '../logging'; export class ProgressPrinter { private totalAssets: number; diff --git a/packages/aws-cdk/lib/api/garbage-collection/stack-refresh.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/stack-refresh.ts similarity index 99% rename from packages/aws-cdk/lib/api/garbage-collection/stack-refresh.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/stack-refresh.ts index 2a795e23757d5..4fa8cb09ba786 100644 --- a/packages/aws-cdk/lib/api/garbage-collection/stack-refresh.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/stack-refresh.ts @@ -1,7 +1,7 @@ import { ParameterDeclaration } from '@aws-sdk/client-cloudformation'; -import { debug } from '../../logging'; import { ToolkitError } from '../../toolkit/error'; import { ICloudFormationClient } from '../aws-auth'; +import { debug } from '../logging'; export class ActiveAssetCache { private readonly stacks: Set = new Set(); diff --git a/packages/aws-cdk/lib/api/hotswap-deployments.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap-deployments.ts similarity index 99% rename from packages/aws-cdk/lib/api/hotswap-deployments.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap-deployments.ts index c955148035e6d..7869950f198cb 100644 --- a/packages/aws-cdk/lib/api/hotswap-deployments.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap-deployments.ts @@ -5,7 +5,6 @@ import * as chalk from 'chalk'; import type { SDK, SdkProvider } from './aws-auth'; import type { SuccessfulDeployStackResult } from './deploy-stack'; import { EvaluateCloudFormationTemplate } from './evaluate-cloudformation-template'; -import { info } from '../logging'; import { isHotswappableAppSyncChange } from './hotswap/appsync-mapping-templates'; import { isHotswappableCodeBuildProjectChange } from './hotswap/code-build-projects'; import { @@ -26,6 +25,7 @@ import { isHotswappableS3BucketDeploymentChange, } from './hotswap/s3-bucket-deployments'; import { isHotswappableStateMachineChange } from './hotswap/stepfunctions-state-machines'; +import { info } from './logging'; import { NestedStackTemplates, loadCurrentTemplateWithNestedStacks } from './nested-stack-helpers'; import { Mode } from './plugin/mode'; import { CloudFormationStack } from './util/cloudformation'; diff --git a/packages/aws-cdk/lib/api/hotswap/appsync-mapping-templates.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/appsync-mapping-templates.ts similarity index 100% rename from packages/aws-cdk/lib/api/hotswap/appsync-mapping-templates.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/appsync-mapping-templates.ts diff --git a/packages/aws-cdk/lib/api/hotswap/code-build-projects.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/code-build-projects.ts similarity index 100% rename from packages/aws-cdk/lib/api/hotswap/code-build-projects.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/code-build-projects.ts diff --git a/packages/aws-cdk/lib/api/hotswap/common.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common.ts similarity index 100% rename from packages/aws-cdk/lib/api/hotswap/common.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common.ts diff --git a/packages/aws-cdk/lib/api/hotswap/ecs-services.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/ecs-services.ts similarity index 100% rename from packages/aws-cdk/lib/api/hotswap/ecs-services.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/ecs-services.ts diff --git a/packages/aws-cdk/lib/api/hotswap/lambda-functions.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/lambda-functions.ts similarity index 100% rename from packages/aws-cdk/lib/api/hotswap/lambda-functions.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/lambda-functions.ts diff --git a/packages/aws-cdk/lib/api/hotswap/s3-bucket-deployments.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/s3-bucket-deployments.ts similarity index 100% rename from packages/aws-cdk/lib/api/hotswap/s3-bucket-deployments.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/s3-bucket-deployments.ts diff --git a/packages/aws-cdk/lib/api/hotswap/stepfunctions-state-machines.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/stepfunctions-state-machines.ts similarity index 100% rename from packages/aws-cdk/lib/api/hotswap/stepfunctions-state-machines.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/stepfunctions-state-machines.ts diff --git a/packages/aws-cdk/lib/import.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/import.ts similarity index 97% rename from packages/aws-cdk/lib/import.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/import.ts index 47451ce76d874..aaac84bca26ae 100644 --- a/packages/aws-cdk/lib/import.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/import.ts @@ -5,14 +5,12 @@ import * as cxapi from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; import * as fs from 'fs-extra'; import * as promptly from 'promptly'; -import { DeploymentMethod } from './api'; -import { assertIsSuccessfulDeployStackResult } from './api/deploy-stack'; -import { Deployments } from './api/deployments'; -import { ResourceIdentifierProperties, ResourcesToImport } from './api/util/cloudformation'; -import { StackActivityProgress } from './api/util/cloudformation/stack-activity-monitor'; -import { Tag } from './cdk-toolkit'; +import { assertIsSuccessfulDeployStackResult, DeploymentMethod } from './deploy-stack'; +import { Deployments, Tag } from './deployments'; import { error, info, success, warning } from './logging'; -import { ToolkitError } from './toolkit/error'; +import { ToolkitError } from '../toolkit/error'; +import { ResourceIdentifierProperties, ResourcesToImport } from './util/cloudformation'; +import { StackActivityProgress } from './util/cloudformation/stack-activity-monitor'; export interface ImportDeploymentOptions extends DeployOptions { deploymentMethod?: DeploymentMethod; diff --git a/packages/aws-cdk/lib/api/index.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/index.ts similarity index 88% rename from packages/aws-cdk/lib/api/index.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/index.ts index b1320c1148e27..3093b0ead40b2 100644 --- a/packages/aws-cdk/lib/api/index.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/index.ts @@ -3,3 +3,4 @@ export * from './garbage-collection/garbage-collector'; export * from './deploy-stack'; export * from './toolkit-info'; export * from './aws-auth'; +export * from './diff'; diff --git a/packages/aws-cdk/lib/list-stacks.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/list-stacks.ts similarity index 86% rename from packages/aws-cdk/lib/list-stacks.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/list-stacks.ts index f1b49712e89c8..8fb8211ac2787 100644 --- a/packages/aws-cdk/lib/list-stacks.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/list-stacks.ts @@ -1,8 +1,6 @@ -import '@jsii/check-node/run'; import { Environment } from '@aws-cdk/cx-api'; -import { DefaultSelection, ExtendedStackSelection, StackCollection } from './api/cxapp/cloud-assembly'; -import { CdkToolkit } from './cdk-toolkit'; +import { CloudAssembly, DefaultSelection, ExtendedStackSelection, StackCollection } from './cxapp/cloud-assembly'; /** * Options for List Stacks @@ -41,9 +39,7 @@ export type StackDetails = { * @param options list stacks options * @returns StackDetails[] */ -export async function listStacks(toolkit: CdkToolkit, options: ListStacksOptions): Promise { - const assembly = await toolkit.assembly(); - +export async function listStacks(assembly: CloudAssembly, options: ListStacksOptions): Promise { const stacks = await assembly.selectStacks({ patterns: options.selectors, }, { diff --git a/packages/aws-cdk/lib/logging.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logging.ts similarity index 99% rename from packages/aws-cdk/lib/logging.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logging.ts index 2df85c308708b..c660e551dba28 100644 --- a/packages/aws-cdk/lib/logging.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logging.ts @@ -1,6 +1,6 @@ import * as util from 'util'; import * as chalk from 'chalk'; -import { IoMessageLevel, IoMessage, CliIoHost, IoMessageSpecificCode, IoMessageCode, IoMessageCodeCategory, IoCodeLevel } from './toolkit/cli-io-host'; +import { IoMessageLevel, IoMessage, CliIoHost, IoMessageSpecificCode, IoMessageCode, IoMessageCodeCategory, IoCodeLevel } from '../toolkit/cli-io-host'; // Corking mechanism let CORK_COUNTER = 0; diff --git a/packages/aws-cdk/lib/api/logs/find-cloudwatch-logs.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logs/find-cloudwatch-logs.ts similarity index 99% rename from packages/aws-cdk/lib/api/logs/find-cloudwatch-logs.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logs/find-cloudwatch-logs.ts index 88f088d580511..b30682900dc28 100644 --- a/packages/aws-cdk/lib/api/logs/find-cloudwatch-logs.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logs/find-cloudwatch-logs.ts @@ -1,10 +1,10 @@ import type { CloudFormationStackArtifact, Environment } from '@aws-cdk/cx-api'; import type { StackResourceSummary } from '@aws-sdk/client-cloudformation'; -import { debug } from '../../logging'; import { formatErrorMessage } from '../../util/error'; import type { SDK, SdkProvider } from '../aws-auth'; import { EnvironmentAccess } from '../environment-access'; import { EvaluateCloudFormationTemplate, LazyListStackResources } from '../evaluate-cloudformation-template'; +import { debug } from '../logging'; import { Mode } from '../plugin/mode'; import { DEFAULT_TOOLKIT_STACK_NAME } from '../toolkit-info'; diff --git a/packages/aws-cdk/lib/api/logs/logs-monitor.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logs/logs-monitor.ts similarity index 99% rename from packages/aws-cdk/lib/api/logs/logs-monitor.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logs/logs-monitor.ts index a64a0d93df138..3c6398fee694a 100644 --- a/packages/aws-cdk/lib/api/logs/logs-monitor.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/logs/logs-monitor.ts @@ -1,9 +1,9 @@ import * as util from 'util'; import * as cxapi from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; -import { info, error } from '../../logging'; import { flatten } from '../../util/arrays'; import type { SDK } from '../aws-auth'; +import { info, error } from '../logging'; /** * After reading events from all CloudWatch log groups diff --git a/packages/aws-cdk/lib/api/nested-stack-helpers.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/nested-stack-helpers.ts similarity index 100% rename from packages/aws-cdk/lib/api/nested-stack-helpers.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/nested-stack-helpers.ts diff --git a/packages/aws-cdk/lib/notices.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/notices.ts similarity index 96% rename from packages/aws-cdk/lib/notices.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/notices.ts index 5d21f6ced47d7..2b565d07ec3c7 100644 --- a/packages/aws-cdk/lib/notices.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/notices.ts @@ -5,16 +5,15 @@ import * as path from 'path'; import type { Environment } from '@aws-cdk/cx-api'; import * as fs from 'fs-extra'; import * as semver from 'semver'; -import { SdkHttpOptions } from './api'; -import { AwsCliCompatible } from './api/aws-auth/awscli-compatible'; +import { AwsCliCompatible } from './aws-auth/awscli-compatible'; +import { SdkHttpOptions } from './aws-auth/sdk-provider'; import { debug, info, warning, error } from './logging'; import { Context } from './settings'; -import { ToolkitError } from './toolkit/error'; -import { loadTreeFromDir, some } from './tree'; -import { flatMap } from './util'; -import { cdkCacheDir } from './util/directories'; -import { formatErrorMessage } from './util/error'; -import { versionNumber } from './version'; +import { ToolkitError } from '../toolkit/error'; +import { flatMap } from '../util'; +import { cdkCacheDir } from '../util/directories'; +import { formatErrorMessage } from '../util/error'; +import { loadTreeFromDir, some } from '../util/tree'; const CACHE_FILE_PATH = path.join(cdkCacheDir(), 'notices.json'); @@ -287,14 +286,14 @@ export class Notices { /** * Display the relevant notices (unless context dictates we shouldn't). */ - public display(options: NoticesPrintOptions = {}) { + public display(cliVersion: string, options: NoticesPrintOptions = {}) { if (!this.shouldDisplay) { return; } const filteredNotices = NoticesFilter.filter({ data: Array.from(this.data), - cliVersion: versionNumber(), + cliVersion, outDir: this.output, bootstrappedEnvironments: Array.from(this.bootstrappedEnvironments.values()), }); diff --git a/packages/aws-cdk/lib/api/plugin/context-provider-plugin.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/context-provider-plugin.ts similarity index 100% rename from packages/aws-cdk/lib/api/plugin/context-provider-plugin.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/context-provider-plugin.ts diff --git a/packages/aws-cdk/lib/api/plugin/index.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/index.ts similarity index 100% rename from packages/aws-cdk/lib/api/plugin/index.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/index.ts diff --git a/packages/aws-cdk/lib/api/plugin/mode.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/mode.ts similarity index 100% rename from packages/aws-cdk/lib/api/plugin/mode.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/mode.ts diff --git a/packages/aws-cdk/lib/api/plugin/plugin.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/plugin.ts similarity index 98% rename from packages/aws-cdk/lib/api/plugin/plugin.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/plugin.ts index e18cf77a999fa..d859f8fb29d83 100644 --- a/packages/aws-cdk/lib/api/plugin/plugin.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/plugin.ts @@ -3,8 +3,8 @@ import type { CredentialProviderSource, IPluginHost, Plugin } from '@aws-cdk/cli import * as chalk from 'chalk'; import { type ContextProviderPlugin, isContextProviderPlugin } from './context-provider-plugin'; -import { error } from '../../logging'; import { ToolkitError } from '../../toolkit/error'; +import { error } from '../logging'; export let TESTING = false; diff --git a/packages/aws-cdk/lib/settings.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/settings.ts similarity index 99% rename from packages/aws-cdk/lib/settings.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/settings.ts index 9c6e680e6c8d8..b5993ff7e2df1 100644 --- a/packages/aws-cdk/lib/settings.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/settings.ts @@ -1,10 +1,10 @@ import * as os from 'os'; import * as fs_path from 'path'; import * as fs from 'fs-extra'; -import { Tag } from './cdk-toolkit'; import { debug, warning } from './logging'; -import { ToolkitError } from './toolkit/error'; -import * as util from './util'; +import { ToolkitError } from '../toolkit/error'; +import * as util from '../util'; +import { Tag } from './deployments'; export type SettingsMap = {[key: string]: any}; diff --git a/packages/aws-cdk/lib/api/toolkit-info.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/toolkit-info.ts similarity index 99% rename from packages/aws-cdk/lib/api/toolkit-info.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/toolkit-info.ts index cd8a7420b6dd6..60b59da77e038 100644 --- a/packages/aws-cdk/lib/api/toolkit-info.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/toolkit-info.ts @@ -1,7 +1,6 @@ import * as cxapi from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; import type { SDK } from './aws-auth'; -import { debug } from '../logging'; import { BOOTSTRAP_VARIANT_PARAMETER, BOOTSTRAP_VERSION_OUTPUT, @@ -10,6 +9,7 @@ import { DEFAULT_BOOTSTRAP_VARIANT, REPOSITORY_NAME_OUTPUT, } from './bootstrap/bootstrap-props'; +import { debug } from './logging'; import { CloudFormationStack, stabilizeStack } from './util/cloudformation'; export const DEFAULT_TOOLKIT_STACK_NAME = 'CDKToolkit'; diff --git a/packages/aws-cdk/lib/api/util/checks.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/checks.ts similarity index 98% rename from packages/aws-cdk/lib/api/util/checks.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/checks.ts index b0f21e62c94cc..3f910119617e0 100644 --- a/packages/aws-cdk/lib/api/util/checks.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/checks.ts @@ -1,5 +1,5 @@ -import { debug } from '../../logging'; import { SDK } from '../aws-auth/sdk'; +import { debug } from '../logging'; export async function determineAllowCrossAccountAssetPublishing(sdk: SDK, customStackName?: string): Promise { try { diff --git a/packages/aws-cdk/lib/api/util/cloudformation.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation.ts similarity index 99% rename from packages/aws-cdk/lib/api/util/cloudformation.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation.ts index aa963292626f4..ff2e58e51b4d6 100644 --- a/packages/aws-cdk/lib/api/util/cloudformation.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation.ts @@ -12,12 +12,12 @@ import { import { AssetManifest, FileManifestEntry } from 'cdk-assets'; import { StackStatus } from './cloudformation/stack-status'; import { makeBodyParameter, TemplateBodyParameter } from './template-body-parameter'; -import { debug } from '../../logging'; -import { deserializeStructure } from '../../serialize'; import { AssetManifestBuilder } from '../../util/asset-manifest-builder'; import { formatErrorMessage } from '../../util/error'; +import { deserializeStructure } from '../../util/serialize'; import type { ICloudFormationClient, SdkProvider } from '../aws-auth'; import type { Deployments } from '../deployments'; +import { debug } from '../logging'; export type ResourcesToImport = ResourceToImport[]; export type ResourceIdentifierSummaries = ResourceIdentifierSummary[]; diff --git a/packages/aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-activity-monitor.ts similarity index 99% rename from packages/aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-activity-monitor.ts index 999ad18ed149b..34d96fa26c62e 100644 --- a/packages/aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-activity-monitor.ts @@ -3,9 +3,9 @@ import { ArtifactMetadataEntryType, type MetadataEntry } from '@aws-cdk/cloud-as import type { CloudFormationStackArtifact } from '@aws-cdk/cx-api'; import * as chalk from 'chalk'; import { ResourceEvent, StackEventPoller } from './stack-event-poller'; -import { error, setIoMessageThreshold, info } from '../../../logging'; import { IoMessageLevel } from '../../../toolkit/cli-io-host'; import type { ICloudFormationClient } from '../../aws-auth'; +import { error, setIoMessageThreshold, info } from '../../logging'; import { RewritableBlock } from '../display'; export interface StackActivity extends ResourceEvent { diff --git a/packages/aws-cdk/lib/api/util/cloudformation/stack-event-poller.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-event-poller.ts similarity index 100% rename from packages/aws-cdk/lib/api/util/cloudformation/stack-event-poller.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-event-poller.ts diff --git a/packages/aws-cdk/lib/api/util/cloudformation/stack-status.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-status.ts similarity index 100% rename from packages/aws-cdk/lib/api/util/cloudformation/stack-status.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-status.ts diff --git a/packages/aws-cdk/lib/api/util/display.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/display.ts similarity index 100% rename from packages/aws-cdk/lib/api/util/display.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/display.ts diff --git a/packages/aws-cdk/lib/api/util/placeholders.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/placeholders.ts similarity index 100% rename from packages/aws-cdk/lib/api/util/placeholders.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/placeholders.ts diff --git a/packages/aws-cdk/lib/api/util/rwlock.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/rwlock.ts similarity index 100% rename from packages/aws-cdk/lib/api/util/rwlock.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/rwlock.ts diff --git a/packages/aws-cdk/lib/api/util/string-manipulation.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/string-manipulation.ts similarity index 100% rename from packages/aws-cdk/lib/api/util/string-manipulation.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/string-manipulation.ts diff --git a/packages/aws-cdk/lib/api/util/template-body-parameter.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/template-body-parameter.ts similarity index 98% rename from packages/aws-cdk/lib/api/util/template-body-parameter.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/template-body-parameter.ts index 67d645127437d..b83a4707c2309 100644 --- a/packages/aws-cdk/lib/api/util/template-body-parameter.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/api/util/template-body-parameter.ts @@ -4,11 +4,11 @@ import { HeadObjectCommand, S3Client } from '@aws-sdk/client-s3'; import { getEndpointFromInstructions } from '@smithy/middleware-endpoint'; import * as chalk from 'chalk'; import * as fs from 'fs-extra'; -import { debug, error } from '../../logging'; -import { toYAML } from '../../serialize'; import { AssetManifestBuilder } from '../../util/asset-manifest-builder'; import { contentHash } from '../../util/content-hash'; +import { toYAML } from '../../util/serialize'; import { EnvironmentResources } from '../environment-resources'; +import { debug, error } from '../logging'; export type TemplateBodyParameter = { TemplateBody?: string; diff --git a/packages/aws-cdk/lib/context-providers/ami.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ami.ts similarity index 97% rename from packages/aws-cdk/lib/context-providers/ami.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ami.ts index 27a518163ee58..18756a3624b12 100644 --- a/packages/aws-cdk/lib/context-providers/ami.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ami.ts @@ -1,7 +1,7 @@ import type { AmiContextQuery } from '@aws-cdk/cloud-assembly-schema'; import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider'; +import { debug, info } from '../api/logging'; import { ContextProviderPlugin } from '../api/plugin'; -import { debug, info } from '../logging'; /** * Plugin to search AMIs for the current account diff --git a/packages/aws-cdk/lib/context-providers/availability-zones.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/availability-zones.ts similarity index 96% rename from packages/aws-cdk/lib/context-providers/availability-zones.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/availability-zones.ts index 935dbad2cfcef..46d73b44ec261 100644 --- a/packages/aws-cdk/lib/context-providers/availability-zones.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/availability-zones.ts @@ -1,8 +1,8 @@ import type { AvailabilityZonesContextQuery } from '@aws-cdk/cloud-assembly-schema'; import type { AvailabilityZone } from '@aws-sdk/client-ec2'; import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider'; +import { debug } from '../api/logging'; import { ContextProviderPlugin } from '../api/plugin'; -import { debug } from '../logging'; /** * Plugin to retrieve the Availability Zones for the current account diff --git a/packages/aws-cdk/lib/context-providers/endpoint-service-availability-zones.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/endpoint-service-availability-zones.ts similarity index 97% rename from packages/aws-cdk/lib/context-providers/endpoint-service-availability-zones.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/endpoint-service-availability-zones.ts index 9fbc441930ad9..0d40857ecbdaa 100644 --- a/packages/aws-cdk/lib/context-providers/endpoint-service-availability-zones.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/endpoint-service-availability-zones.ts @@ -1,7 +1,7 @@ import type { EndpointServiceAvailabilityZonesContextQuery } from '@aws-cdk/cloud-assembly-schema'; import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider'; +import { debug } from '../api/logging'; import { ContextProviderPlugin } from '../api/plugin'; -import { debug } from '../logging'; /** * Plugin to retrieve the Availability Zones for an endpoint service diff --git a/packages/aws-cdk/lib/context-providers/hosted-zones.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/hosted-zones.ts similarity index 98% rename from packages/aws-cdk/lib/context-providers/hosted-zones.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/hosted-zones.ts index 9c0fc806251ef..bec83d2fd206b 100644 --- a/packages/aws-cdk/lib/context-providers/hosted-zones.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/hosted-zones.ts @@ -2,8 +2,8 @@ import { HostedZoneContextQuery } from '@aws-cdk/cloud-assembly-schema'; import type { HostedZone } from '@aws-sdk/client-route-53'; import type { IRoute53Client } from '../api'; import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider'; +import { debug } from '../api/logging'; import { ContextProviderPlugin } from '../api/plugin'; -import { debug } from '../logging'; export class HostedZoneContextProviderPlugin implements ContextProviderPlugin { constructor(private readonly aws: SdkProvider) {} diff --git a/packages/aws-cdk/lib/context-providers/index.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/index.ts similarity index 98% rename from packages/aws-cdk/lib/context-providers/index.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/index.ts index abc4f9eb708e4..31de4f303778d 100644 --- a/packages/aws-cdk/lib/context-providers/index.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/index.ts @@ -10,11 +10,11 @@ import { SecurityGroupContextProviderPlugin } from './security-groups'; import { SSMContextProviderPlugin } from './ssm-parameters'; import { VpcNetworkContextProviderPlugin } from './vpcs'; import { SdkProvider } from '../api'; +import { debug } from '../api/logging'; import { PluginHost } from '../api/plugin'; import { ContextProviderPlugin } from '../api/plugin/context-provider-plugin'; +import { Context, TRANSIENT_CONTEXT_KEY } from '../api/settings'; import { replaceEnvPlaceholders } from '../api/util/placeholders'; -import { debug } from '../logging'; -import { Context, TRANSIENT_CONTEXT_KEY } from '../settings'; import { formatErrorMessage } from '../util/error'; export type ContextProviderFactory = ((sdk: SdkProvider) => ContextProviderPlugin); diff --git a/packages/aws-cdk/lib/context-providers/keys.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/keys.ts similarity index 98% rename from packages/aws-cdk/lib/context-providers/keys.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/keys.ts index 96676de5aaaea..026ff072fdcd6 100644 --- a/packages/aws-cdk/lib/context-providers/keys.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/keys.ts @@ -3,8 +3,8 @@ import type { KeyContextResponse } from '@aws-cdk/cx-api'; import type { AliasListEntry, ListAliasesCommandOutput } from '@aws-sdk/client-kms'; import type { IKMSClient } from '../api'; import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider'; +import { debug } from '../api/logging'; import { ContextProviderPlugin } from '../api/plugin'; -import { debug } from '../logging'; export class KeyContextProviderPlugin implements ContextProviderPlugin { constructor(private readonly aws: SdkProvider) {} diff --git a/packages/aws-cdk/lib/context-providers/load-balancers.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/load-balancers.ts similarity index 100% rename from packages/aws-cdk/lib/context-providers/load-balancers.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/load-balancers.ts diff --git a/packages/aws-cdk/lib/context-providers/security-groups.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/security-groups.ts similarity index 100% rename from packages/aws-cdk/lib/context-providers/security-groups.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/security-groups.ts diff --git a/packages/aws-cdk/lib/context-providers/ssm-parameters.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ssm-parameters.ts similarity index 98% rename from packages/aws-cdk/lib/context-providers/ssm-parameters.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ssm-parameters.ts index d2d182d2d50c5..a2031658b464d 100644 --- a/packages/aws-cdk/lib/context-providers/ssm-parameters.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ssm-parameters.ts @@ -1,8 +1,8 @@ import type { SSMParameterContextQuery } from '@aws-cdk/cloud-assembly-schema'; import type { GetParameterCommandOutput } from '@aws-sdk/client-ssm'; import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider'; +import { debug } from '../api/logging'; import { ContextProviderPlugin } from '../api/plugin'; -import { debug } from '../logging'; /** * Plugin to read arbitrary SSM parameter names diff --git a/packages/aws-cdk/lib/context-providers/vpcs.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/vpcs.ts similarity index 99% rename from packages/aws-cdk/lib/context-providers/vpcs.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/vpcs.ts index 0ad6a277ad574..2cd93f13d27b6 100644 --- a/packages/aws-cdk/lib/context-providers/vpcs.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/context-providers/vpcs.ts @@ -3,8 +3,8 @@ import { type VpcContextResponse, type VpcSubnetGroup, VpcSubnetGroupType } from import type { Filter, RouteTable, Tag, Vpc } from '@aws-sdk/client-ec2'; import type { IEC2Client } from '../api'; import { type SdkProvider, initContextProviderSdk } from '../api/aws-auth/sdk-provider'; +import { debug } from '../api/logging'; import { ContextProviderPlugin } from '../api/plugin'; -import { debug } from '../logging'; export class VpcNetworkContextProviderPlugin implements ContextProviderPlugin { constructor(private readonly aws: SdkProvider) {} diff --git a/packages/aws-cdk/lib/toolkit/cli-io-host.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/toolkit/cli-io-host.ts similarity index 100% rename from packages/aws-cdk/lib/toolkit/cli-io-host.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/toolkit/cli-io-host.ts diff --git a/packages/aws-cdk/lib/toolkit/error.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error.ts similarity index 100% rename from packages/aws-cdk/lib/toolkit/error.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error.ts diff --git a/packages/aws-cdk/lib/util/archive.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/archive.ts similarity index 100% rename from packages/aws-cdk/lib/util/archive.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/archive.ts diff --git a/packages/aws-cdk/lib/util/arrays.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/arrays.ts similarity index 100% rename from packages/aws-cdk/lib/util/arrays.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/arrays.ts diff --git a/packages/aws-cdk/lib/util/asset-manifest-builder.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/asset-manifest-builder.ts similarity index 100% rename from packages/aws-cdk/lib/util/asset-manifest-builder.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/asset-manifest-builder.ts diff --git a/packages/aws-cdk/lib/util/asset-publishing.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/asset-publishing.ts similarity index 99% rename from packages/aws-cdk/lib/util/asset-publishing.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/asset-publishing.ts index fd2739146fcdd..b434634f0fcae 100644 --- a/packages/aws-cdk/lib/util/asset-publishing.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/asset-publishing.ts @@ -14,8 +14,8 @@ import { } from 'cdk-assets'; import type { SDK } from '../api'; import type { SdkProvider } from '../api/aws-auth/sdk-provider'; +import { debug, error, info } from '../api/logging'; import { Mode } from '../api/plugin/mode'; -import { debug, error, info } from '../logging'; export interface PublishAssetsOptions { /** diff --git a/packages/aws-cdk/lib/util/bool.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/bool.ts similarity index 100% rename from packages/aws-cdk/lib/util/bool.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/bool.ts diff --git a/packages/aws-cdk/lib/util/console-formatters.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/console-formatters.ts similarity index 100% rename from packages/aws-cdk/lib/util/console-formatters.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/console-formatters.ts diff --git a/packages/aws-cdk/lib/util/content-hash.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/content-hash.ts similarity index 100% rename from packages/aws-cdk/lib/util/content-hash.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/content-hash.ts diff --git a/packages/aws-cdk/lib/util/directories.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/directories.ts similarity index 83% rename from packages/aws-cdk/lib/util/directories.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/directories.ts index fb304dce89cd1..477b244c71fe1 100644 --- a/packages/aws-cdk/lib/util/directories.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/directories.ts @@ -61,3 +61,17 @@ export function rootDir(fail?: boolean) { return _rootDir(__dirname); } + +/** + * Find the resources dir of the package. This is a well-known directory in the root of the repo. + */ +export function resourcesDir(): string { + return path.join(rootDir(), 'resources'); +} + +/** + * Find the path to resource file in the well-known resources directory in the root of the repo. + */ +export function resourcePath(...resource: string[]): string { + return path.join(rootDir(), 'resources', ...resource); +} diff --git a/packages/aws-cdk/lib/util/error.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/error.ts similarity index 100% rename from packages/aws-cdk/lib/util/error.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/error.ts diff --git a/packages/aws-cdk/lib/util/index.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/index.ts similarity index 100% rename from packages/aws-cdk/lib/util/index.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/index.ts diff --git a/packages/aws-cdk/lib/util/npm.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/npm.ts similarity index 94% rename from packages/aws-cdk/lib/util/npm.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/npm.ts index d31ac95f1a17b..738d351f388bb 100644 --- a/packages/aws-cdk/lib/util/npm.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/npm.ts @@ -1,7 +1,7 @@ import { exec as _exec } from 'child_process'; import { promisify } from 'util'; import * as semver from 'semver'; -import { debug } from '../../lib/logging'; +import { debug } from '../api/logging'; const exec = promisify(_exec); diff --git a/packages/aws-cdk/lib/util/objects.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/objects.ts similarity index 100% rename from packages/aws-cdk/lib/util/objects.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/objects.ts diff --git a/packages/aws-cdk/lib/os.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/os.ts similarity index 96% rename from packages/aws-cdk/lib/os.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/os.ts index 660a83a6bfbd6..c76a9953628b2 100644 --- a/packages/aws-cdk/lib/os.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/os.ts @@ -1,7 +1,7 @@ import * as child_process from 'child_process'; import * as chalk from 'chalk'; -import { debug } from './logging'; -import { ToolkitError } from './toolkit/error'; +import { debug } from '../api/logging'; +import { ToolkitError } from '../toolkit/error'; /** * OS helpers diff --git a/packages/aws-cdk/lib/util/parallel.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/parallel.ts similarity index 100% rename from packages/aws-cdk/lib/util/parallel.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/parallel.ts diff --git a/packages/aws-cdk/lib/serialize.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/serialize.ts similarity index 94% rename from packages/aws-cdk/lib/serialize.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/serialize.ts index ea7ea30c3b89c..9a9f1cd242b58 100644 --- a/packages/aws-cdk/lib/serialize.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/serialize.ts @@ -1,5 +1,5 @@ import * as fs from 'fs-extra'; -import * as yaml_cfn from './util/yaml-cfn'; +import * as yaml_cfn from './yaml-cfn'; /** * Stringify to YAML diff --git a/packages/aws-cdk/lib/util/tables.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tables.ts similarity index 100% rename from packages/aws-cdk/lib/util/tables.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tables.ts diff --git a/packages/aws-cdk/lib/util/tracing.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tracing.ts similarity index 97% rename from packages/aws-cdk/lib/util/tracing.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tracing.ts index ffb4017d60bfc..03b7cac083425 100644 --- a/packages/aws-cdk/lib/util/tracing.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tracing.ts @@ -1,4 +1,4 @@ -import { debug } from '../logging'; +import { debug } from '../api/logging'; let ENABLED = false; let INDENT = 0; diff --git a/packages/aws-cdk/lib/tree.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tree.ts similarity index 97% rename from packages/aws-cdk/lib/tree.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tree.ts index 57ae5685ae17c..1987bf1fc17e2 100644 --- a/packages/aws-cdk/lib/tree.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/tree.ts @@ -1,7 +1,7 @@ import * as path from 'path'; import { CloudAssembly } from '@aws-cdk/cx-api'; import * as fs from 'fs-extra'; -import { trace } from './logging'; +import { trace } from '../api/logging'; /** * Source information on a construct (class fqn and version) diff --git a/packages/aws-cdk/lib/util/type-brands.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/type-brands.ts similarity index 100% rename from packages/aws-cdk/lib/util/type-brands.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/type-brands.ts diff --git a/packages/aws-cdk/lib/util/types.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/types.ts similarity index 100% rename from packages/aws-cdk/lib/util/types.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/types.ts diff --git a/packages/aws-cdk/lib/util/validate-notification-arn.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/validate-notification-arn.ts similarity index 100% rename from packages/aws-cdk/lib/util/validate-notification-arn.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/validate-notification-arn.ts diff --git a/packages/aws-cdk/lib/util/version-range.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/version-range.ts similarity index 100% rename from packages/aws-cdk/lib/util/version-range.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/version-range.ts diff --git a/packages/aws-cdk/lib/util/work-graph-builder.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-builder.ts similarity index 100% rename from packages/aws-cdk/lib/util/work-graph-builder.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-builder.ts diff --git a/packages/aws-cdk/lib/util/work-graph-types.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-types.ts similarity index 100% rename from packages/aws-cdk/lib/util/work-graph-types.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-types.ts diff --git a/packages/aws-cdk/lib/util/work-graph.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph.ts similarity index 99% rename from packages/aws-cdk/lib/util/work-graph.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph.ts index e572d7a11b3fd..6c59938bbb578 100644 --- a/packages/aws-cdk/lib/util/work-graph.ts +++ b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph.ts @@ -1,6 +1,6 @@ import { parallelPromises } from './parallel'; import { WorkNode, DeploymentState, StackNode, AssetBuildNode, AssetPublishNode } from './work-graph-types'; -import { debug, trace } from '../logging'; +import { debug, trace } from '../api/logging'; export type Concurrency = number | Record; diff --git a/packages/aws-cdk/lib/util/yaml-cfn.ts b/packages/@aws-cdk/tmp-toolkit-helpers/lib/util/yaml-cfn.ts similarity index 100% rename from packages/aws-cdk/lib/util/yaml-cfn.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/lib/util/yaml-cfn.ts diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/package.json b/packages/@aws-cdk/tmp-toolkit-helpers/package.json new file mode 100644 index 0000000000000..0c9af4fec3cc2 --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/package.json @@ -0,0 +1,113 @@ +{ + "name": "@aws-cdk/tmp-toolkit-helpers", + "description": "Temporary AWS CDK Programmatic Toolkit Library", + "private": true, + "version": "0.0.0", + "main": "./lib/api/index.js", + "types": "./lib/api/index.d.ts", + "type": "commonjs", + "scripts": { + "build": "cdk-build", + "watch": "cdk-watch", + "lint": "cdk-lint", + "test": "cdk-test", + "pkglint": "pkglint -f", + "package": "cdk-package", + "awslint": "cdk-awslint", + "build+test+package": "yarn build+test && yarn package", + "build+test": "yarn build && yarn test", + "build+extract": "yarn build", + "build+test+extract": "yarn build+test" + }, + "author": { + "name": "Amazon Web Services", + "url": "https://aws.amazon.com", + "organization": true + }, + "license": "Apache-2.0", + "devDependencies": { + "@aws-cdk/cdk-build-tools": "0.0.0", + "@aws-cdk/pkglint": "0.0.0", + "@types/archiver": "^5.3.4", + "@types/fs-extra": "^9.0.13", + "@types/glob": "^7.2.0", + "@types/jest": "^29.5.14", + "@types/node": "^18.18.14", + "aws-sdk-client-mock": "^4.0.1", + "aws-sdk-client-mock-jest": "^4.0.1", + "jest": "^29.7.0", + "jest-mock": "^29.7.0", + "ts-jest": "^29.2.5", + "ts-mock-imports": "^1.3.16", + "ts-node": "^10.9.2", + "typescript": "~5.7.3" + }, + "dependencies": { + "@aws-cdk/cloud-assembly-schema": "^39.0.0", + "@aws-cdk/cloudformation-diff": "0.0.0", + "@aws-cdk/cx-api": "0.0.0", + "@aws-sdk/client-appsync": "3.699.0", + "@aws-sdk/client-cloudformation": "3.699.0", + "@aws-sdk/client-cloudwatch-logs": "3.699.0", + "@aws-sdk/client-codebuild": "3.699.0", + "@aws-sdk/client-ec2": "3.699.0", + "@aws-sdk/client-ecr": "3.699.0", + "@aws-sdk/client-ecs": "3.699.0", + "@aws-sdk/client-elastic-load-balancing-v2": "3.699.0", + "@aws-sdk/client-iam": "3.699.0", + "@aws-sdk/client-kms": "3.699.0", + "@aws-sdk/client-lambda": "3.699.0", + "@aws-sdk/client-route-53": "3.699.0", + "@aws-sdk/client-s3": "3.699.0", + "@aws-sdk/client-secrets-manager": "3.699.0", + "@aws-sdk/client-sfn": "3.699.0", + "@aws-sdk/client-ssm": "3.699.0", + "@aws-sdk/client-sts": "3.699.0", + "@aws-sdk/credential-providers": "3.699.0", + "@aws-sdk/ec2-metadata-service": "3.699.0", + "@aws-sdk/lib-storage": "3.699.0", + "@smithy/middleware-endpoint": "3.1.4", + "@smithy/node-http-handler": "3.2.4", + "@smithy/property-provider": "3.1.10", + "@smithy/shared-ini-file-loader": "3.1.8", + "@smithy/types": "3.5.0", + "@smithy/util-retry": "3.0.7", + "@smithy/util-waiter": "3.1.6", + "archiver": "^5.3.2", + "cdk-assets": "^3.0.0-rc.111", + "chalk": "^4", + "fs-extra": "^9.1.0", + "glob": "^7.2.3", + "minimatch": "^9.0.5", + "p-limit": "^3.1.0", + "promptly": "^3.2.0", + "proxy-agent": "^6.4.0", + "semver": "^7.6.3", + "strip-ansi": "^6.0.1", + "uuid": "^8.3.2", + "wrap-ansi": "^7.0.0", + "yaml": "1.10.2" + }, + "repository": { + "url": "https://github.com/aws/aws-cdk.git", + "type": "git", + "directory": "packages/@aws-cdk/tmp-toolkit-helpers" + }, + "keywords": [ + "aws", + "cdk" + ], + "homepage": "https://github.com/aws/aws-cdk", + "engines": { + "node": ">= 14.15.0" + }, + "awscdkio": { + "announce": false + }, + "stability": "experimental", + "maturity": "experimental", + "publishConfig": { + "access": "restricted", + "tag": "latest" + } +} diff --git a/packages/aws-cdk/lib/api/bootstrap/bootstrap-template.yaml b/packages/@aws-cdk/tmp-toolkit-helpers/resources/bootstrap/bootstrap-template.yaml similarity index 100% rename from packages/aws-cdk/lib/api/bootstrap/bootstrap-template.yaml rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/bootstrap/bootstrap-template.yaml diff --git a/packages/aws-cdk/lib/init-templates/.no-packagejson-validator b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/.no-packagejson-validator similarity index 100% rename from packages/aws-cdk/lib/init-templates/.no-packagejson-validator rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/.no-packagejson-validator diff --git a/packages/aws-cdk/lib/init-templates/LICENSE b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/LICENSE similarity index 100% rename from packages/aws-cdk/lib/init-templates/LICENSE rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/LICENSE diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/README.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/README.md diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%.template.sln b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%.template.sln rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs diff --git a/packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/csharp/src/%name.PascalCased%/Program.template.cs diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/fsharp/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/fsharp/README.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/README.md diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/fsharp/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%.template.sln b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%.template.sln rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs diff --git a/packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/fsharp/src/%name.PascalCased%/Program.template.fs diff --git a/packages/aws-cdk/lib/init-templates/app/go/%name%.template.go b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/%name%.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/go/%name%.template.go rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/%name%.template.go diff --git a/packages/aws-cdk/lib/init-templates/app/go/%name%_test.template.go b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/%name%_test.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/go/%name%_test.template.go rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/%name%_test.template.go diff --git a/packages/aws-cdk/lib/init-templates/app/go/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/go/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/app/go/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/go/README.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/README.md diff --git a/packages/aws-cdk/lib/init-templates/app/go/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/go/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/app/go/go.template.mod b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/go.template.mod similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/go/go.template.mod rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/go/go.template.mod diff --git a/packages/aws-cdk/lib/init-templates/app/info.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/info.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/info.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/info.json diff --git a/packages/aws-cdk/lib/init-templates/app/java/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/java/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/app/java/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/java/README.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/README.md diff --git a/packages/aws-cdk/lib/init-templates/app/java/cdk.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/cdk.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/java/cdk.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/cdk.json diff --git a/packages/aws-cdk/lib/init-templates/app/java/pom.xml b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/pom.xml similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/java/pom.xml rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/pom.xml diff --git a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java diff --git a/packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java diff --git a/packages/aws-cdk/lib/init-templates/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/java/src/test/java/com/myorg/%name.PascalCased%Test.template.java diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/.template.npmignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/.template.npmignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/README.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/README.md diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/bin/%name%.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/bin/%name%.template.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/bin/%name%.template.js diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/jest.config.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/jest.config.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/lib/%name%-stack.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/lib/%name%-stack.template.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/lib/%name%-stack.template.js diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/package.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/package.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/package.json diff --git a/packages/aws-cdk/lib/init-templates/app/javascript/test/%name%.test.template.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/test/%name%.test.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/javascript/test/%name%.test.template.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/javascript/test/%name%.test.template.js diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/__init__.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/%name.PythonModule%/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/%name.PythonModule%/__init__.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/%name.PythonModule%/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/app/python/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/app/python/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/app/python/app.template.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/app.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/app.template.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/app.template.py diff --git a/packages/aws-cdk/lib/init-templates/app/python/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/app/python/requirements-dev.txt b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/requirements-dev.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/requirements-dev.txt rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/requirements-dev.txt diff --git a/packages/aws-cdk/lib/init-templates/app/python/requirements.txt b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/requirements.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/requirements.txt rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/requirements.txt diff --git a/packages/aws-cdk/lib/init-templates/app/python/source.bat b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/source.bat similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/source.bat rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/source.bat diff --git a/packages/aws-cdk/lib/init-templates/app/python/tests/__init__.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/tests/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/tests/__init__.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/tests/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/app/python/tests/unit/__init__.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/tests/unit/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/tests/unit/__init__.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/tests/unit/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/app/python/tests/unit/test_%name.PythonModule%_stack.template.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/tests/unit/test_%name.PythonModule%_stack.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/python/tests/unit/test_%name.PythonModule%_stack.template.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/python/tests/unit/test_%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/.template.npmignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/.template.npmignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/README.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/README.md diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/bin/%name%.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/bin/%name%.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/bin/%name%.template.ts diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/jest.config.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/jest.config.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/lib/%name%-stack.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/lib/%name%-stack.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/lib/%name%-stack.template.ts diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/package.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/package.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/package.json diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/test/%name%.test.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/test/%name%.test.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/test/%name%.test.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/test/%name%.test.template.ts diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/tsconfig.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/app/typescript/tsconfig.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/app/typescript/tsconfig.json diff --git a/packages/aws-cdk/lib/init-templates/lib/info.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/info.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/info.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/info.json diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/.template.npmignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/.template.npmignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/jest.config.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/jest.config.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/lib/index.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/lib/index.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/lib/index.template.ts diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/package.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/package.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/package.json diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/test/%name%.test.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/test/%name%.test.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/test/%name%.test.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/test/%name%.test.template.ts diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/tsconfig.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/lib/typescript/tsconfig.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/lib/typescript/tsconfig.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%.template.sln b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%.template.sln rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%.template.csproj diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.cs diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/GlobalSuppressions.cs diff --git a/packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/csharp/src/%name.PascalCased%/Program.template.cs diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/fsharp/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/fsharp/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/fsharp/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%.template.sln b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%.template.sln similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%.template.sln rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%.template.sln diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%.template.fsproj diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%/%name.PascalCased%Stack.template.fs diff --git a/packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/fsharp/src/%name.PascalCased%/Program.template.fs diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/%name%.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/go/%name%.template.go rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/%name%.template.go diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/%name%_test.template.go b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/%name%_test.template.go similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/go/%name%_test.template.go rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/%name%_test.template.go diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/go/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/README.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/README.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/go/README.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/README.md diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/go/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/go/go.template.mod b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/go.template.mod similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/go/go.template.mod rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/go/go.template.mod diff --git a/packages/aws-cdk/lib/init-templates/sample-app/info.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/info.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/info.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/info.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/java/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/java/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/cdk.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/cdk.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/java/cdk.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/cdk.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/pom.xml b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/pom.xml similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/java/pom.xml rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/pom.xml diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%App.template.java diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/src/main/java/com/myorg/%name.PascalCased%Stack.template.java diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/java/src/test/java/com/myorg/%name.PascalCased%StackTest.template.java diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.npmignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/.template.npmignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/bin/%name%.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/bin/%name%.template.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/bin/%name%.template.js diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/jest.config.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/jest.config.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/lib/%name%-stack.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/lib/%name%-stack.template.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/lib/%name%-stack.template.js diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/package.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/package.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/package.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/test/%name%.test.template.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/test/%name%.test.template.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/test/%name%.test.template.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/test/%name%.test.template.js diff --git a/packages/aws-cdk/lib/init-templates/sample-app/javascript/tsconfig.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/javascript/tsconfig.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/javascript/tsconfig.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/%name.PythonModule%/%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/__init__.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/%name.PythonModule%/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/%name.PythonModule%/__init__.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/%name.PythonModule%/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/app.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/app.template.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/app.template.py diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/requirements-dev.txt b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/requirements-dev.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/requirements-dev.txt rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/requirements-dev.txt diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/requirements.txt b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/requirements.txt similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/requirements.txt rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/requirements.txt diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/source.bat b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/source.bat similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/source.bat rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/source.bat diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/tests/__init__.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/tests/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/tests/__init__.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/tests/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/__init__.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/tests/unit/__init__.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/__init__.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/tests/unit/__init__.py diff --git a/packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/python/tests/unit/test_%name.PythonModule%_stack.template.py diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.gitignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/.template.gitignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.gitignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/.template.gitignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.npmignore b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/.template.npmignore similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/.template.npmignore rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/.template.npmignore diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/README.template.md b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/README.template.md similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/README.template.md rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/README.template.md diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/bin/%name%.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/bin/%name%.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/bin/%name%.template.ts diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/cdk.template.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/cdk.template.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/cdk.template.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/cdk.template.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/jest.config.js b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/jest.config.js similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/jest.config.js rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/jest.config.js diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/lib/%name%-stack.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/lib/%name%-stack.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/lib/%name%-stack.template.ts diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/package.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/package.json diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/test/%name%.test.template.ts b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/test/%name%.test.template.ts similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/test/%name%.test.template.ts rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/test/%name%.test.template.ts diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/tsconfig.json b/packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/tsconfig.json similarity index 100% rename from packages/aws-cdk/lib/init-templates/sample-app/typescript/tsconfig.json rename to packages/@aws-cdk/tmp-toolkit-helpers/resources/init-templates/sample-app/typescript/tsconfig.json diff --git a/packages/@aws-cdk/tmp-toolkit-helpers/tsconfig.json b/packages/@aws-cdk/tmp-toolkit-helpers/tsconfig.json new file mode 100644 index 0000000000000..b831b29f8eed8 --- /dev/null +++ b/packages/@aws-cdk/tmp-toolkit-helpers/tsconfig.json @@ -0,0 +1,31 @@ +{ + "compilerOptions": { + "esModuleInterop": true, + "skipLibCheck": true, + "target": "es2022", + "allowJs": true, + "resolveJsonModule": true, + "moduleDetection": "force", + "isolatedModules": true, + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noImplicitReturns": true, + "noUncheckedIndexedAccess": false, + "noImplicitOverride": false, + "module": "NodeNext", + "declaration": true, + "declarationMap": true, + "inlineSourceMap": true, + "lib": ["es2022"], + "composite": true, + "tsBuildInfoFile": "tsconfig.tsbuildinfo" + }, + "include": ["**/*.ts", "resources/init-templates/**/*.hook.ts"], + "exclude": [ + "node_modules", + "**/*.d.ts", + "resources/init-templates/**/typescript/*/*.ts" + ], + "references": [{ "path": "../cx-api" }, { "path": "../cloudformation-diff" }] +} diff --git a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md index df822c4f90c1f..8f7cbe99eaf0d 100644 --- a/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md +++ b/packages/aws-cdk-lib/cx-api/FEATURE_FLAGS.md @@ -84,8 +84,8 @@ Flags come in three types: | [@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault](#aws-cdkaws-ec2bastionhostuseamazonlinux2023bydefault) | When enabled, the BastionHost construct will use the latest Amazon Linux 2023 AMI, instead of Amazon Linux 2. | 2.172.0 | (default) | | [@aws-cdk/core:aspectStabilization](#aws-cdkcoreaspectstabilization) | When enabled, a stabilization loop will be run when invoking Aspects during synthesis. | 2.172.0 | (config) | | [@aws-cdk/aws-route53-targets:userPoolDomainNameMethodWithoutCustomResource](#aws-cdkaws-route53-targetsuserpooldomainnamemethodwithoutcustomresource) | When enabled, use a new method for DNS Name of user pool domain target without creating a custom resource. | 2.174.0 | (fix) | -| [@aws-cdk/aws-ecs:disableEcsImdsBlocking](#aws-cdkaws-ecsdisableecsimdsblocking) | When set to true, CDK synth will throw exception if canContainersAccessInstanceRole is false. **IMPORTANT: See [details.](#aws-cdkaws-ecsdisableEcsImdsBlocking)** | V2NEXT | (temporary) | -| [@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature](#aws-cdkaws-ecsenableimdsblockingdeprecatedfeature) | When set to true along with canContainersAccessInstanceRole=false in ECS cluster, new updated commands will be added to UserData to block container accessing IMDS. **Applicable to Linux only. IMPORTANT: See [details.](#aws-cdkaws-ecsenableImdsBlockingDeprecatedFeature)** | V2NEXT | (temporary) | +| [@aws-cdk/aws-ecs:disableEcsImdsBlocking](#aws-cdkaws-ecsdisableecsimdsblocking) | When set to true, CDK synth will throw exception if canContainersAccessInstanceRole is false. **IMPORTANT: See [details.](#aws-cdkaws-ecsdisableEcsImdsBlocking)** | 2.175.0 | (temporary) | +| [@aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature](#aws-cdkaws-ecsenableimdsblockingdeprecatedfeature) | When set to true along with canContainersAccessInstanceRole=false in ECS cluster, new updated commands will be added to UserData to block container accessing IMDS. **Applicable to Linux only. IMPORTANT: See [details.](#aws-cdkaws-ecsenableImdsBlockingDeprecatedFeature)** | 2.175.0 | (temporary) | | [@aws-cdk/aws-elasticloadbalancingV2:albDualstackWithoutPublicIpv4SecurityGroupRulesDefault](#aws-cdkaws-elasticloadbalancingv2albdualstackwithoutpublicipv4securitygrouprulesdefault) | When enabled, the default security group ingress rules will allow IPv6 ingress from anywhere | V2NEXT | (fix) | @@ -240,6 +240,7 @@ different environments). This means that the name of the synthesized template file will be based on the construct path and not on the defined `stackName` of the stack. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.16.0 | `false` | `true` | @@ -247,6 +248,7 @@ of the stack. **Compatibility with old behavior:** Pass stack identifiers to the CLI instead of stack names. + ### aws-cdk:enableDiffNoFail *Make `cdk diff` not fail when there are differences* (default) @@ -254,13 +256,14 @@ of the stack. Determines what status code `cdk diff` should return when the specified stack differs from the deployed stack or the local CloudFormation template: -- `aws-cdk:enableDiffNoFail=true` => status code == 0 -- `aws-cdk:enableDiffNoFail=false` => status code == 1 +* `aws-cdk:enableDiffNoFail=true` => status code == 0 +* `aws-cdk:enableDiffNoFail=false` => status code == 1 You can override this behavior with the --fail flag: -- `--fail` => status code == 1 -- `--no-fail` => status code == 0 +* `--fail` => status code == 1 +* `--no-fail` => status code == 0 + | Since | Default | Recommended | | ----- | ----- | ----- | @@ -269,6 +272,7 @@ You can override this behavior with the --fail flag: **Compatibility with old behavior:** Specify `--fail` to the CLI. + ### @aws-cdk/aws-ecr-assets:dockerIgnoreSupport *DockerImageAsset properly supports `.dockerignore` files by default* (default) @@ -280,6 +284,7 @@ is standard Docker ignore semantics. This is a feature flag as the old behavior was technically incorrect but users may have come to depend on it. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.73.0 | `false` | `true` | @@ -287,6 +292,7 @@ users may have come to depend on it. **Compatibility with old behavior:** Update your `.dockerignore` file to match standard Docker ignore rules, if necessary. + ### @aws-cdk/aws-secretsmanager:parseOwnedSecretName *Fix the referencing of SecretsManager names from ARNs* (default) @@ -297,6 +303,7 @@ rather than the default full resource name, which includes the SecretsManager su If this flag is not set, Secret.secretName will include the SecretsManager suffix, which cannot be directly used by SecretsManager.DescribeSecret, and must be parsed by the user first (e.g., Fn:Join, Fn:Select, Fn:Split). + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.77.0 | `false` | `true` | @@ -304,6 +311,7 @@ used by SecretsManager.DescribeSecret, and must be parsed by the user first (e.g **Compatibility with old behavior:** Use `parseArn(secret.secretName).resourceName` to emulate the incorrect old parsing. + ### @aws-cdk/aws-kms:defaultKeyPolicies *Tighten default KMS key policies* (default) @@ -320,6 +328,7 @@ true, the policy matches what happens when this feature flag is set. Additionally, if this flag is not set and the user supplies a custom key policy, this will be appended to the key's default policy (rather than replacing it). + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.78.0 | `false` | `true` | @@ -327,6 +336,7 @@ to the key's default policy (rather than replacing it). **Compatibility with old behavior:** Pass `trustAccountIdentities: false` to `Key` construct to restore the old behavior. + ### @aws-cdk/aws-s3:grantWriteWithoutAcl *Remove `PutObjectAcl` from Bucket.grantWrite* (default) @@ -337,6 +347,7 @@ which could be used to grant read/write object access to IAM principals in other Use a feature flag to make sure existing customers who might be relying on the overly-broad permissions are not broken. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.85.0 | `false` | `true` | @@ -344,6 +355,7 @@ on the overly-broad permissions are not broken. **Compatibility with old behavior:** Call `bucket.grantPutAcl()` in addition to `bucket.grantWrite()` to grant ACL permissions. + ### @aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount *Do not specify a default DesiredCount for ECS services* (default) @@ -358,6 +370,7 @@ If this flag is not set, the default behaviour for CfnService.desiredCount is to desiredCount of 1, if one is not provided. If true, a default will not be defined for CfnService.desiredCount and as such desiredCount will be undefined, if one is not provided. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.92.0 | `false` | `true` | @@ -365,12 +378,14 @@ CfnService.desiredCount and as such desiredCount will be undefined, if one is no **Compatibility with old behavior:** You can pass `desiredCount: 1` explicitly, but you should never need this. + ### @aws-cdk/aws-efs:defaultEncryptionAtRest *Enable this feature flag to have elastic file systems encrypted at rest by default.* (default) Encryption can also be configured explicitly using the `encrypted` property. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.98.0 | `false` | `true` | @@ -378,6 +393,7 @@ Encryption can also be configured explicitly using the `encrypted` property. **Compatibility with old behavior:** Pass the `encrypted: false` property to the `FileSystem` construct to disable encryption. + ### @aws-cdk/core:newStyleStackSynthesis *Switch to new stack synthesis method which enables CI/CD* (fix) @@ -385,11 +401,13 @@ Encryption can also be configured explicitly using the `encrypted` property. If this flag is specified, all `Stack`s will use the `DefaultStackSynthesizer` by default. If it is not set, they will use the `LegacyStackSynthesizer`. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.39.0 | `false` | `true` | | 2.0.0 | `true` | `true` | + ### @aws-cdk/core:stackRelativeExports *Name exports based on the construct paths relative to the stack, rather than the global construct path* (fix) @@ -399,11 +417,13 @@ ensure uniqueness, and makes the export names robust against refactoring the location of the stack in the construct tree (specifically, moving the Stack into a Stage). + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.58.0 | `false` | `true` | | 2.0.0 | `true` | `true` | + ### @aws-cdk/aws-rds:lowercaseDbIdentifier *Force lowercasing of RDS Cluster names in CDK* (fix) @@ -418,11 +438,13 @@ Must be behind a permanent flag because changing a name from mixed case to lower would lead CloudFormation to think the name was changed and would trigger a cluster replacement (losing data!). + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.97.0 | `false` | `true` | | 2.0.0 | `true` | `true` | + ### @aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId *Allow adding/removing multiple UsagePlanKeys independently* (fix) @@ -440,11 +462,13 @@ which again is disallowed. In effect, there is no way to get out of this mess in a backwards compatible way, while supporting existing stacks. This flag changes the logical id layout of UsagePlanKey to not be sensitive to order. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.98.0 | `false` | `true` | | 2.0.0 | `true` | `true` | + ### @aws-cdk/aws-lambda:recognizeVersionProps *Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`.* (fix) @@ -454,22 +478,26 @@ not constitute creating a new Version. See 'currentVersion' section in the aws-lambda module's README for more details. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.106.0 | `false` | `true` | | 2.0.0 | `true` | `true` | + ### @aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021 *Enable this feature flag to have cloudfront distributions use the security policy TLSv1.2_2021 by default.* (fix) The security policy can also be configured explicitly using the `minimumProtocolVersion` property. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.117.0 | `false` | `true` | | 2.0.0 | `true` | `true` | + ### @aws-cdk/core:target-partitions *What regions to include in lookup tables of environment agnostic stacks* (config) @@ -479,11 +507,13 @@ of unnecessary regions included in stacks without a known region. The type of this value should be a list of strings. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.137.0 | `false` | `["aws","aws-cn"]` | | 2.4.0 | `false` | `["aws","aws-cn"]` | + ### @aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver *ECS extensions will automatically add an `awslogs` driver if no logging is specified* (default) @@ -493,6 +523,7 @@ Enable this feature flag to configure default logging behavior for the ECS Servi This is a feature flag as the new behavior provides a better default experience for the users. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.140.0 | `false` | `true` | @@ -500,6 +531,7 @@ This is a feature flag as the new behavior provides a better default experience **Compatibility with old behavior:** Specify a log driver explicitly. + ### @aws-cdk/aws-ec2:uniqueImdsv2TemplateName *Enable this feature flag to have Launch Templates generated by the `InstanceRequireImdsv2Aspect` use unique names.* (fix) @@ -510,11 +542,13 @@ account and region, the deployments would always fail as the generated Launch Te The new implementation addresses this issue by generating the Launch Template name with the `Names.uniqueId` method. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.140.0 | `false` | `true` | | 2.8.0 | `false` | `true` | + ### @aws-cdk/aws-iam:minimizePolicies *Minimize IAM policies by combining Statements* (config) @@ -523,11 +557,13 @@ Minimize IAM policies by combining Principals, Actions and Resources of two Statements in the policies, as long as it doesn't change the meaning of the policy. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.150.0 | `false` | `true` | | 2.18.0 | `false` | `true` | + ### @aws-cdk/core:checkSecretUsage *Enable this flag to make it impossible to accidentally use SecretValues in unsafe locations* (config) @@ -536,11 +572,13 @@ With this flag enabled, `SecretValue` instances can only be passed to constructs that accept `SecretValue`s; otherwise, `unsafeUnwrap()` must be called to use it as a regular string. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.153.0 | `false` | `true` | | 2.21.0 | `false` | `true` | + ### @aws-cdk/aws-lambda:recognizeLayerVersion *Enable this feature flag to opt in to the updated logical id calculation for Lambda Version created using the `fn.currentVersion`.* (fix) @@ -549,11 +587,13 @@ This flag correct incorporates Lambda Layer properties into the Lambda Function See 'currentVersion' section in the aws-lambda module's README for more details. + | Since | Default | Recommended | | ----- | ----- | ----- | | 1.159.0 | `false` | `true` | | 2.27.0 | `false` | `true` | + ### @aws-cdk/core:validateSnapshotRemovalPolicy *Error on snapshot removal policies on resources that do not support it.* (default) @@ -563,6 +603,7 @@ If supplied on an unsupported resource, CloudFormation ignores the policy altoge This flag will reduce confusion and unexpected loss of data when erroneously supplying the snapshot removal policy. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -570,6 +611,7 @@ the snapshot removal policy. **Compatibility with old behavior:** The old behavior was incorrect. Update your source to not specify SNAPSHOT policies on resources that do not support it. + ### @aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName *Generate key aliases that include the stack name* (fix) @@ -581,11 +623,13 @@ the KMS key alias name created for these pipelines may be the same due to how th This new implementation creates a stack safe resource name for the alias using the stack name instead of the stack ID. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.29.0 | `false` | `true` | + ### @aws-cdk/aws-s3:createDefaultLoggingPolicy *Enable this feature flag to create an S3 bucket policy by default in cases where an AWS service would automatically create the Policy if one does not exist.* (fix) @@ -599,13 +643,15 @@ and error indicating that a bucket policy already exists. In cases where we know what the required policy is we can go ahead and create the policy so we can remain in control of it. -@see +@see https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/AWS-logs-and-resource-policy.html#AWS-logs-infrastructure-S3 + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.31.0 | `false` | `true` | + ### @aws-cdk/aws-sns-subscriptions:restrictSqsDescryption *Restrict KMS key policy for encrypted Queues a bit more* (fix) @@ -617,11 +663,13 @@ Previously the decryption was only restricted to the SNS service principal. To m secure, it is a good practice to restrict the decryption further and only allow the connected SNS topic to decryption the subscribed queue. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.32.0 | `false` | `true` | + ### @aws-cdk/aws-ecs:arnFormatIncludesClusterName *ARN format used by ECS. In the new ARN format, the cluster name is part of the resource ID.* (fix) @@ -631,31 +679,35 @@ If this flag is set, the new ARN format (with cluster name) for ECS is used. This is a feature flag as the old format is still valid for existing ECS clusters. -See +See https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-account-settings.html#ecs-resource-ids + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.35.0 | `false` | `true` | + ### @aws-cdk/aws-apigateway:disableCloudWatchRole *Make default CloudWatch Role behavior safe for multiple API Gateways in one environment* (fix) Enable this feature flag to change the default behavior for aws-apigateway.RestApi and aws-apigateway.SpecRestApi -to *not* create a CloudWatch role and Account. There is only a single ApiGateway account per AWS +to _not_ create a CloudWatch role and Account. There is only a single ApiGateway account per AWS environment which means that each time you create a RestApi in your account the ApiGateway account is overwritten. If at some point the newest RestApi is deleted, the ApiGateway Account and CloudWatch role will also be deleted, breaking any existing ApiGateways that were depending on them. When this flag is enabled you should either create the ApiGateway account and CloudWatch role -separately *or* only enable the cloudWatchRole on a single RestApi. +separately _or_ only enable the cloudWatchRole on a single RestApi. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.38.0 | `false` | `true` | + ### @aws-cdk/core:enablePartitionLiterals *Make ARNs concrete if AWS partition is known* (fix) @@ -684,11 +736,13 @@ Principal: The intrinsic function will still be used in Stacks where no region is defined or the region's partition is unknown. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.38.0 | `false` | `true` | + ### @aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker *Avoid setting the "ECS" deployment controller when adding a circuit breaker* (fix) @@ -699,11 +753,13 @@ This does not change any behaviour as the default deployment controller when it This is a feature flag as the new behavior provides a better default experience for the users. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.51.0 | `false` | `true` | + ### @aws-cdk/aws-events:eventsTargetQueueSameAccount *Event Rules may only push to encrypted SQS queues in the same account* (fix) @@ -712,11 +768,13 @@ This flag applies to SQS Queues that are used as the target of event Rules. When from the same account as the Rule can send messages. If a queue is unencrypted, this restriction will always apply, regardless of the value of this flag. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.51.0 | `false` | `true` | + ### @aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName *Enable this feature to by default create default policy names for imported roles that depend on the stack the role is in.* (fix) @@ -727,11 +785,13 @@ of a role using the same default policy name. This new implementation creates default policy names based on the constructs node path in their stack. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.60.0 | `false` | `true` | + ### @aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy *Use S3 Bucket Policy instead of ACLs for Server Access Logging* (fix) @@ -743,13 +803,15 @@ enabled on the bucket. This flag uses a Bucket Policy statement to allow Server Access Log delivery, following best practices for S3. -@see +@see https://docs.aws.amazon.com/AmazonS3/latest/userguide/enable-server-access-logging.html + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.60.0 | `false` | `true` | + ### @aws-cdk/customresources:installLatestAwsSdkDefault *Whether to install the latest SDK by default in AwsCustomResource* (default) @@ -761,6 +823,7 @@ do not have internet access, or in environments where 'npmjs.com' is not availab The recommended setting is to disable the default installation behavior, and pass the flag on a resource-by-resource basis to enable it if necessary. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -768,6 +831,7 @@ flag on a resource-by-resource basis to enable it if necessary. **Compatibility with old behavior:** Set installLatestAwsSdk: true on all resources that need it. + ### @aws-cdk/aws-route53-patters:useCertificate *Use the official `Certificate` resource instead of `DnsValidatedCertificate`* (default) @@ -777,6 +841,7 @@ of the deprecated `DnsValidatedCertificate` construct. If this flag is enabled a the stack in a region other than us-east-1 then you must also set `crossRegionReferences=true` on the stack. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -784,6 +849,7 @@ stack. **Compatibility with old behavior:** Define a `DnsValidatedCertificate` explicitly and pass in the `certificate` property + ### @aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup *Remove CloudWatch alarms from deployment group* (fix) @@ -792,11 +858,13 @@ Enable this flag to be able to remove all CloudWatch alarms from a deployment gr the alarms from the construct. If this flag is not set, removing all alarms from the construct will still leave the alarms configured for the deployment group. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.65.0 | `false` | `true` | + ### @aws-cdk/aws-rds:databaseProxyUniqueResourceName *Use unique resource name for Database Proxy* (fix) @@ -809,11 +877,13 @@ If this flag is set, the default behavior is to use unique resource names for ea This is a feature flag as the old behavior was technically incorrect, but users may have come to depend on it. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.65.0 | `false` | `true` | + ### @aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId *Include authorizer configuration in the calculation of the API deployment logical ID.* (fix) @@ -823,11 +893,13 @@ the API configuration, including methods, and resources, etc. Enable this featur to also include the configuration of any authorizer attached to the API in the calculation, so any changes made to an authorizer will create a new deployment. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.66.0 | `false` | `true` | + ### @aws-cdk/aws-ec2:launchTemplateDefaultUserData *Define user data for a launch template by default when a machine image is provided.* (fix) @@ -836,11 +908,13 @@ The ec2.LaunchTemplate construct did not define user data when a machine image i provided despite the document. If this is set, a user data is automatically defined according to the OS of the machine image. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.67.0 | `false` | `true` | + ### @aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments *SecretTargetAttachments uses the ResourcePolicy of the attached Secret.* (fix) @@ -856,11 +930,13 @@ This won't be possible without intervention due to limitation outlined above. First remove all permissions granted to the Secret and deploy without the ResourcePolicies. Then you can re-add the permissions and deploy again. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.67.0 | `false` | `true` | + ### @aws-cdk/aws-redshift:columnId *Whether to use an ID to track Redshift column changes* (fix) @@ -877,11 +953,13 @@ than their `name`. This will prevent data loss when columns are renamed. initial deployment, the columns will be dropped and recreated, causing data loss. After the initial deployment of the `id`s, the `name`s of the columns can be changed without data loss. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.68.0 | `false` | `true` | + ### @aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2 *Enable AmazonEMRServicePolicy_v2 managed policies* (fix) @@ -895,11 +973,13 @@ managed policies. This is a feature flag as the old behavior will be deprecated, but some resources may require manual intervention since they might not have the appropriate tags propagated automatically. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.72.0 | `false` | `true` | + ### @aws-cdk/aws-apigateway:requestValidatorUniqueId *Generate a unique id for each RequestValidator added to a method* (fix) @@ -910,11 +990,13 @@ providing the `RequestValidatorOptions` in the `addMethod()` method. If the flag is not set then only a single RequestValidator can be added in this way. Any additional RequestValidators have to be created directly with `new RequestValidator`. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.78.0 | `false` | `true` | + ### @aws-cdk/aws-ec2:restrictDefaultSecurityGroup *Restrict access to the VPC default security group* (default) @@ -924,17 +1006,20 @@ VPC default security group. When a VPC is created, a default security group is created as well and this cannot be deleted. The default security group is created with ingress/egress rules that allow -*all* traffic. [AWS Security best practices recommend](https://docs.aws.amazon.com/securityhub/latest/userguide/ec2-controls.html#ec2-2) +_all_ traffic. [AWS Security best practices recommend](https://docs.aws.amazon.com/securityhub/latest/userguide/ec2-controls.html#ec2-2) removing these ingress/egress rules in order to restrict access to the default security group. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.78.0 | `false` | `true` | -**Compatibility with old behavior:** +**Compatibility with old behavior:** To allow all ingress/egress traffic to the VPC default security group you can set the `restrictDefaultSecurityGroup: false`. + + ### @aws-cdk/aws-kms:aliasNameRef @@ -946,11 +1031,13 @@ when referencing key.aliasName or key.keyArn. If the flag is not set then a raw string is passed as the Alias name and no implicit dependencies will be set. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.83.0 | `false` | `true` | + ### @aws-cdk/core:includePrefixInUniqueNameGeneration *Include the stack prefix in the stack name generation process* (fix) @@ -964,11 +1051,13 @@ If the flag is not set, then the prefix of the stack is prepended to the generat feature flag can lead to a change in stacks' name. Changing a stack name mean recreating the whole stack, which is not viable in some productive setups. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.84.0 | `false` | `true` | + ### @aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig *Generate a launch template when creating an AutoScalingGroup* (fix) @@ -981,14 +1070,17 @@ will now create an equivalent 'launchTemplate'. Alternatively, users can provide attempt to set user data according to the OS of the machine image if explicit user data is not provided. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.88.0 | `false` | `true` | -**Compatibility with old behavior:** +**Compatibility with old behavior:** If backwards compatibility needs to be maintained due to an existing autoscaling group using a launch config, set this flag to false. + + ### @aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby @@ -997,6 +1089,7 @@ provided. If this is set, an opensearch domain will automatically be created with multi-az with standby enabled. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1004,6 +1097,7 @@ multi-az with standby enabled. **Compatibility with old behavior:** Pass `capacity.multiAzWithStandbyEnabled: false` to `Domain` construct to restore the old behavior. + ### @aws-cdk/aws-efs:denyAnonymousAccess *EFS denies anonymous clients accesses* (default) @@ -1014,6 +1108,7 @@ access to `efs.FileSystem`. If this flag is not set, `efs.FileSystem` will allow all anonymous clients that can access over the network. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1021,6 +1116,7 @@ that can access over the network. **Compatibility with old behavior:** You can pass `allowAnonymousAccess: true` so allow anonymous clients access. + ### @aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId *When enabled, mount targets will have a stable logicalId that is linked to the associated subnet.* (fix) @@ -1032,11 +1128,13 @@ subnets changes. Set this flag to false for existing mount targets. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.93.0 | `false` | `true` | + ### @aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion *Enables aws-lambda-nodejs.Function to use the latest available NodeJs runtime as the default* (default) @@ -1046,6 +1144,7 @@ functions will us the latest version of the runtime provided by the Lambda service. Do not use this if you your lambda function is reliant on dependencies shipped as part of the runtime environment. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1053,6 +1152,7 @@ shipped as part of the runtime environment. **Compatibility with old behavior:** Pass `runtime: lambda.Runtime.NODEJS_16_X` to `Function` construct to restore the previous behavior. + ### @aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier *When enabled, will always use the arn for identifiers for CfnSourceApiAssociation in the GraphqlApi construct rather than id.* (fix) @@ -1061,11 +1161,13 @@ When this feature flag is enabled, we use the IGraphqlApi ARN rather than ID whe the GraphqlApi construct. Using the ARN allows the association to support an association with a source api or merged api in another account. Note that for existing source api associations created with this flag disabled, enabling the flag will lead to a resource replacement. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.97.0 | `false` | `true` | + ### @aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters *When enabled, a scope of InstanceParameterGroup for AuroraClusterInstance with each parameters will change.* (fix) @@ -1077,11 +1179,13 @@ from AuroraCluster. If the flag is set to false then it can only make one `AuroraClusterInstance` with each `InstanceParameterGroup` in the AuroraCluster. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.97.0 | `false` | `true` | + ### @aws-cdk/aws-rds:preventRenderingDeprecatedCredentials *When enabled, creating an RDS database cluster from a snapshot will only render credentials for snapshot credentials.* (fix) @@ -1099,11 +1203,13 @@ Set this flag to prevent rendering deprecated `credentials` and creating an extra database secret when only using `snapshotCredentials` to create an RDS database cluster from a snapshot. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.98.0 | `false` | `true` | + ### @aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource *When enabled, the CodeCommit source action is using the default branch name 'main'.* (fix) @@ -1112,11 +1218,13 @@ When setting up a CodeCommit source action for the source stage of a pipeline, p default branch is 'master'. However, with the activation of this feature flag, the default branch is updated to 'main'. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.103.1 | `false` | `true` | + ### @aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction *When enabled, the logical ID of a Lambda permission for a Lambda action includes an alarm ID.* (fix) @@ -1128,11 +1236,13 @@ can be created with `LambdaAction`. If the flag is set to false then it can only make one alarm for the Lambda with `LambdaAction`. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.124.0 | `false` | `true` | + ### @aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse *Enables Pipeline to set the default value for crossAccountKeys to false.* (default) @@ -1140,6 +1250,7 @@ If the flag is set to false then it can only make one alarm for the Lambda with When this feature flag is enabled, and the `crossAccountKeys` property is not provided in a `Pipeline` construct, the construct automatically defaults the value of this property to false. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1147,6 +1258,7 @@ construct, the construct automatically defaults the value of this property to fa **Compatibility with old behavior:** Pass `crossAccountKeys: true` to `Pipeline` construct to restore the previous behavior. + ### @aws-cdk/aws-codepipeline:defaultPipelineTypeToV2 *Enables Pipeline to set the default pipeline type to V2.* (default) @@ -1154,6 +1266,7 @@ construct, the construct automatically defaults the value of this property to fa When this feature flag is enabled, and the `pipelineType` property is not provided in a `Pipeline` construct, the construct automatically defaults the value of this property to `PipelineType.V2`. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1161,6 +1274,7 @@ construct, the construct automatically defaults the value of this property to `P **Compatibility with old behavior:** Pass `pipelineType: PipelineType.V1` to `Pipeline` construct to restore the previous behavior. + ### @aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope *When enabled, IAM Policy created from KMS key grant will reduce the resource scope to this key only.* (fix) @@ -1168,11 +1282,13 @@ construct, the construct automatically defaults the value of this property to `P When this feature flag is enabled and calling KMS key grant method, the created IAM policy will reduce the resource scope from '*' to this specific granting KMS key. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.134.0 | `false` | `true` | + ### @aws-cdk/aws-eks:nodegroupNameAttribute *When enabled, nodegroupName attribute of the provisioned EKS NodeGroup will not have the cluster name prefix.* (fix) @@ -1180,17 +1296,20 @@ When this feature flag is enabled and calling KMS key grant method, the created When this feature flag is enabled, the nodegroupName attribute will be exactly the name of the nodegroup without any prefix. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.139.0 | `false` | `true` | + ### @aws-cdk/aws-ec2:ebsDefaultGp3Volume *When enabled, the default volume type of the EBS volume will be GP3* (default) When this featuer flag is enabled, the default volume type of the EBS volume will be `EbsDeviceVolumeType.GENERAL_PURPOSE_SSD_GP3`. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1198,6 +1317,7 @@ When this featuer flag is enabled, the default volume type of the EBS volume wil **Compatibility with old behavior:** Pass `volumeType: EbsDeviceVolumeType.GENERAL_PURPOSE_SSD` to `Volume` construct to restore the previous behavior. + ### @aws-cdk/pipelines:reduceAssetRoleTrustScope *Remove the root account principal from PipelineAssetsFileRole trust policy* (default) @@ -1205,6 +1325,7 @@ When this featuer flag is enabled, the default volume type of the EBS volume wil When this feature flag is enabled, the root account principal will not be added to the trust policy of asset role. When this feature flag is disabled, it will keep the root account principal in the trust policy. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1212,12 +1333,14 @@ When this feature flag is disabled, it will keep the root account principal in t **Compatibility with old behavior:** Disable the feature flag to add the root account principal back + ### @aws-cdk/aws-ecs:removeDefaultDeploymentAlarm *When enabled, remove default deployment alarm settings* (default) When this featuer flag is enabled, remove the default deployment alarm settings when creating a AWS ECS service. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1225,6 +1348,7 @@ When this featuer flag is enabled, remove the default deployment alarm settings **Compatibility with old behavior:** Set AWS::ECS::Service 'DeploymentAlarms' manually to restore the previous behavior. + ### @aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault *When enabled, the custom resource used for `AwsCustomResource` will configure the `logApiResponseData` property as true by default* (fix) @@ -1232,17 +1356,19 @@ When this featuer flag is enabled, remove the default deployment alarm settings This results in 'logApiResponseData' being passed as true to the custom resource provider. This will cause the custom resource handler to receive an 'Update' event. If you don't have an SDK call configured for the 'Update' event and you're dependent on specific SDK call response data, you will see this error from CFN: -CustomResource attribute error: Vendor response doesn't contain attribute in object. See ) for more details. +CustomResource attribute error: Vendor response doesn't contain attribute in object. See https://github.com/aws/aws-cdk/issues/29949) for more details. Unlike most feature flags, we don't recommend setting this feature flag to true. However, if you're using the 'AwsCustomResource' construct with 'logApiResponseData' as true in the event object, then setting this feature flag will keep this behavior. Otherwise, setting this feature flag to false will trigger an 'Update' event by removing the 'logApiResponseData' property from the event object. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.145.0 | `false` | `false` | + ### @aws-cdk/aws-s3:keepNotificationInImportedBucket *When enabled, Adding notifications to a bucket in the current stack will not remove notification from imported stack.* (fix) @@ -1252,11 +1378,13 @@ Currently, adding notifications to a bucket where it was created by ourselves wi When this feature flag is enabled, adding notifications to a bucket in the current stack will only update notification defined in this stack. Other notifications that are not managed by this stack will be kept. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.155.0 | `false` | `false` | + ### @aws-cdk/aws-stepfunctions-tasks:useNewS3UriParametersForBedrockInvokeModelTask *When enabled, use new props for S3 URI field in task definition of state machine for bedrock invoke model.* (fix) @@ -1267,6 +1395,7 @@ of State Machine Task definition. When this feature flag is enabled, specify newly introduced props 's3InputUri' and 's3OutputUri' to populate S3 uri under input and output fields in state machine task definition for Bedrock invoke model. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1274,6 +1403,7 @@ When this feature flag is enabled, specify newly introduced props 's3InputUri' a **Compatibility with old behavior:** Disable the feature flag to use input and output path fields for s3 URI + ### @aws-cdk/aws-ecs:reduceEc2FargateCloudWatchPermissions *When enabled, we will only grant the necessary permissions when users specify cloudwatch log group through logConfiguration* (fix) @@ -1283,6 +1413,7 @@ specified as logConfiguration and it will grant 'Resources': ['*'] to the task r When this feature flag is enabled, we will only grant the necessary permissions when users specify cloudwatch log group. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1290,6 +1421,7 @@ When this feature flag is enabled, we will only grant the necessary permissions **Compatibility with old behavior:** Disable the feature flag to continue grant permissions to log group when no log group is specified + ### @aws-cdk/aws-ec2:ec2SumTImeoutEnabled *When enabled, initOptions.timeout and resourceSignalTimeout values will be summed together.* (fix) @@ -1299,11 +1431,13 @@ only the value from 'resourceSignalTimeout' will be used. When this feature flag is enabled, if both initOptions.timeout and resourceSignalTimeout are specified, the values will to be summed together. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.160.0 | `false` | `true` | + ### @aws-cdk/aws-appsync:appSyncGraphQLAPIScopeLambdaPermission *When enabled, a Lambda authorizer Permission created when using GraphqlApi will be properly scoped with a SourceArn.* (fix) @@ -1315,11 +1449,13 @@ it allows invocations from any source. When this feature flag is enabled, the AWS::Lambda::Permission will be properly scoped with the SourceArn corresponding to the specific AppSync GraphQL API. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.161.0 | `false` | `true` | + ### @aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages *When enabled, both `@aws-sdk` and `@smithy` packages will be excluded from the Lambda Node.js 18.x runtime to prevent version mismatches in bundled applications.* (fix) @@ -1330,11 +1466,13 @@ However, this can cause version mismatches between the '@aws-sdk/*' and '@smithy When this feature flag is enabled, both '@aws-sdk/*' and '@smithy/*' packages will be excluded during the bundling process. This ensures that no mismatches occur between these tightly coupled dependencies when using the AWS SDK v3 in Lambda functions. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.161.0 | `false` | `true` | + ### @aws-cdk/aws-rds:setCorrectValueForDatabaseInstanceReadReplicaInstanceResourceId *When enabled, the value of property `instanceResourceId` in construct `DatabaseInstanceReadReplica` will be set to the correct value which is `DbiResourceId` instead of currently `DbInstanceArn`* (fix) @@ -1343,6 +1481,7 @@ Currently, the value of the property 'instanceResourceId' in construct 'Database When this feature flag is enabled, the value of that property will be as expected set to 'DbiResourceId' attribute, and that will fix the grantConnect method. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1350,6 +1489,7 @@ When this feature flag is enabled, the value of that property will be as expecte **Compatibility with old behavior:** Disable the feature flag to use `DbInstanceArn` as value for property `instanceResourceId` + ### @aws-cdk/core:cfnIncludeRejectComplexResourceUpdateCreatePolicyIntrinsics *When enabled, CFN templates added with `cfn-include` will error if the template contains Resource Update or Create policies with CFN Intrinsics that include non-primitive values.* (fix) @@ -1358,11 +1498,13 @@ Without enabling this feature flag, `cfn-include` will silently drop resource up Enabling this feature flag will make `cfn-include` throw on these templates, unless you specify the logical ID of the resource in the 'unhydratedResources' property. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.161.0 | `false` | `true` | + ### @aws-cdk/aws-stepfunctions-tasks:fixRunEcsTaskPolicy *When enabled, the resource of IAM Run Ecs policy generated by SFN EcsRunTask will reference the definition, instead of constructing ARN.* (fix) @@ -1372,11 +1514,13 @@ The revision number at the end will be replaced with a wildcard which it shouldn When this feature flag is enabled, if the task definition is created in the stack, the 'Resource' section will 'Ref' the taskDefinition. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.163.0 | `false` | `true` | + ### @aws-cdk/aws-dynamodb:resourcePolicyPerReplica *When enabled will allow you to specify a resource policy per replica, and not copy the source table policy to all replicas* (fix) @@ -1388,11 +1532,13 @@ This will prevent you from creating a new table which has an additional replica This is a feature flag as the old behavior was technically incorrect but users may have come to depend on it. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.164.0 | `false` | `true` | + ### @aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault *When enabled, the BastionHost construct will use the latest Amazon Linux 2023 AMI, instead of Amazon Linux 2.* (default) @@ -1404,6 +1550,7 @@ and secure option. When this feature flag is enabled, if you do not pass the machineImage property to the BastionHost construct, the latest Amazon Linux 2023 version will be used instead of Amazon Linux 2. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1411,6 +1558,7 @@ the latest Amazon Linux 2023 version will be used instead of Amazon Linux 2. **Compatibility with old behavior:** Disable the feature flag or explicitly pass an Amazon Linux 2 machine image to the BastionHost construct. + ### @aws-cdk/core:aspectStabilization *When enabled, a stabilization loop will be run when invoking Aspects during synthesis.* (config) @@ -1420,11 +1568,13 @@ This means that the Aspects that create other Aspects are not run and Aspects th When this feature flag is enabled, a stabilization loop is run to recurse the construct tree multiple times when invoking Aspects. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.172.0 | `true` | `true` | + ### @aws-cdk/aws-route53-targets:userPoolDomainNameMethodWithoutCustomResource *When enabled, use a new method for DNS Name of user pool domain target without creating a custom resource.* (fix) @@ -1434,22 +1584,25 @@ creates a custom resource internally, but the new method doesn't need a custom r If the flag is set to false then a custom resource will be created when using `UserPoolDomainTarget`. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | | 2.174.0 | `false` | `true` | + ### @aws-cdk/aws-ecs:disableEcsImdsBlocking *When set to true, CDK synth will throw exception if canContainersAccessInstanceRole is false. **IMPORTANT: See [details.](#aws-cdkaws-ecsdisableEcsImdsBlocking)*** (temporary) In an ECS Cluster with `MachineImageType.AMAZON_LINUX_2`, the canContainersAccessInstanceRole=false option attempts to add commands to block containers from accessing IMDS. CDK cannot guarantee the correct execution of the feature in all platforms. Setting this feature flag -to true will ensure CDK does not attempt to implement IMDS blocking. By **end of 2025**, CDK will remove the +to true will ensure CDK does not attempt to implement IMDS blocking. By **end of 2025**, CDK will remove the IMDS blocking feature. See [Github discussion](https://github.com/aws/aws-cdk/discussions/32609) for more information. It is recommended to follow ECS documentation to block IMDS for your specific platform and cluster configuration. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1457,16 +1610,18 @@ It is recommended to follow ECS documentation to block IMDS for your specific pl **Compatibility with old behavior:** It is strongly recommended to set this flag to true. However, if necessary, set this flag to false to continue using the old implementation. + ### @aws-cdk/aws-ecs:enableImdsBlockingDeprecatedFeature *When set to true along with canContainersAccessInstanceRole=false in ECS cluster, new updated commands will be added to UserData to block container accessing IMDS. **Applicable to Linux only. IMPORTANT: See [details.](#aws-cdkaws-ecsenableImdsBlockingDeprecatedFeature)*** (temporary) In an ECS Cluster with `MachineImageType.AMAZON_LINUX_2`, the canContainersAccessInstanceRole=false option attempts to add commands to block containers from -accessing IMDS. Set this flag to true in order to use new and updated commands. Please note that this -feature alone with this feature flag will be deprecated by **end of 2025** as CDK cannot +accessing IMDS. Set this flag to true in order to use new and updated commands. Please note that this +feature alone with this feature flag will be deprecated by **end of 2025** as CDK cannot guarantee the correct execution of the feature in all platforms. See [Github discussion](https://github.com/aws/aws-cdk/discussions/32609) for more information. It is recommended to follow ECS documentation to block IMDS for your specific platform and cluster configuration. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1474,6 +1629,7 @@ It is recommended to follow ECS documentation to block IMDS for your specific pl **Compatibility with old behavior:** Set this flag to false in order to continue using old and outdated commands. However, it is **not** recommended. + ### @aws-cdk/aws-elasticloadbalancingV2:albDualstackWithoutPublicIpv4SecurityGroupRulesDefault *When enabled, the default security group ingress rules will allow IPv6 ingress from anywhere* (fix) @@ -1484,6 +1640,7 @@ will allow IPv6 ingress from anywhere (::/0). Previously, the default security g Using a feature flag to make sure existing customers who might be relying on the overly restrictive permissions are not broken. + | Since | Default | Recommended | | ----- | ----- | ----- | | (not in v1) | | | @@ -1491,4 +1648,5 @@ on the overly restrictive permissions are not broken. **Compatibility with old behavior:** Disable the feature flag to only allow IPv4 ingress in the default security group rules. + diff --git a/packages/aws-cdk-lib/recommended-feature-flags.json b/packages/aws-cdk-lib/recommended-feature-flags.json index 71285e804b547..4bb94bf0c6921 100644 --- a/packages/aws-cdk-lib/recommended-feature-flags.json +++ b/packages/aws-cdk-lib/recommended-feature-flags.json @@ -61,5 +61,6 @@ "@aws-cdk/aws-lambda-nodejs:sdkV3ExcludeSmithyPackages": true, "@aws-cdk/aws-stepfunctions-tasks:fixRunEcsTaskPolicy": true, "@aws-cdk/aws-ec2:bastionHostUseAmazonLinux2023ByDefault": true, - "@aws-cdk/aws-route53-targets:userPoolDomainNameMethodWithoutCustomResource": true + "@aws-cdk/aws-route53-targets:userPoolDomainNameMethodWithoutCustomResource": true, + "@aws-cdk/aws-elasticloadbalancingV2:albDualstackWithoutPublicIpv4SecurityGroupRulesDefault": true } \ No newline at end of file diff --git a/packages/aws-cdk/.eslintrc.js b/packages/aws-cdk/.eslintrc.js index 437c4f0c222e9..13fa8795c9c7f 100644 --- a/packages/aws-cdk/.eslintrc.js +++ b/packages/aws-cdk/.eslintrc.js @@ -1,5 +1,4 @@ const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc'); -baseConfig.ignorePatterns.push('lib/init-templates/**/typescript/**/*.ts'); -baseConfig.ignorePatterns.push('test/integ/cli/sam_cdk_integ_app/**/*.ts'); +baseConfig.ignorePatterns.push('resources/init-templates/**/typescript/**/*.ts'); baseConfig.parserOptions.project = __dirname + '/tsconfig.json'; module.exports = baseConfig; diff --git a/packages/aws-cdk/.gitignore b/packages/aws-cdk/.gitignore index d0b5e0796af72..698b3acb5e3fc 100644 --- a/packages/aws-cdk/.gitignore +++ b/packages/aws-cdk/.gitignore @@ -9,6 +9,7 @@ node_modules dist # Generated by generate.sh +resources/ build-info.json .LAST_BUILD diff --git a/packages/aws-cdk/.npmignore b/packages/aws-cdk/.npmignore index a287b2ba535b9..9e8c6cd7bd983 100644 --- a/packages/aws-cdk/.npmignore +++ b/packages/aws-cdk/.npmignore @@ -17,10 +17,6 @@ jest.config.js tsconfig.json .eslintrc.js -# init templates include default tsconfig.json files which we need -!lib/init-templates/**/tsconfig.json -!lib/init-templates/**/jest.config.js - !test/integ/**/* .DS_Store @@ -30,3 +26,8 @@ tsconfig.json junit.xml generate.sh + +# init templates include default tsconfig.json files which we need +!resources/ +!resources/init-templates/**/tsconfig.json +!resources/init-templates/**/jest.config.js diff --git a/packages/aws-cdk/generate.sh b/packages/aws-cdk/generate.sh index 9a74b49240b88..c9b47f2d6a93c 100755 --- a/packages/aws-cdk/generate.sh +++ b/packages/aws-cdk/generate.sh @@ -15,11 +15,8 @@ cat > build-info.json < lib/init-templates/.init-version.json - -# Copy the recommended-feature-flags.json file out from aws-cdk-lib. -path=$(node -p 'require.resolve("aws-cdk-lib/recommended-feature-flags.json")') -cp $path lib/init-templates/.recommended-feature-flags.json \ No newline at end of file +# Copy the various resource files from the Toolkit Helpers +path=$(node -p 'require.resolve("@aws-cdk/tmp-toolkit-helpers/package.json")') +toolkit=$(dirname $path) +rm -rf ./resources +cp -R $toolkit/resources/ ./resources/ diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts index 3f0db42c289ba..1e8eac34bfde3 100644 --- a/packages/aws-cdk/lib/cdk-toolkit.ts +++ b/packages/aws-cdk/lib/cdk-toolkit.ts @@ -1,29 +1,43 @@ import * as path from 'path'; import { format } from 'util'; import * as cxapi from '@aws-cdk/cx-api'; -import * as chalk from 'chalk'; -import * as chokidar from 'chokidar'; -import * as fs from 'fs-extra'; -import * as promptly from 'promptly'; -import * as uuid from 'uuid'; -import { DeploymentMethod, SuccessfulDeployStackResult } from './api'; -import { SdkProvider } from './api/aws-auth'; -import { Bootstrapper, BootstrapEnvironmentOptions } from './api/bootstrap'; +import { DeploymentMethod, SuccessfulDeployStackResult } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { SdkProvider } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth'; +import { Bootstrapper, BootstrapEnvironmentOptions } from '@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap'; import { CloudAssembly, DefaultSelection, ExtendedStackSelection, StackCollection, StackSelector, -} from './api/cxapp/cloud-assembly'; -import { CloudExecutable } from './api/cxapp/cloud-executable'; -import { Deployments } from './api/deployments'; -import { GarbageCollector } from './api/garbage-collection/garbage-collector'; -import { HotswapMode, HotswapPropertyOverrides, EcsHotswapProperties } from './api/hotswap/common'; -import { findCloudWatchLogGroups } from './api/logs/find-cloudwatch-logs'; -import { CloudWatchLogEventMonitor } from './api/logs/logs-monitor'; -import { createDiffChangeSet, ResourcesToImport } from './api/util/cloudformation'; -import { StackActivityProgress } from './api/util/cloudformation/stack-activity-monitor'; +} from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly'; +import { CloudExecutable } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-executable'; +import { environmentsFromDescriptors, globEnvironmentsFromStacks, looksLikeGlob } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/environments'; +import { Deployments, Tag } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { printSecurityDiff, printStackDiff, RequireApproval } from '@aws-cdk/tmp-toolkit-helpers/lib/api/diff'; +import { GarbageCollector } from '@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/garbage-collector'; +import { HotswapMode, HotswapPropertyOverrides, EcsHotswapProperties } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import { ResourceImporter, removeNonImportResources } from '@aws-cdk/tmp-toolkit-helpers/lib/api/import'; +import { listStacks } from '@aws-cdk/tmp-toolkit-helpers/lib/api/list-stacks'; +import { data, debug, error, highlight, info, success, warning, withCorkedLogging } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import { findCloudWatchLogGroups } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logs/find-cloudwatch-logs'; +import { CloudWatchLogEventMonitor } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logs/logs-monitor'; +import { Configuration, PROJECT_CONFIG } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; +import { createDiffChangeSet, ResourcesToImport } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; +import { StackActivityProgress } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-activity-monitor'; +import { ToolkitError } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error'; +import { numberFromBool, partition } from '@aws-cdk/tmp-toolkit-helpers/lib/util'; +import { formatErrorMessage } from '@aws-cdk/tmp-toolkit-helpers/lib/util/error'; +import { deserializeStructure, serializeStructure } from '@aws-cdk/tmp-toolkit-helpers/lib/util/serialize'; +import { validateSnsTopicArn } from '@aws-cdk/tmp-toolkit-helpers/lib/util/validate-notification-arn'; +import { Concurrency, WorkGraph } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph'; +import { WorkGraphBuilder } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-builder'; +import { AssetBuildNode, AssetPublishNode, StackNode } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-types'; +import * as chalk from 'chalk'; +import * as chokidar from 'chokidar'; +import * as fs from 'fs-extra'; +import * as promptly from 'promptly'; +import * as uuid from 'uuid'; import { generateCdkApp, generateStack, @@ -42,20 +56,6 @@ import { isThereAWarning, buildCfnClient, } from './commands/migrate'; -import { printSecurityDiff, printStackDiff, RequireApproval } from './diff'; -import { ResourceImporter, removeNonImportResources } from './import'; -import { listStacks } from './list-stacks'; -import { data, debug, error, highlight, info, success, warning, withCorkedLogging } from './logging'; -import { deserializeStructure, serializeStructure } from './serialize'; -import { Configuration, PROJECT_CONFIG } from './settings'; -import { ToolkitError } from './toolkit/error'; -import { numberFromBool, partition } from './util'; -import { formatErrorMessage } from './util/error'; -import { validateSnsTopicArn } from './util/validate-notification-arn'; -import { Concurrency, WorkGraph } from './util/work-graph'; -import { WorkGraphBuilder } from './util/work-graph-builder'; -import { AssetBuildNode, AssetPublishNode, StackNode } from './util/work-graph-types'; -import { environmentsFromDescriptors, globEnvironmentsFromStacks, looksLikeGlob } from '../lib/api/cxapp/environments'; // Must use a require() otherwise esbuild complains about calling a namespace // eslint-disable-next-line @typescript-eslint/no-require-imports @@ -833,7 +833,8 @@ export class CdkToolkit { selectors: string[], options: { long?: boolean; json?: boolean; showDeps?: boolean } = {}, ): Promise { - const stacks = await listStacks(this, { + const assembly = await this.assembly(); + const stacks = await listStacks(assembly, { selectors: selectors, }); @@ -1851,11 +1852,6 @@ function tagsForStack(stack: cxapi.CloudFormationStackArtifact): Tag[] { return Object.entries(stack.tags).map(([Key, Value]) => ({ Key, Value })); } -export interface Tag { - readonly Key: string; - readonly Value: string; -} - /** * Formats time in milliseconds (which we get from 'Date.getTime()') * to a human-readable time; returns time in seconds rounded to 2 diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 75ab612a8d828..5df80d339a60a 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -1,34 +1,34 @@ import * as cxapi from '@aws-cdk/cx-api'; import '@jsii/check-node/run'; +import { DeploymentMethod } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { SdkProvider } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth'; +import { SdkToCliLogger } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-logger'; +import { BootstrapSource, Bootstrapper } from '@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap'; + +import { StackSelector } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly'; +import { CloudExecutable, Synthesizer } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-executable'; +import { execProgram } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/exec'; +import { Deployments } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import { data, debug, error, info, setCI, setIoMessageThreshold } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import { Notices } from '@aws-cdk/tmp-toolkit-helpers/lib/api/notices'; +import { PluginHost } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin'; +import { Command, Configuration, Settings } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; +import { ToolkitInfo } from '@aws-cdk/tmp-toolkit-helpers/lib/api/toolkit-info'; +import { ILock } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/rwlock'; +import { IoMessageLevel, CliIoHost } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/cli-io-host'; +import { ToolkitError } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error'; +import { enableTracing } from '@aws-cdk/tmp-toolkit-helpers/lib/util/tracing'; import * as chalk from 'chalk'; -import { DeploymentMethod } from './api'; -import { HotswapMode } from './api/hotswap/common'; -import { ILock } from './api/util/rwlock'; +import { checkForPlatformWarnings } from './cli/platform-warnings'; +import { cliInit, printAvailableTemplates } from './commands/init'; import { parseCommandLineArguments } from './parse-command-line-arguments'; -import { checkForPlatformWarnings } from './platform-warnings'; -import { IoMessageLevel, CliIoHost } from './toolkit/cli-io-host'; - -import { enableTracing } from './util/tracing'; -import { SdkProvider } from '../lib/api/aws-auth'; -import { BootstrapSource, Bootstrapper } from '../lib/api/bootstrap'; -import { StackSelector } from '../lib/api/cxapp/cloud-assembly'; -import { CloudExecutable, Synthesizer } from '../lib/api/cxapp/cloud-executable'; -import { execProgram } from '../lib/api/cxapp/exec'; -import { Deployments } from '../lib/api/deployments'; -import { PluginHost } from '../lib/api/plugin'; -import { ToolkitInfo } from '../lib/api/toolkit-info'; import { CdkToolkit, AssetBuildTime } from '../lib/cdk-toolkit'; import { contextHandler as context } from '../lib/commands/context'; import { docs } from '../lib/commands/docs'; import { doctor } from '../lib/commands/doctor'; import { getMigrateScanType } from '../lib/commands/migrate'; -import { cliInit, printAvailableTemplates } from '../lib/init'; -import { data, debug, error, info, setCI, setIoMessageThreshold } from '../lib/logging'; -import { Notices } from '../lib/notices'; -import { Command, Configuration, Settings } from '../lib/settings'; import * as version from '../lib/version'; -import { SdkToCliLogger } from './api/aws-auth/sdk-logger'; -import { ToolkitError } from './toolkit/error'; /* eslint-disable max-len */ /* eslint-disable @typescript-eslint/no-shadow */ // yargs @@ -117,7 +117,7 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise { diff --git a/packages/aws-cdk/lib/init-hooks.ts b/packages/aws-cdk/lib/commands/init-hooks.ts similarity index 93% rename from packages/aws-cdk/lib/init-hooks.ts rename to packages/aws-cdk/lib/commands/init-hooks.ts index b3f1c4ec48024..20272d595a3ed 100644 --- a/packages/aws-cdk/lib/init-hooks.ts +++ b/packages/aws-cdk/lib/commands/init-hooks.ts @@ -1,7 +1,7 @@ import * as path from 'path'; -import { shell } from './os'; -import { ToolkitError } from './toolkit/error'; -import { formatErrorMessage } from './util/error'; +import { ToolkitError } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error'; +import { formatErrorMessage } from '@aws-cdk/tmp-toolkit-helpers/lib/util/error'; +import { shell } from '@aws-cdk/tmp-toolkit-helpers/lib/util/os'; export type SubstitutePlaceholders = (...fileNames: string[]) => Promise; diff --git a/packages/aws-cdk/lib/init.ts b/packages/aws-cdk/lib/commands/init.ts similarity index 97% rename from packages/aws-cdk/lib/init.ts rename to packages/aws-cdk/lib/commands/init.ts index fc91e3016a15c..4f402bcaf341b 100644 --- a/packages/aws-cdk/lib/init.ts +++ b/packages/aws-cdk/lib/commands/init.ts @@ -1,13 +1,13 @@ import * as childProcess from 'child_process'; import * as path from 'path'; +import { error, info, warning } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import { ToolkitError } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error'; +import { cdkHomeDir, rootDir } from '@aws-cdk/tmp-toolkit-helpers/lib/util/directories'; +import { formatErrorMessage } from '@aws-cdk/tmp-toolkit-helpers/lib/util/error'; +import { rangeFromSemver } from '@aws-cdk/tmp-toolkit-helpers/lib/util/version-range'; import * as chalk from 'chalk'; import * as fs from 'fs-extra'; import { invokeBuiltinHooks } from './init-hooks'; -import { error, info, warning } from './logging'; -import { ToolkitError } from './toolkit/error'; -import { cdkHomeDir, rootDir } from './util/directories'; -import { formatErrorMessage } from './util/error'; -import { rangeFromSemver } from './util/version-range'; /* eslint-disable @typescript-eslint/no-var-requires */ // Packages don't have @types module // eslint-disable-next-line @typescript-eslint/no-require-imports diff --git a/packages/aws-cdk/lib/commands/migrate.ts b/packages/aws-cdk/lib/commands/migrate.ts index 84733b9af9623..70bfdd7be0c69 100644 --- a/packages/aws-cdk/lib/commands/migrate.ts +++ b/packages/aws-cdk/lib/commands/migrate.ts @@ -4,6 +4,10 @@ import * as fs from 'fs'; import * as path from 'path'; import type { ForReading } from '@aws-cdk/cli-plugin-contract'; import { Environment, UNKNOWN_ACCOUNT, UNKNOWN_REGION } from '@aws-cdk/cx-api'; +import type { ICloudFormationClient, SdkProvider } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth'; +import { info } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import { CloudFormationStack } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; +import { zipDirectory } from '@aws-cdk/tmp-toolkit-helpers/lib/util/archive'; import type { DescribeGeneratedTemplateCommandOutput, DescribeResourceScanCommandOutput, @@ -18,11 +22,7 @@ import type { } from '@aws-sdk/client-cloudformation'; import * as cdk_from_cfn from 'cdk-from-cfn'; import * as chalk from 'chalk'; -import { cliInit } from '../../lib/init'; -import { info } from '../../lib/logging'; -import type { ICloudFormationClient, SdkProvider } from '../api/aws-auth'; -import { CloudFormationStack } from '../api/util/cloudformation'; -import { zipDirectory } from '../util/archive'; +import { cliInit } from './init'; const camelCase = require('camelcase'); const decamelize = require('decamelize'); /** The list of languages supported by the built-in noctilucent binary. */ diff --git a/packages/aws-cdk/lib/config.ts b/packages/aws-cdk/lib/config.ts index 2ef82baf3304e..7b4075a900655 100644 --- a/packages/aws-cdk/lib/config.ts +++ b/packages/aws-cdk/lib/config.ts @@ -1,11 +1,11 @@ +import { RequireApproval } from '@aws-cdk/tmp-toolkit-helpers/lib/api/diff'; +import { StackActivityProgress } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-activity-monitor'; // eslint-disable-next-line import/no-extraneous-dependencies import { CliHelpers, type CliConfig } from '@aws-cdk/user-input-gen'; -import { StackActivityProgress } from './api/util/cloudformation/stack-activity-monitor'; +import { availableInitLanguages } from './commands/init'; import { MIGRATE_SUPPORTED_LANGUAGES } from './commands/migrate'; -import { RequireApproval } from './diff'; -import { availableInitLanguages } from './init'; -export const YARGS_HELPERS = new CliHelpers('./util/yargs-helpers'); +export const YARGS_HELPERS = new CliHelpers('./cli/yargs-helpers'); /** * Source of truth for all CDK CLI commands. `user-input-gen` translates this into: diff --git a/packages/aws-cdk/lib/convert-to-user-input.ts b/packages/aws-cdk/lib/convert-to-user-input.ts index 4b400aa844424..7caa3153e85cd 100644 --- a/packages/aws-cdk/lib/convert-to-user-input.ts +++ b/packages/aws-cdk/lib/convert-to-user-input.ts @@ -3,7 +3,7 @@ // Do not edit by hand; all changes will be overwritten at build time from the config file. // ------------------------------------------------------------------------------------------- /* eslint-disable @stylistic/max-len */ -import { Command } from './settings'; +import { Command } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; import { UserInput, GlobalOptions } from './user-input'; // @ts-ignore TS6133 diff --git a/packages/aws-cdk/lib/index.ts b/packages/aws-cdk/lib/index.ts index a76f253b80ca6..2d666677549e8 100644 --- a/packages/aws-cdk/lib/index.ts +++ b/packages/aws-cdk/lib/index.ts @@ -1,2 +1,2 @@ -export * from './api'; +export * from '@aws-cdk/tmp-toolkit-helpers/lib/api'; export { cli, exec } from './cli'; diff --git a/packages/aws-cdk/lib/parse-command-line-arguments.ts b/packages/aws-cdk/lib/parse-command-line-arguments.ts index 20b09694290fa..c1c65d41f82e0 100644 --- a/packages/aws-cdk/lib/parse-command-line-arguments.ts +++ b/packages/aws-cdk/lib/parse-command-line-arguments.ts @@ -4,7 +4,7 @@ // ------------------------------------------------------------------------------------------- /* eslint-disable @stylistic/max-len */ import { Argv } from 'yargs'; -import * as helpers from './util/yargs-helpers'; +import * as helpers from './cli/yargs-helpers'; // @ts-ignore TS6133 export function parseCommandLineArguments(args: Array): any { @@ -729,7 +729,7 @@ export function parseCommandLineArguments(args: Array): any { type: 'string', alias: 'l', desc: 'The language to be used for the new project (default can be configured in ~/.cdk.json)', - choices: ['csharp', 'fsharp', 'go', 'java', 'javascript', 'python', 'typescript'], + choices: [], }) .option('list', { default: undefined, diff --git a/packages/aws-cdk/lib/user-input.ts b/packages/aws-cdk/lib/user-input.ts index 369a7fe325515..79d426815d48b 100644 --- a/packages/aws-cdk/lib/user-input.ts +++ b/packages/aws-cdk/lib/user-input.ts @@ -3,7 +3,7 @@ // Do not edit by hand; all changes will be overwritten at build time from the config file. // ------------------------------------------------------------------------------------------- /* eslint-disable @stylistic/max-len */ -import { Command } from './settings'; +import { Command } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; /** * The structure of the user input -- either CLI options or cdk.json -- generated from packages/aws-cdk/lib/config.ts diff --git a/packages/aws-cdk/lib/version.ts b/packages/aws-cdk/lib/version.ts index 5b7fee798d80a..6acaaf84c6710 100644 --- a/packages/aws-cdk/lib/version.ts +++ b/packages/aws-cdk/lib/version.ts @@ -1,12 +1,12 @@ import * as path from 'path'; +import { debug, info } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import { ToolkitError } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error'; +import { formatAsBanner } from '@aws-cdk/tmp-toolkit-helpers/lib/util/console-formatters'; +import { cdkCacheDir, rootDir } from '@aws-cdk/tmp-toolkit-helpers/lib/util/directories'; +import { getLatestVersionFromNpm } from '@aws-cdk/tmp-toolkit-helpers/lib/util/npm'; import * as chalk from 'chalk'; import * as fs from 'fs-extra'; import * as semver from 'semver'; -import { cdkCacheDir, rootDir } from './util/directories'; -import { getLatestVersionFromNpm } from './util/npm'; -import { debug, info } from '../lib/logging'; -import { ToolkitError } from './toolkit/error'; -import { formatAsBanner } from '../lib/util/console-formatters'; const ONE_DAY_IN_SECONDS = 1 * 24 * 60 * 60; diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index e77fbb90d7ea2..ca61d914669e0 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -32,8 +32,7 @@ "yarn user-input-gen" ], "post": [ - "cp ../../node_modules/cdk-from-cfn/index_bg.wasm ./lib/", - "cp ../../node_modules/@aws-cdk/aws-service-spec/db.json.gz ./" + "cp ../../node_modules/cdk-from-cfn/index_bg.wasm ./lib/" ] }, "cdk-package": { @@ -67,10 +66,32 @@ }, "license": "Apache-2.0", "devDependencies": { + "@aws-cdk/cloud-assembly-schema": "^39.0.0", "@aws-cdk/cdk-build-tools": "0.0.0", "@aws-cdk/cli-plugin-contract": "0.0.0", "@aws-cdk/pkglint": "0.0.0", "@aws-cdk/user-input-gen": "0.0.0", + "@aws-sdk/client-appsync": "3.699.0", + "@aws-sdk/client-cloudwatch-logs": "3.699.0", + "@aws-sdk/client-codebuild": "3.699.0", + "@aws-sdk/client-ec2": "3.699.0", + "@aws-sdk/client-ecr": "3.699.0", + "@aws-sdk/client-ecs": "3.699.0", + "@aws-sdk/client-elastic-load-balancing-v2": "3.699.0", + "@aws-sdk/client-iam": "3.699.0", + "@aws-sdk/client-kms": "3.699.0", + "@aws-sdk/client-lambda": "3.699.0", + "@aws-sdk/client-route-53": "3.699.0", + "@aws-sdk/client-s3": "3.699.0", + "@aws-sdk/client-secrets-manager": "3.699.0", + "@aws-sdk/client-sfn": "3.699.0", + "@aws-sdk/client-ssm": "3.699.0", + "@aws-sdk/client-sts": "3.699.0", + "@aws-sdk/credential-providers": "3.699.0", + "@aws-sdk/ec2-metadata-service": "3.699.0", + "@aws-sdk/lib-storage": "3.699.0", + "@smithy/types": "3.5.0", + "@smithy/util-stream": "3.1.9", "@octokit/rest": "^18.12.0", "@types/archiver": "^5.3.4", "@types/fs-extra": "^9.0.13", @@ -100,62 +121,27 @@ "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "ts-mock-imports": "^1.3.16", + "cdk-assets": "^3.0.0-rc.111", + "yaml": "1.10.2", "xml-js": "^1.6.11" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "^39.0.0", - "@aws-cdk/cloudformation-diff": "0.0.0", "@aws-cdk/cx-api": "0.0.0", + "@aws-cdk/tmp-toolkit-helpers": "0.0.0", "@aws-cdk/region-info": "0.0.0", - "@aws-sdk/client-appsync": "3.699.0", "@aws-sdk/client-cloudformation": "3.699.0", - "@aws-sdk/client-cloudwatch-logs": "3.699.0", - "@aws-sdk/client-codebuild": "3.699.0", - "@aws-sdk/client-ec2": "3.699.0", - "@aws-sdk/client-ecr": "3.699.0", - "@aws-sdk/client-ecs": "3.699.0", - "@aws-sdk/client-elastic-load-balancing-v2": "3.699.0", - "@aws-sdk/client-iam": "3.699.0", - "@aws-sdk/client-kms": "3.699.0", - "@aws-sdk/client-lambda": "3.699.0", - "@aws-sdk/client-route-53": "3.699.0", - "@aws-sdk/client-s3": "3.699.0", - "@aws-sdk/client-secrets-manager": "3.699.0", - "@aws-sdk/client-sfn": "3.699.0", - "@aws-sdk/client-ssm": "3.699.0", - "@aws-sdk/client-sts": "3.699.0", - "@aws-sdk/credential-providers": "3.699.0", - "@aws-sdk/ec2-metadata-service": "3.699.0", - "@aws-sdk/lib-storage": "3.699.0", "@jsii/check-node": "1.104.0", - "@smithy/middleware-endpoint": "3.1.4", - "@smithy/node-http-handler": "3.2.4", - "@smithy/property-provider": "3.1.10", - "@smithy/shared-ini-file-loader": "3.1.8", - "@smithy/types": "3.5.0", - "@smithy/util-retry": "3.0.7", - "@smithy/util-stream": "3.1.9", - "@smithy/util-waiter": "3.1.6", - "archiver": "^5.3.2", "camelcase": "^6.3.0", - "cdk-assets": "^3.0.0-rc.111", "cdk-from-cfn": "^0.162.0", "chalk": "^4", "chokidar": "^3.6.0", "decamelize": "^5.0.1", "fs-extra": "^9.1.0", - "glob": "^7.2.3", - "json-diff": "^0.10.0", "minimatch": "^9.0.5", "p-limit": "^3.1.0", "promptly": "^3.2.0", - "proxy-agent": "^6.4.0", "semver": "^7.6.3", - "strip-ansi": "^6.0.1", - "table": "^6.8.2", "uuid": "^8.3.2", - "wrap-ansi": "^7.0.0", - "yaml": "1.10.2", "yargs": "^16.2.0" }, "repository": { diff --git a/packages/aws-cdk/test/account-cache.test.ts b/packages/aws-cdk/test/account-cache.test.ts index 5c338fd42e3e1..bb022f16051a2 100644 --- a/packages/aws-cdk/test/account-cache.test.ts +++ b/packages/aws-cdk/test/account-cache.test.ts @@ -1,7 +1,7 @@ import * as path from 'path'; +import { AccountAccessKeyCache } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/account-cache'; import * as fs from 'fs-extra'; import { withMocked } from './util'; -import { AccountAccessKeyCache } from '../lib/api/aws-auth/account-cache'; async function makeCache() { const dir = await fs.mkdtemp('/tmp/account-cache-test'); diff --git a/packages/aws-cdk/test/api/account-cache.test.ts b/packages/aws-cdk/test/api/account-cache.test.ts index 9042713629994..d68524315fb89 100644 --- a/packages/aws-cdk/test/api/account-cache.test.ts +++ b/packages/aws-cdk/test/api/account-cache.test.ts @@ -1,5 +1,5 @@ import { bockfs } from '@aws-cdk/cdk-build-tools'; -import { AccountAccessKeyCache } from '../../lib/api/aws-auth/account-cache'; +import { AccountAccessKeyCache } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/account-cache'; afterAll(() => { bockfs.restore(); diff --git a/packages/aws-cdk/test/api/assembly-versions.ts b/packages/aws-cdk/test/api/assembly-versions.ts index ae2ffe9558db8..42c7f788b0e73 100644 --- a/packages/aws-cdk/test/api/assembly-versions.ts +++ b/packages/aws-cdk/test/api/assembly-versions.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as cxapi from '@aws-cdk/cx-api'; -import { CloudAssembly } from '../../lib/api/cxapp/cloud-assembly'; +import { CloudAssembly } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly'; /** * The cloud-assembly-schema in the new monorepo will use its own package version as the schema version, which is always `0.0.0` when tests are running. diff --git a/packages/aws-cdk/test/api/aws-auth/awscli-compatible.test.ts b/packages/aws-cdk/test/api/aws-auth/awscli-compatible.test.ts index 2b20597f3fae7..661a01078e569 100644 --- a/packages/aws-cdk/test/api/aws-auth/awscli-compatible.test.ts +++ b/packages/aws-cdk/test/api/aws-auth/awscli-compatible.test.ts @@ -1,7 +1,7 @@ import * as os from 'os'; import * as path from 'path'; +import { AwsCliCompatible } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/awscli-compatible'; import * as fs from 'fs-extra'; -import { AwsCliCompatible } from '../../../lib/api/aws-auth/awscli-compatible'; describe('AwsCliCompatible.region', () => { diff --git a/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts b/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts index 500ed315f675c..35822ab2dfec7 100644 --- a/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts +++ b/packages/aws-cdk/test/api/aws-auth/sdk-logger.test.ts @@ -1,5 +1,5 @@ -import { formatSdkLoggerContent, SdkToCliLogger } from '../../../lib/api/aws-auth/sdk-logger'; -import * as logging from '../../../lib/logging'; +import { formatSdkLoggerContent, SdkToCliLogger } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/sdk-logger'; +import * as logging from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; describe(SdkToCliLogger, () => { const logger = new SdkToCliLogger(); diff --git a/packages/aws-cdk/test/api/bootstrap.test.ts b/packages/aws-cdk/test/api/bootstrap.test.ts index 1069a24e4d6d3..89d234c5250a1 100644 --- a/packages/aws-cdk/test/api/bootstrap.test.ts +++ b/packages/aws-cdk/test/api/bootstrap.test.ts @@ -1,3 +1,6 @@ +import { Bootstrapper } from '@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap'; +import { legacyBootstrapTemplate } from '@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/legacy-template'; +import { deserializeStructure, serializeStructure, toYAML } from '@aws-cdk/tmp-toolkit-helpers/lib/util/serialize'; import { CreateChangeSetCommand, CreateStackCommand, @@ -10,9 +13,6 @@ import { UpdateTerminationProtectionCommand, } from '@aws-sdk/client-cloudformation'; import { parse } from 'yaml'; -import { Bootstrapper } from '../../lib/api/bootstrap'; -import { legacyBootstrapTemplate } from '../../lib/api/bootstrap/legacy-template'; -import { deserializeStructure, serializeStructure, toYAML } from '../../lib/serialize'; import { MockSdkProvider, mockCloudFormationClient, restoreSdkMocksToDefault } from '../util/mock-sdk'; const env = { diff --git a/packages/aws-cdk/test/api/bootstrap2.test.ts b/packages/aws-cdk/test/api/bootstrap2.test.ts index c50bd2463364b..d687704129721 100644 --- a/packages/aws-cdk/test/api/bootstrap2.test.ts +++ b/packages/aws-cdk/test/api/bootstrap2.test.ts @@ -1,9 +1,9 @@ /* eslint-disable import/order */ -import * as deployStack from '../../lib/api/deploy-stack'; +import * as deployStack from '@aws-cdk/tmp-toolkit-helpers/lib/api/deploy-stack'; import { Stack } from '@aws-sdk/client-cloudformation'; import { CreatePolicyCommand, GetPolicyCommand } from '@aws-sdk/client-iam'; -import { Bootstrapper, DeployStackOptions, ToolkitInfo } from '../../lib/api'; +import { Bootstrapper, DeployStackOptions, ToolkitInfo } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; import { mockBootstrapStack, mockIAMClient, diff --git a/packages/aws-cdk/test/api/cloud-assembly.test.ts b/packages/aws-cdk/test/api/cloud-assembly.test.ts index c97e6f4925d76..756bbab199b0e 100644 --- a/packages/aws-cdk/test/api/cloud-assembly.test.ts +++ b/packages/aws-cdk/test/api/cloud-assembly.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ import * as cxschema from '@aws-cdk/cloud-assembly-schema'; -import { DefaultSelection } from '../../lib/api/cxapp/cloud-assembly'; +import { DefaultSelection } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly'; import { MockCloudExecutable } from '../util'; import { cliAssemblyWithForcedVersion } from './assembly-versions'; diff --git a/packages/aws-cdk/test/api/cloud-executable.test.ts b/packages/aws-cdk/test/api/cloud-executable.test.ts index 796ea71819495..ca5af8f7fba15 100644 --- a/packages/aws-cdk/test/api/cloud-executable.test.ts +++ b/packages/aws-cdk/test/api/cloud-executable.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/order */ import * as cxschema from '@aws-cdk/cloud-assembly-schema'; -import { DefaultSelection } from '../../lib/api/cxapp/cloud-assembly'; -import { registerContextProvider } from '../../lib/context-providers'; +import { DefaultSelection } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-assembly'; +import { registerContextProvider } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers'; import { MockCloudExecutable } from '../util'; describe('AWS::CDK::Metadata', () => { diff --git a/packages/aws-cdk/test/api/cloudformation-deployments.test.ts b/packages/aws-cdk/test/api/cloudformation-deployments.test.ts index 8d6b0bfad8c97..ca70666f6b1f5 100644 --- a/packages/aws-cdk/test/api/cloudformation-deployments.test.ts +++ b/packages/aws-cdk/test/api/cloudformation-deployments.test.ts @@ -1,6 +1,11 @@ jest.mock('../../lib/api/deploy-stack'); jest.mock('../../lib/util/asset-publishing'); +import { deployStack } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deploy-stack'; +import { Deployments } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import { ToolkitInfo } from '@aws-cdk/tmp-toolkit-helpers/lib/api/toolkit-info'; +import { CloudFormationStack } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; import { DescribeStacksCommand, ListStackResourcesCommand, @@ -12,11 +17,6 @@ import { } from '@aws-sdk/client-cloudformation'; import { GetParameterCommand } from '@aws-sdk/client-ssm'; import { FakeCloudformationStack } from './fake-cloudformation-stack'; -import { deployStack } from '../../lib/api/deploy-stack'; -import { Deployments } from '../../lib/api/deployments'; -import { HotswapMode } from '../../lib/api/hotswap/common'; -import { ToolkitInfo } from '../../lib/api/toolkit-info'; -import { CloudFormationStack } from '../../lib/api/util/cloudformation'; import { testStack } from '../util'; import { mockBootstrapStack, diff --git a/packages/aws-cdk/test/api/credential-plugins.test.ts b/packages/aws-cdk/test/api/credential-plugins.test.ts index 7f212f6f1a5cb..32a093bfebc45 100644 --- a/packages/aws-cdk/test/api/credential-plugins.test.ts +++ b/packages/aws-cdk/test/api/credential-plugins.test.ts @@ -1,7 +1,7 @@ import type { PluginProviderResult, SDKv2CompatibleCredentials } from '@aws-cdk/cli-plugin-contract'; -import { CredentialPlugins } from '../../lib/api/aws-auth/credential-plugins'; -import { PluginHost } from '../../lib/api/plugin'; -import { Mode } from '../../lib/api/plugin/mode'; +import { CredentialPlugins } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/credential-plugins'; +import { PluginHost } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin'; +import { Mode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/mode'; test('returns credential from plugin', async () => { // GIVEN diff --git a/packages/aws-cdk/test/api/deploy-stack.test.ts b/packages/aws-cdk/test/api/deploy-stack.test.ts index 161cfceab1c4d..b3bf3458f0254 100644 --- a/packages/aws-cdk/test/api/deploy-stack.test.ts +++ b/packages/aws-cdk/test/api/deploy-stack.test.ts @@ -1,3 +1,8 @@ +import { assertIsSuccessfulDeployStackResult, deployStack, DeployStackOptions } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { NoBootstrapStackEnvironmentResources } from '@aws-cdk/tmp-toolkit-helpers/lib/api/environment-resources'; +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import { tryHotswapDeployment } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap-deployments'; +import { setCI } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; import { ChangeSetStatus, ChangeSetType, @@ -16,11 +21,6 @@ import { UpdateStackCommand, UpdateTerminationProtectionCommand, } from '@aws-sdk/client-cloudformation'; -import { assertIsSuccessfulDeployStackResult, deployStack, DeployStackOptions } from '../../lib/api'; -import { NoBootstrapStackEnvironmentResources } from '../../lib/api/environment-resources'; -import { HotswapMode } from '../../lib/api/hotswap/common'; -import { tryHotswapDeployment } from '../../lib/api/hotswap-deployments'; -import { setCI } from '../../lib/logging'; import { DEFAULT_FAKE_TEMPLATE, testStack } from '../util'; import { mockCloudFormationClient, diff --git a/packages/aws-cdk/test/api/environment-resources.test.ts b/packages/aws-cdk/test/api/environment-resources.test.ts index aa29b750afb10..bbcbdf1367611 100644 --- a/packages/aws-cdk/test/api/environment-resources.test.ts +++ b/packages/aws-cdk/test/api/environment-resources.test.ts @@ -1,9 +1,8 @@ +import { ToolkitInfo } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { EnvironmentResourcesRegistry } from '@aws-cdk/tmp-toolkit-helpers/lib/api/environment-resources'; +import { CachedDataSource, Notices, NoticesFilter } from '@aws-cdk/tmp-toolkit-helpers/lib/api/notices'; +import { Context } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; import { GetParameterCommand } from '@aws-sdk/client-ssm'; -import { ToolkitInfo } from '../../lib/api'; -import { EnvironmentResourcesRegistry } from '../../lib/api/environment-resources'; -import { CachedDataSource, Notices, NoticesFilter } from '../../lib/notices'; -import { Context } from '../../lib/settings'; -import * as version from '../../lib/version'; import { MockSdk, mockBootstrapStack, mockSSMClient } from '../util/mock-sdk'; import { MockToolkitInfo } from '../util/mock-toolkitinfo'; @@ -94,16 +93,13 @@ describe('validateversion without bootstrap stack', () => { .spyOn(CachedDataSource.prototype as any, 'load') .mockImplementation(() => Promise.resolve({ expiration: 0, notices: [] })); - // mock cli version number - jest.spyOn(version, 'versionNumber').mockImplementation(() => '1.0.0'); - // THEN const notices = Notices.create({ context: new Context() }); await notices.refresh({ dataSource: { fetch: async () => [] } }); await expect(envResources().validateVersion(8, '/abc')).resolves.toBeUndefined(); const filter = jest.spyOn(NoticesFilter, 'filter'); - notices.display(); + notices.display('1.0.0'); expect(filter).toHaveBeenCalledTimes(1); expect(filter).toHaveBeenCalledWith({ diff --git a/packages/aws-cdk/test/api/evaluate-cloudformation-template.test.ts b/packages/aws-cdk/test/api/evaluate-cloudformation-template.test.ts index 56c600460d64a..aaf8c79bd1743 100644 --- a/packages/aws-cdk/test/api/evaluate-cloudformation-template.test.ts +++ b/packages/aws-cdk/test/api/evaluate-cloudformation-template.test.ts @@ -1,9 +1,9 @@ -import { ListExportsCommand } from '@aws-sdk/client-cloudformation'; import { CfnEvaluationException, EvaluateCloudFormationTemplate, Template, -} from '../../lib/api/evaluate-cloudformation-template'; +} from '@aws-cdk/tmp-toolkit-helpers/lib/api/evaluate-cloudformation-template'; +import { ListExportsCommand } from '@aws-sdk/client-cloudformation'; import { MockSdk, mockCloudFormationClient, restoreSdkMocksToDefault } from '../util/mock-sdk'; const sdk = new MockSdk(); diff --git a/packages/aws-cdk/test/api/exec.test.ts b/packages/aws-cdk/test/api/exec.test.ts index fa450d241a6ae..17543cafe725c 100644 --- a/packages/aws-cdk/test/api/exec.test.ts +++ b/packages/aws-cdk/test/api/exec.test.ts @@ -6,14 +6,15 @@ import * as cdk from 'aws-cdk-lib'; import * as semver from 'semver'; import * as sinon from 'sinon'; import { ImportMock } from 'ts-mock-imports'; -import { execProgram } from '../../lib/api/cxapp/exec'; -import { setIoMessageThreshold } from '../../lib/logging'; -import { Configuration } from '../../lib/settings'; +import { execProgram } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/exec'; +import { setIoMessageThreshold } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import { Configuration } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; import { testAssembly } from '../util'; import { mockSpawn } from '../util/mock-child_process'; import { MockSdkProvider } from '../util/mock-sdk'; -import { RWLock } from '../../lib/api/util/rwlock'; +import { RWLock } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/rwlock'; import { rewriteManifestVersion } from './assembly-versions'; +import { versionNumber } from '../../lib/version'; let sdkProvider: MockSdkProvider; let config: Configuration; @@ -84,7 +85,7 @@ test('cli throws when manifest version > schema version', async () => { config.settings.set(['app'], 'cdk.out'); - await expect(execProgram(sdkProvider, config)).rejects.toEqual(new Error(expectedError)); + await expect(execProgram(sdkProvider, config, versionNumber())).rejects.toEqual(new Error(expectedError)); }, TEN_SECOND_TIMEOUT); @@ -97,7 +98,7 @@ test('cli does not throw when manifest version = schema version', async () => { config.settings.set(['app'], 'cdk.out'); - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); }, TEN_SECOND_TIMEOUT); @@ -124,7 +125,7 @@ test.skip('cli does not throw when manifest version < schema version', async () // greater that the version created in the manifest, which is what we are testing for. const mockVersionNumber = ImportMock.mockFunction(cxschema.Manifest, 'version', semver.inc(currentSchemaVersion, 'major')); try { - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); } finally { mockVersionNumber.restore(); @@ -134,7 +135,7 @@ test.skip('cli does not throw when manifest version < schema version', async () test('validates --app key is present', async () => { // GIVEN no config key for `app` - await expect(execProgram(sdkProvider, config)).rejects.toThrow( + await expect(execProgram(sdkProvider, config, versionNumber())).rejects.toThrow( '--app is required either in command-line, in cdk.json or in ~/.cdk.json', ); @@ -147,7 +148,7 @@ test('bypasses synth when app points to a cloud assembly', async () => { rewriteManifestVersionToOurs(); // WHEN - const { assembly: cloudAssembly, lock } = await execProgram(sdkProvider, config); + const { assembly: cloudAssembly, lock } = await execProgram(sdkProvider, config, versionNumber()); expect(cloudAssembly.artifacts).toEqual([]); expect(cloudAssembly.directory).toEqual('cdk.out'); @@ -163,7 +164,7 @@ test('the application set in --app is executed', async () => { }); // WHEN - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); }); @@ -176,7 +177,7 @@ test('the application set in --app is executed as-is if it contains a filename t }); // WHEN - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); }); @@ -189,7 +190,7 @@ test('the application set in --app is executed with arguments', async () => { }); // WHEN - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); }); @@ -203,7 +204,7 @@ test('application set in --app as `*.js` always uses handler on windows', async }); // WHEN - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); }); @@ -216,7 +217,7 @@ test('application set in --app is `*.js` and executable', async () => { }); // WHEN - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); }); @@ -229,7 +230,7 @@ test('cli throws when the `build` script fails', async () => { }); // WHEN - await expect(execProgram(sdkProvider, config)).rejects.toEqual(new Error('Subprocess exited with error 127')); + await expect(execProgram(sdkProvider, config, versionNumber())).rejects.toEqual(new Error('Subprocess exited with error 127')); }, TEN_SECOND_TIMEOUT); test('cli does not throw when the `build` script succeeds', async () => { @@ -246,7 +247,7 @@ test('cli does not throw when the `build` script succeeds', async () => { }); // WHEN - const { lock } = await execProgram(sdkProvider, config); + const { lock } = await execProgram(sdkProvider, config, versionNumber()); await lock.release(); }, TEN_SECOND_TIMEOUT); @@ -259,7 +260,7 @@ test('cli releases the outdir lock when execProgram throws', async () => { }); // WHEN - await expect(execProgram(sdkProvider, config)).rejects.toThrow(); + await expect(execProgram(sdkProvider, config, versionNumber())).rejects.toThrow(); const output = config.settings.get(['output']); expect(output).toBeDefined(); diff --git a/packages/aws-cdk/test/api/fake-cloudformation-stack.ts b/packages/aws-cdk/test/api/fake-cloudformation-stack.ts index 925dd9576106e..e93f6b97c4933 100644 --- a/packages/aws-cdk/test/api/fake-cloudformation-stack.ts +++ b/packages/aws-cdk/test/api/fake-cloudformation-stack.ts @@ -1,6 +1,6 @@ -import { ICloudFormationClient } from '../../lib'; -import { CloudFormationStack, Template } from '../../lib/api/util/cloudformation'; -import { StackStatus } from '../../lib/api/util/cloudformation/stack-status'; +import { ICloudFormationClient } from '@aws-cdk/tmp-toolkit-helpers'; +import { CloudFormationStack, Template } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; +import { StackStatus } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-status'; import { MockSdk } from '../util/mock-sdk'; export interface FakeCloudFormationStackProps { diff --git a/packages/aws-cdk/test/api/fake-sts.ts b/packages/aws-cdk/test/api/fake-sts.ts index 5e2162981e92c..19bbf1be36783 100644 --- a/packages/aws-cdk/test/api/fake-sts.ts +++ b/packages/aws-cdk/test/api/fake-sts.ts @@ -1,8 +1,8 @@ +import { formatErrorMessage } from '@aws-cdk/tmp-toolkit-helpers/lib/util/error'; import { AssumeRoleCommand, GetCallerIdentityCommand, Tag } from '@aws-sdk/client-sts'; import * as nock from 'nock'; import * as uuid from 'uuid'; import * as xmlJs from 'xml-js'; -import { formatErrorMessage } from '../../lib/util/error'; import { mockSTSClient } from '../util/mock-sdk'; interface RegisteredIdentity { diff --git a/packages/aws-cdk/test/api/garbage-collection.test.ts b/packages/aws-cdk/test/api/garbage-collection.test.ts index d6a55dcf951ff..6fff4ec32c747 100644 --- a/packages/aws-cdk/test/api/garbage-collection.test.ts +++ b/packages/aws-cdk/test/api/garbage-collection.test.ts @@ -6,7 +6,7 @@ import { ListStacksCommand, Stack, } from '@aws-sdk/client-cloudformation'; -import { ECR_ISOLATED_TAG, GarbageCollector, S3_ISOLATED_TAG, ToolkitInfo } from '../../lib/api'; +import { ECR_ISOLATED_TAG, GarbageCollector, S3_ISOLATED_TAG, ToolkitInfo } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; import { mockBootstrapStack, mockCloudFormationClient, mockECRClient, mockS3Client, MockSdk, MockSdkProvider } from '../util/mock-sdk'; import { DeleteObjectsCommand, @@ -19,7 +19,7 @@ import { ActiveAssetCache, BackgroundStackRefresh, BackgroundStackRefreshProps, -} from '../../lib/api/garbage-collection/stack-refresh'; +} from '@aws-cdk/tmp-toolkit-helpers/lib/api/garbage-collection/stack-refresh'; import { BatchDeleteImageCommand, BatchGetImageCommand, diff --git a/packages/aws-cdk/test/api/hotswap/appsync-mapping-templates-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/appsync-mapping-templates-hotswap-deployments.test.ts index 46e03cc88aba2..ad2f09547849b 100644 --- a/packages/aws-cdk/test/api/hotswap/appsync-mapping-templates-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/appsync-mapping-templates-hotswap-deployments.test.ts @@ -1,4 +1,5 @@ import { Readable } from 'stream'; +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { GetSchemaCreationStatusCommand, ListFunctionsCommand, @@ -10,7 +11,6 @@ import { import { GetObjectCommand } from '@aws-sdk/client-s3'; import { sdkStreamMixin } from '@smithy/util-stream'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { mockAppSyncClient, mockS3Client } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/code-build-projects-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/code-build-projects-hotswap-deployments.test.ts index 42bf66af284c2..9aadaaa390868 100644 --- a/packages/aws-cdk/test/api/hotswap/code-build-projects-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/code-build-projects-hotswap-deployments.test.ts @@ -1,6 +1,6 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { UpdateProjectCommand } from '@aws-sdk/client-codebuild'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { mockCodeBuildClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/ecs-services-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/ecs-services-hotswap-deployments.test.ts index f5eaf4f3be4d9..29380b08dc8d0 100644 --- a/packages/aws-cdk/test/api/hotswap/ecs-services-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/ecs-services-hotswap-deployments.test.ts @@ -1,7 +1,7 @@ +import { EcsHotswapProperties, HotswapMode, HotswapPropertyOverrides } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import { Configuration } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; import { DescribeServicesCommand, RegisterTaskDefinitionCommand, UpdateServiceCommand } from '@aws-sdk/client-ecs'; import * as setup from './hotswap-test-setup'; -import { EcsHotswapProperties, HotswapMode, HotswapPropertyOverrides } from '../../../lib/api/hotswap/common'; -import { Configuration } from '../../../lib/settings'; import { mockECSClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/hotswap-deployments.test.ts index 5b2057b64511e..4549265d03dbe 100644 --- a/packages/aws-cdk/test/api/hotswap/hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/hotswap-deployments.test.ts @@ -1,9 +1,9 @@ +import { CfnEvaluationException } from '@aws-cdk/tmp-toolkit-helpers/lib/api/evaluate-cloudformation-template'; +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { ListExportsCommand } from '@aws-sdk/client-cloudformation'; import { UpdateFunctionCodeCommand } from '@aws-sdk/client-lambda'; import { UpdateStateMachineCommand } from '@aws-sdk/client-sfn'; import * as setup from './hotswap-test-setup'; -import { CfnEvaluationException } from '../../../lib/api/evaluate-cloudformation-template'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { MockSdk, mockCloudFormationClient, mockLambdaClient, mockStepFunctionsClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts index 7fbc2a4ab92d0..b63fdc1306b3d 100644 --- a/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts +++ b/packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts @@ -1,10 +1,10 @@ import * as cxapi from '@aws-cdk/cx-api'; +import { ICloudFormationClient, SuccessfulDeployStackResult } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { HotswapMode, HotswapPropertyOverrides } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import * as deployments from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap-deployments'; +import { CloudFormationStack, Template } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; import { ListStackResourcesCommand, StackResourceSummary, StackStatus } from '@aws-sdk/client-cloudformation'; import { GetFunctionCommand } from '@aws-sdk/client-lambda'; -import { ICloudFormationClient, SuccessfulDeployStackResult } from '../../../lib/api'; -import { HotswapMode, HotswapPropertyOverrides } from '../../../lib/api/hotswap/common'; -import * as deployments from '../../../lib/api/hotswap-deployments'; -import { CloudFormationStack, Template } from '../../../lib/api/util/cloudformation'; import { testStack, TestStackArtifact } from '../../util'; import { mockCloudFormationClient, diff --git a/packages/aws-cdk/test/api/hotswap/iam-policy-hotswap-deployment.test.ts b/packages/aws-cdk/test/api/hotswap/iam-policy-hotswap-deployment.test.ts index ee454ec403f84..c2fad8fbe1eb4 100644 --- a/packages/aws-cdk/test/api/hotswap/iam-policy-hotswap-deployment.test.ts +++ b/packages/aws-cdk/test/api/hotswap/iam-policy-hotswap-deployment.test.ts @@ -1,6 +1,6 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { StackStatus } from '@aws-sdk/client-cloudformation'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { silentTest } from '../../util/silent'; let hotswapMockSdkProvider: setup.HotswapMockSdkProvider; diff --git a/packages/aws-cdk/test/api/hotswap/lambda-functions-docker-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/lambda-functions-docker-hotswap-deployments.test.ts index 023627a429a04..1958edf60d540 100644 --- a/packages/aws-cdk/test/api/hotswap/lambda-functions-docker-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/lambda-functions-docker-hotswap-deployments.test.ts @@ -1,6 +1,6 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { UpdateFunctionCodeCommand, waitUntilFunctionUpdatedV2 } from '@aws-sdk/client-lambda'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { mockLambdaClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/lambda-functions-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/lambda-functions-hotswap-deployments.test.ts index cf354a1aaa053..3bc86852f302c 100644 --- a/packages/aws-cdk/test/api/hotswap/lambda-functions-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/lambda-functions-hotswap-deployments.test.ts @@ -1,10 +1,10 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { UpdateFunctionCodeCommand, UpdateFunctionConfigurationCommand, waitUntilFunctionUpdatedV2, } from '@aws-sdk/client-lambda'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { mockLambdaClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts index 7c9cfdbe3af68..2319940e031bb 100644 --- a/packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/lambda-functions-inline-hotswap-deployments.test.ts @@ -1,7 +1,7 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { UpdateFunctionCodeCommand } from '@aws-sdk/client-lambda'; import { Runtime } from 'aws-cdk-lib/aws-lambda'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { mockLambdaClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/lambda-versions-aliases-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/lambda-versions-aliases-hotswap-deployments.test.ts index 4356124de46d7..c88c24f20c958 100644 --- a/packages/aws-cdk/test/api/hotswap/lambda-versions-aliases-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/lambda-versions-aliases-hotswap-deployments.test.ts @@ -1,6 +1,6 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { PublishVersionCommand, UpdateAliasCommand } from '@aws-sdk/client-lambda'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { mockLambdaClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/nested-stacks-hotswap.test.ts b/packages/aws-cdk/test/api/hotswap/nested-stacks-hotswap.test.ts index 37c142996fd62..2b18acbeaa6cc 100644 --- a/packages/aws-cdk/test/api/hotswap/nested-stacks-hotswap.test.ts +++ b/packages/aws-cdk/test/api/hotswap/nested-stacks-hotswap.test.ts @@ -1,6 +1,6 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { PublishVersionCommand, UpdateFunctionCodeCommand } from '@aws-sdk/client-lambda'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { testStack } from '../../util'; import { mockLambdaClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/s3-bucket-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/s3-bucket-hotswap-deployments.test.ts index e27c92062f979..e5d60890b9bff 100644 --- a/packages/aws-cdk/test/api/hotswap/s3-bucket-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/s3-bucket-hotswap-deployments.test.ts @@ -1,7 +1,7 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import { REQUIRED_BY_CFN } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/s3-bucket-deployments'; import { InvokeCommand } from '@aws-sdk/client-lambda'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; -import { REQUIRED_BY_CFN } from '../../../lib/api/hotswap/s3-bucket-deployments'; import { mockLambdaClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/hotswap/state-machine-hotswap-deployments.test.ts b/packages/aws-cdk/test/api/hotswap/state-machine-hotswap-deployments.test.ts index bff830e00e972..619c6cd6a4a11 100644 --- a/packages/aws-cdk/test/api/hotswap/state-machine-hotswap-deployments.test.ts +++ b/packages/aws-cdk/test/api/hotswap/state-machine-hotswap-deployments.test.ts @@ -1,6 +1,6 @@ +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; import { UpdateStateMachineCommand } from '@aws-sdk/client-sfn'; import * as setup from './hotswap-test-setup'; -import { HotswapMode } from '../../../lib/api/hotswap/common'; import { mockStepFunctionsClient } from '../../util/mock-sdk'; import { silentTest } from '../../util/silent'; diff --git a/packages/aws-cdk/test/api/lazy-list-stack-resources.test.ts b/packages/aws-cdk/test/api/lazy-list-stack-resources.test.ts index f71fbab3d7aef..2c66a3d3ac166 100644 --- a/packages/aws-cdk/test/api/lazy-list-stack-resources.test.ts +++ b/packages/aws-cdk/test/api/lazy-list-stack-resources.test.ts @@ -1,7 +1,7 @@ import 'aws-sdk-client-mock-jest'; +import { LazyListStackResources } from '@aws-cdk/tmp-toolkit-helpers/lib/api/evaluate-cloudformation-template'; import { ListStackResourcesCommand } from '@aws-sdk/client-cloudformation'; -import { LazyListStackResources } from '../../lib/api/evaluate-cloudformation-template'; import { MockSdk, mockCloudFormationClient } from '../util/mock-sdk'; describe('Lazy ListStackResources', () => { diff --git a/packages/aws-cdk/test/api/lazy-lookup-export.test.ts b/packages/aws-cdk/test/api/lazy-lookup-export.test.ts index 177f4aa32c88c..37349c8d0af9e 100644 --- a/packages/aws-cdk/test/api/lazy-lookup-export.test.ts +++ b/packages/aws-cdk/test/api/lazy-lookup-export.test.ts @@ -1,5 +1,5 @@ +import { LazyLookupExport } from '@aws-cdk/tmp-toolkit-helpers/lib/api/evaluate-cloudformation-template'; import { ListExportsCommand } from '@aws-sdk/client-cloudformation'; -import { LazyLookupExport } from '../../lib/api/evaluate-cloudformation-template'; import { MockSdk, mockCloudFormationClient, restoreSdkMocksToDefault } from '../util/mock-sdk'; describe('LazyLookupExport', () => { diff --git a/packages/aws-cdk/test/api/logs/find-cloudwatch-logs.test.ts b/packages/aws-cdk/test/api/logs/find-cloudwatch-logs.test.ts index 34907f44bb79b..96b6664cf62ff 100644 --- a/packages/aws-cdk/test/api/logs/find-cloudwatch-logs.test.ts +++ b/packages/aws-cdk/test/api/logs/find-cloudwatch-logs.test.ts @@ -1,12 +1,12 @@ import * as cxapi from '@aws-cdk/cx-api'; +import { SdkProvider } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { findCloudWatchLogGroups } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logs/find-cloudwatch-logs'; import { ListStackResourcesCommand, ListStackResourcesCommandInput, StackResourceSummary, StackStatus, } from '@aws-sdk/client-cloudformation'; -import { SdkProvider } from '../../../lib'; -import { findCloudWatchLogGroups } from '../../../lib/api/logs/find-cloudwatch-logs'; import { testStack, TestStackArtifact } from '../../util'; import { mockCloudFormationClient, diff --git a/packages/aws-cdk/test/api/logs/logging.test.ts b/packages/aws-cdk/test/api/logs/logging.test.ts index b7ec1db6df603..9ed5c24f560a1 100644 --- a/packages/aws-cdk/test/api/logs/logging.test.ts +++ b/packages/aws-cdk/test/api/logs/logging.test.ts @@ -1,4 +1,4 @@ -import { setIoMessageThreshold, setCI, data, success, highlight, error, warning, info, debug, trace, withCorkedLogging } from '../../../lib/logging'; +import { setIoMessageThreshold, setCI, data, success, highlight, error, warning, info, debug, trace, withCorkedLogging } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; describe('logging', () => { let mockStdout: jest.Mock; diff --git a/packages/aws-cdk/test/api/logs/logs-monitor.test.ts b/packages/aws-cdk/test/api/logs/logs-monitor.test.ts index 4bdb7f96bd0a4..5d2ac2337c354 100644 --- a/packages/aws-cdk/test/api/logs/logs-monitor.test.ts +++ b/packages/aws-cdk/test/api/logs/logs-monitor.test.ts @@ -1,5 +1,5 @@ +import { CloudWatchLogEventMonitor } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logs/logs-monitor'; import { FilterLogEventsCommand, type FilteredLogEvent } from '@aws-sdk/client-cloudwatch-logs'; -import { CloudWatchLogEventMonitor } from '../../../lib/api/logs/logs-monitor'; import { sleep } from '../../util'; import { MockSdk, mockCloudWatchClient } from '../../util/mock-sdk'; diff --git a/packages/aws-cdk/test/api/plugin/credential-plugin.test.ts b/packages/aws-cdk/test/api/plugin/credential-plugin.test.ts index 0db7916c00079..c9f7e1e61b76c 100644 --- a/packages/aws-cdk/test/api/plugin/credential-plugin.test.ts +++ b/packages/aws-cdk/test/api/plugin/credential-plugin.test.ts @@ -1,8 +1,8 @@ import { CredentialProviderSource, SDKv3CompatibleCredentials } from '@aws-cdk/cli-plugin-contract'; -import { CredentialPlugins } from '../../../lib/api/aws-auth/credential-plugins'; -import { credentialsAboutToExpire } from '../../../lib/api/aws-auth/provider-caching'; -import { Mode } from '../../../lib/api/plugin/mode'; -import { PluginHost, markTesting } from '../../../lib/api/plugin/plugin'; +import { CredentialPlugins } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/credential-plugins'; +import { credentialsAboutToExpire } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/provider-caching'; +import { Mode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/mode'; +import { PluginHost, markTesting } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/plugin'; markTesting(); diff --git a/packages/aws-cdk/test/api/plugin/plugin-host.test.ts b/packages/aws-cdk/test/api/plugin/plugin-host.test.ts index 7d5ee82eb502e..cae2dce566772 100644 --- a/packages/aws-cdk/test/api/plugin/plugin-host.test.ts +++ b/packages/aws-cdk/test/api/plugin/plugin-host.test.ts @@ -1,5 +1,5 @@ import type { CredentialProviderSource } from '@aws-cdk/cli-plugin-contract'; -import { ContextProviderPlugin, PluginHost, markTesting } from '../../../lib/api/plugin'; +import { ContextProviderPlugin, PluginHost, markTesting } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin'; markTesting(); diff --git a/packages/aws-cdk/test/api/sdk-provider.test.ts b/packages/aws-cdk/test/api/sdk-provider.test.ts index 50bbb1faeeebd..885381b29ead0 100644 --- a/packages/aws-cdk/test/api/sdk-provider.test.ts +++ b/packages/aws-cdk/test/api/sdk-provider.test.ts @@ -1,16 +1,16 @@ import * as os from 'os'; import { bockfs } from '@aws-cdk/cdk-build-tools'; import * as cxapi from '@aws-cdk/cx-api'; +import { ConfigurationOptions, CredentialsOptions, SDK, SdkProvider } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth'; +import { AwsCliCompatible } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/awscli-compatible'; +import { defaultCliUserAgent } from '@aws-cdk/tmp-toolkit-helpers/lib/api/aws-auth/user-agent'; +import { setIoMessageThreshold } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import { PluginHost } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin'; +import { Mode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/mode'; import { AssumeRoleCommand, GetCallerIdentityCommand } from '@aws-sdk/client-sts'; import * as promptly from 'promptly'; import * as uuid from 'uuid'; import { FakeSts, RegisterRoleOptions, RegisterUserOptions } from './fake-sts'; -import { ConfigurationOptions, CredentialsOptions, SDK, SdkProvider } from '../../lib/api/aws-auth'; -import { AwsCliCompatible } from '../../lib/api/aws-auth/awscli-compatible'; -import { defaultCliUserAgent } from '../../lib/api/aws-auth/user-agent'; -import { PluginHost } from '../../lib/api/plugin'; -import { Mode } from '../../lib/api/plugin/mode'; -import { setIoMessageThreshold } from '../../lib/logging'; import { withMocked } from '../util'; import { mockSTSClient, restoreSdkMocksToDefault } from '../util/mock-sdk'; diff --git a/packages/aws-cdk/test/api/stack-activity-monitor.test.ts b/packages/aws-cdk/test/api/stack-activity-monitor.test.ts index d4f47d5755868..ac4fe9018f26e 100644 --- a/packages/aws-cdk/test/api/stack-activity-monitor.test.ts +++ b/packages/aws-cdk/test/api/stack-activity-monitor.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/order */ import * as chalk from 'chalk'; import { stderr } from './console-listener'; -import { HistoryActivityPrinter } from '../../lib/api/util/cloudformation/stack-activity-monitor'; +import { HistoryActivityPrinter } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-activity-monitor'; import { ResourceStatus } from '@aws-sdk/client-cloudformation'; let TIMESTAMP: number; diff --git a/packages/aws-cdk/test/api/util/checks.test.ts b/packages/aws-cdk/test/api/util/checks.test.ts index a8bcb46068480..fcb0cb06f4701 100644 --- a/packages/aws-cdk/test/api/util/checks.test.ts +++ b/packages/aws-cdk/test/api/util/checks.test.ts @@ -1,5 +1,5 @@ +import { determineAllowCrossAccountAssetPublishing, getBootstrapStackInfo } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/checks'; import { DescribeStacksCommand, StackStatus } from '@aws-sdk/client-cloudformation'; -import { determineAllowCrossAccountAssetPublishing, getBootstrapStackInfo } from '../../../lib/api/util/checks'; import { mockCloudFormationClient, MockSdk } from '../../util/mock-sdk'; describe('determineAllowCrossAccountAssetPublishing', () => { diff --git a/packages/aws-cdk/test/api/util/cloudformation/stack-event-poller.test.ts b/packages/aws-cdk/test/api/util/cloudformation/stack-event-poller.test.ts index 6ff65e4eba58f..23d089892c77f 100644 --- a/packages/aws-cdk/test/api/util/cloudformation/stack-event-poller.test.ts +++ b/packages/aws-cdk/test/api/util/cloudformation/stack-event-poller.test.ts @@ -1,5 +1,5 @@ +import { StackEventPoller } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-event-poller'; import { DescribeStackEventsCommand, DescribeStackEventsCommandInput, StackEvent } from '@aws-sdk/client-cloudformation'; -import { StackEventPoller } from '../../../../lib/api/util/cloudformation/stack-event-poller'; import { MockSdk, mockCloudFormationClient } from '../../../util/mock-sdk'; beforeEach(() => { diff --git a/packages/aws-cdk/test/api/util/display.test.ts b/packages/aws-cdk/test/api/util/display.test.ts index 2473bb8914d96..b293275e3a705 100644 --- a/packages/aws-cdk/test/api/util/display.test.ts +++ b/packages/aws-cdk/test/api/util/display.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { RewritableBlock } from '../../../lib/api/util/display'; +import { RewritableBlock } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/display'; import { stderr } from '../console-listener'; describe('Rewritable Block Tests', () => { diff --git a/packages/aws-cdk/test/api/util/error.test.ts b/packages/aws-cdk/test/api/util/error.test.ts index 2454e74c66196..871f57f0082c8 100644 --- a/packages/aws-cdk/test/api/util/error.test.ts +++ b/packages/aws-cdk/test/api/util/error.test.ts @@ -1,4 +1,4 @@ -import { formatErrorMessage } from '../../../lib/util/error'; +import { formatErrorMessage } from '@aws-cdk/tmp-toolkit-helpers/lib/util/error'; describe('formatErrorMessage', () => { test('should return the formatted message for a regular Error object', () => { diff --git a/packages/aws-cdk/test/assets.test.ts b/packages/aws-cdk/test/assets.test.ts index b74a7bca6751a..f15773c9b8b27 100644 --- a/packages/aws-cdk/test/assets.test.ts +++ b/packages/aws-cdk/test/assets.test.ts @@ -1,9 +1,9 @@ /* eslint-disable import/order */ import { AssetMetadataEntry } from '@aws-cdk/cloud-assembly-schema'; import { testStack, withMocked } from './util'; -import { addMetadataAssetsToManifest } from '../lib/assets'; -import { AssetManifestBuilder } from '../lib/util/asset-manifest-builder'; -import { EnvironmentResources, EnvironmentResourcesRegistry } from '../lib/api/environment-resources'; +import { addMetadataAssetsToManifest } from '@aws-cdk/tmp-toolkit-helpers/lib/api/assets'; +import { AssetManifestBuilder } from '@aws-cdk/tmp-toolkit-helpers/lib/util/asset-manifest-builder'; +import { EnvironmentResources, EnvironmentResourcesRegistry } from '@aws-cdk/tmp-toolkit-helpers/lib/api/environment-resources'; import { MockSdk } from './util/mock-sdk'; import { MockToolkitInfo } from './util/mock-toolkitinfo'; diff --git a/packages/aws-cdk/test/bootstrap.test.ts b/packages/aws-cdk/test/bootstrap.test.ts index 842d1235a2555..511ad34b90607 100644 --- a/packages/aws-cdk/test/bootstrap.test.ts +++ b/packages/aws-cdk/test/bootstrap.test.ts @@ -1,4 +1,4 @@ -import { Bootstrapper } from '../lib/api/bootstrap/bootstrap-environment'; +import { Bootstrapper } from '@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap/bootstrap-environment'; import { exec } from '../lib/cli'; beforeEach(() => { diff --git a/packages/aws-cdk/test/build.test.ts b/packages/aws-cdk/test/build.test.ts index 9421b389b8e1f..b32ebcb37240b 100644 --- a/packages/aws-cdk/test/build.test.ts +++ b/packages/aws-cdk/test/build.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ import * as cxapi from '@aws-cdk/cx-api'; -import { buildAllStackAssets } from '../lib/build'; +import { buildAllStackAssets } from './helpers/build'; type Stack = cxapi.CloudFormationStackArtifact; diff --git a/packages/aws-cdk/test/cdk-toolkit.test.ts b/packages/aws-cdk/test/cdk-toolkit.test.ts index 8dad7142baea7..0b9a9f0a7b66a 100644 --- a/packages/aws-cdk/test/cdk-toolkit.test.ts +++ b/packages/aws-cdk/test/cdk-toolkit.test.ts @@ -63,6 +63,22 @@ import * as path from 'path'; import * as cxschema from '@aws-cdk/cloud-assembly-schema'; import { Manifest } from '@aws-cdk/cloud-assembly-schema'; import * as cxapi from '@aws-cdk/cx-api'; +import { Bootstrapper, type BootstrapSource } from '@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap'; +import { DeployStackResult, SuccessfulDeployStackResult } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deploy-stack'; +import { + Deployments, + DeployStackOptions, + DestroyStackOptions, + RollbackStackOptions, + RollbackStackResult, + Tag, +} from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { RequireApproval } from '@aws-cdk/tmp-toolkit-helpers/lib/api/diff'; +import { HotswapMode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/hotswap/common'; +import { Mode } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin/mode'; +import { Configuration } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; +import { Template } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; +import { flatten } from '@aws-cdk/tmp-toolkit-helpers/lib/util'; import { DescribeStacksCommand, GetTemplateCommand, StackStatus } from '@aws-sdk/client-cloudformation'; import { GetParameterCommand } from '@aws-sdk/client-ssm'; import * as fs from 'fs-extra'; @@ -76,22 +92,7 @@ import { mockSSMClient, restoreSdkMocksToDefault, } from './util/mock-sdk'; -import { Bootstrapper, type BootstrapSource } from '../lib/api/bootstrap'; -import { DeployStackResult, SuccessfulDeployStackResult } from '../lib/api/deploy-stack'; -import { - Deployments, - DeployStackOptions, - DestroyStackOptions, - RollbackStackOptions, - RollbackStackResult, -} from '../lib/api/deployments'; -import { HotswapMode } from '../lib/api/hotswap/common'; -import { Mode } from '../lib/api/plugin/mode'; -import { Template } from '../lib/api/util/cloudformation'; -import { CdkToolkit, markTesting, Tag } from '../lib/cdk-toolkit'; -import { RequireApproval } from '../lib/diff'; -import { Configuration } from '../lib/settings'; -import { flatten } from '../lib/util'; +import { CdkToolkit, markTesting } from '../lib/cdk-toolkit'; markTesting(); diff --git a/packages/aws-cdk/test/cli.test.ts b/packages/aws-cdk/test/cli.test.ts index d4a524c6a7cae..2400728cdbe6c 100644 --- a/packages/aws-cdk/test/cli.test.ts +++ b/packages/aws-cdk/test/cli.test.ts @@ -1,5 +1,5 @@ +import { setIoMessageThreshold } from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; import { exec } from '../lib/cli'; -import { setIoMessageThreshold } from '../lib/logging'; // Store original version module exports so we don't conflict with other tests const originalVersion = jest.requireActual('../lib/version'); diff --git a/packages/aws-cdk/test/commands/context-command.test.ts b/packages/aws-cdk/test/commands/context-command.test.ts index 988076b7c1d1c..7e79ec1836f9c 100644 --- a/packages/aws-cdk/test/commands/context-command.test.ts +++ b/packages/aws-cdk/test/commands/context-command.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ import { contextHandler } from '../../lib/commands/context'; -import { Configuration, Settings, Context } from '../../lib/settings'; +import { Configuration, Settings, Context } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; describe('context --list', () => { test('runs', async() => { diff --git a/packages/aws-cdk/test/context-providers/amis.test.ts b/packages/aws-cdk/test/context-providers/amis.test.ts index b499f3e3ab8b1..0d5c8cf84869b 100644 --- a/packages/aws-cdk/test/context-providers/amis.test.ts +++ b/packages/aws-cdk/test/context-providers/amis.test.ts @@ -1,7 +1,7 @@ import 'aws-sdk-client-mock'; +import { SDK, SdkForEnvironment } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { AmiContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ami'; import { DescribeImagesCommand } from '@aws-sdk/client-ec2'; -import { SDK, SdkForEnvironment } from '../../lib'; -import { AmiContextProviderPlugin } from '../../lib/context-providers/ami'; import { FAKE_CREDENTIAL_CHAIN, MockSdkProvider, mockEC2Client } from '../util/mock-sdk'; const mockSDK = new (class extends MockSdkProvider { diff --git a/packages/aws-cdk/test/context-providers/asymmetric-vpcs.test.ts b/packages/aws-cdk/test/context-providers/asymmetric-vpcs.test.ts index 3892ebc77255b..cc0e7cfc68bfe 100644 --- a/packages/aws-cdk/test/context-providers/asymmetric-vpcs.test.ts +++ b/packages/aws-cdk/test/context-providers/asymmetric-vpcs.test.ts @@ -1,10 +1,10 @@ +import { VpcNetworkContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/vpcs'; import { DescribeRouteTablesCommand, DescribeSubnetsCommand, DescribeVpcsCommand, DescribeVpnGatewaysCommand, } from '@aws-sdk/client-ec2'; -import { VpcNetworkContextProviderPlugin } from '../../lib/context-providers/vpcs'; import { MockSdkProvider, mockEC2Client, restoreSdkMocksToDefault } from '../util/mock-sdk'; beforeEach(() => { diff --git a/packages/aws-cdk/test/context-providers/availability-zones.test.ts b/packages/aws-cdk/test/context-providers/availability-zones.test.ts index 88c72f651e1e0..86e3db22dbe89 100644 --- a/packages/aws-cdk/test/context-providers/availability-zones.test.ts +++ b/packages/aws-cdk/test/context-providers/availability-zones.test.ts @@ -1,6 +1,6 @@ +import { SDK, SdkForEnvironment } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { AZContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/availability-zones'; import { DescribeAvailabilityZonesCommand } from '@aws-sdk/client-ec2'; -import { SDK, SdkForEnvironment } from '../../lib'; -import { AZContextProviderPlugin } from '../../lib/context-providers/availability-zones'; import { FAKE_CREDENTIAL_CHAIN, mockEC2Client, MockSdkProvider } from '../util/mock-sdk'; const mockSDK = new (class extends MockSdkProvider { diff --git a/packages/aws-cdk/test/context-providers/endpoint-service-availability-zones.test.ts b/packages/aws-cdk/test/context-providers/endpoint-service-availability-zones.test.ts index 44b6e24bedfe1..061f53e247bf4 100644 --- a/packages/aws-cdk/test/context-providers/endpoint-service-availability-zones.test.ts +++ b/packages/aws-cdk/test/context-providers/endpoint-service-availability-zones.test.ts @@ -1,8 +1,8 @@ -import { DescribeVpcEndpointServicesCommand } from '@aws-sdk/client-ec2'; -import { SDK, SdkForEnvironment } from '../../lib'; import { EndpointServiceAZContextProviderPlugin, -} from '../../lib/context-providers/endpoint-service-availability-zones'; +} from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/endpoint-service-availability-zones'; +import { DescribeVpcEndpointServicesCommand } from '@aws-sdk/client-ec2'; +import { SDK, SdkForEnvironment } from '../../lib'; import { FAKE_CREDENTIAL_CHAIN, mockEC2Client, MockSdkProvider } from '../util/mock-sdk'; const mockSDK = new (class extends MockSdkProvider { diff --git a/packages/aws-cdk/test/context-providers/generic.test.ts b/packages/aws-cdk/test/context-providers/generic.test.ts index ade5fd224c478..dc321fff5217a 100644 --- a/packages/aws-cdk/test/context-providers/generic.test.ts +++ b/packages/aws-cdk/test/context-providers/generic.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/order */ -import { PluginHost } from '../../lib/api/plugin'; -import * as contextproviders from '../../lib/context-providers'; -import { Context, TRANSIENT_CONTEXT_KEY } from '../../lib/settings'; +import { PluginHost } from '@aws-cdk/tmp-toolkit-helpers/lib/api/plugin'; +import * as contextproviders from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers'; +import { Context, TRANSIENT_CONTEXT_KEY } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; import { MockSdkProvider, setDefaultSTSMocks } from '../util/mock-sdk'; const mockSDK = new MockSdkProvider(); diff --git a/packages/aws-cdk/test/context-providers/hosted-zones.test.ts b/packages/aws-cdk/test/context-providers/hosted-zones.test.ts index 0a098a5fc3364..d36a76a8fe492 100644 --- a/packages/aws-cdk/test/context-providers/hosted-zones.test.ts +++ b/packages/aws-cdk/test/context-providers/hosted-zones.test.ts @@ -1,6 +1,6 @@ +import { HostedZoneContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/hosted-zones'; import { GetHostedZoneCommand, ListHostedZonesByNameCommand } from '@aws-sdk/client-route-53'; import { SDK, SdkForEnvironment } from '../../lib'; -import { HostedZoneContextProviderPlugin } from '../../lib/context-providers/hosted-zones'; import { FAKE_CREDENTIAL_CHAIN, mockRoute53Client, MockSdkProvider } from '../util/mock-sdk'; const mockSDK = new (class extends MockSdkProvider { diff --git a/packages/aws-cdk/test/context-providers/keys.test.ts b/packages/aws-cdk/test/context-providers/keys.test.ts index a4191e733e3b8..fa6add0b6f84d 100644 --- a/packages/aws-cdk/test/context-providers/keys.test.ts +++ b/packages/aws-cdk/test/context-providers/keys.test.ts @@ -1,5 +1,5 @@ +import { KeyContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/keys'; import { ListAliasesCommand } from '@aws-sdk/client-kms'; -import { KeyContextProviderPlugin } from '../../lib/context-providers/keys'; import { mockKMSClient, MockSdkProvider, restoreSdkMocksToDefault } from '../util/mock-sdk'; let provider: KeyContextProviderPlugin; diff --git a/packages/aws-cdk/test/context-providers/load-balancers.test.ts b/packages/aws-cdk/test/context-providers/load-balancers.test.ts index c92f67ddecda4..536138664ab94 100644 --- a/packages/aws-cdk/test/context-providers/load-balancers.test.ts +++ b/packages/aws-cdk/test/context-providers/load-balancers.test.ts @@ -1,14 +1,14 @@ import { LoadBalancerListenerProtocol, LoadBalancerType } from '@aws-cdk/cloud-assembly-schema'; +import { SDK, SdkForEnvironment } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { + LoadBalancerListenerContextProviderPlugin, + LoadBalancerContextProviderPlugin, +} from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/load-balancers'; import { DescribeListenersCommand, DescribeLoadBalancersCommand, DescribeTagsCommand, } from '@aws-sdk/client-elastic-load-balancing-v2'; -import { SDK, SdkForEnvironment } from '../../lib'; -import { - LoadBalancerListenerContextProviderPlugin, - LoadBalancerContextProviderPlugin, -} from '../../lib/context-providers/load-balancers'; import { FAKE_CREDENTIAL_CHAIN, MockSdkProvider, diff --git a/packages/aws-cdk/test/context-providers/security-groups.test.ts b/packages/aws-cdk/test/context-providers/security-groups.test.ts index 6fdffebf730e3..7310083bfa272 100644 --- a/packages/aws-cdk/test/context-providers/security-groups.test.ts +++ b/packages/aws-cdk/test/context-providers/security-groups.test.ts @@ -1,6 +1,6 @@ +import { hasAllTrafficEgress, SecurityGroupContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/security-groups'; import { DescribeSecurityGroupsCommand } from '@aws-sdk/client-ec2'; import { SDK, type SdkForEnvironment } from '../../lib'; -import { hasAllTrafficEgress, SecurityGroupContextProviderPlugin } from '../../lib/context-providers/security-groups'; import { FAKE_CREDENTIAL_CHAIN, MockSdkProvider, mockEC2Client, restoreSdkMocksToDefault } from '../util/mock-sdk'; const mockSDK = new (class extends MockSdkProvider { diff --git a/packages/aws-cdk/test/context-providers/ssm-parameters.test.ts b/packages/aws-cdk/test/context-providers/ssm-parameters.test.ts index 18befd8981cf6..f7cebb4aef3f2 100644 --- a/packages/aws-cdk/test/context-providers/ssm-parameters.test.ts +++ b/packages/aws-cdk/test/context-providers/ssm-parameters.test.ts @@ -1,6 +1,6 @@ +import { SDK, SdkForEnvironment } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { SSMContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/ssm-parameters'; import { GetParameterCommand } from '@aws-sdk/client-ssm'; -import { SDK, SdkForEnvironment } from '../../lib'; -import { SSMContextProviderPlugin } from '../../lib/context-providers/ssm-parameters'; import { FAKE_CREDENTIAL_CHAIN, MockSdkProvider, mockSSMClient, restoreSdkMocksToDefault } from '../util/mock-sdk'; const mockSDK = new (class extends MockSdkProvider { diff --git a/packages/aws-cdk/test/context-providers/vpcs.test.ts b/packages/aws-cdk/test/context-providers/vpcs.test.ts index 84ddf88a0c5a0..3bd498964b06a 100644 --- a/packages/aws-cdk/test/context-providers/vpcs.test.ts +++ b/packages/aws-cdk/test/context-providers/vpcs.test.ts @@ -1,10 +1,10 @@ +import { VpcNetworkContextProviderPlugin } from '@aws-cdk/tmp-toolkit-helpers/lib/context-providers/vpcs'; import { DescribeRouteTablesCommand, DescribeSubnetsCommand, DescribeVpcsCommand, DescribeVpnGatewaysCommand, } from '@aws-sdk/client-ec2'; -import { VpcNetworkContextProviderPlugin } from '../../lib/context-providers/vpcs'; import { MockSdkProvider, mockEC2Client, restoreSdkMocksToDefault } from '../util/mock-sdk'; const mockSDK = new MockSdkProvider(); diff --git a/packages/aws-cdk/test/context.test.ts b/packages/aws-cdk/test/context.test.ts index 5f2c766146089..23df340460af8 100644 --- a/packages/aws-cdk/test/context.test.ts +++ b/packages/aws-cdk/test/context.test.ts @@ -2,7 +2,7 @@ import * as os from 'os'; import * as path from 'path'; import * as fs from 'fs-extra'; -import { Configuration, Context, PROJECT_CONFIG, PROJECT_CONTEXT, Settings, TRANSIENT_CONTEXT_KEY } from '../lib/settings'; +import { Configuration, Context, PROJECT_CONFIG, PROJECT_CONTEXT, Settings, TRANSIENT_CONTEXT_KEY } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; const state: { previousWorkingDir?: string; diff --git a/packages/aws-cdk/test/diff.test.ts b/packages/aws-cdk/test/diff.test.ts index e248de2f2386e..de4779693e1c1 100644 --- a/packages/aws-cdk/test/diff.test.ts +++ b/packages/aws-cdk/test/diff.test.ts @@ -5,11 +5,11 @@ import { Writable } from 'stream'; import { StringDecoder } from 'string_decoder'; import * as cxschema from '@aws-cdk/cloud-assembly-schema'; import { CloudFormationStackArtifact } from '@aws-cdk/cx-api'; +import { Deployments } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { NestedStackTemplates } from '@aws-cdk/tmp-toolkit-helpers/lib/api/nested-stack-helpers'; +import * as cfn from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; import { DescribeChangeSetCommandOutput } from '@aws-sdk/client-cloudformation'; import { instanceMockFrom, MockCloudExecutable } from './util'; -import { Deployments } from '../lib/api/deployments'; -import { NestedStackTemplates } from '../lib/api/nested-stack-helpers'; -import * as cfn from '../lib/api/util/cloudformation'; import { CdkToolkit } from '../lib/cdk-toolkit'; let cloudExecutable: MockCloudExecutable; diff --git a/packages/aws-cdk/lib/build.ts b/packages/aws-cdk/test/helpers/build.ts similarity index 80% rename from packages/aws-cdk/lib/build.ts rename to packages/aws-cdk/test/helpers/build.ts index 974db182ccdfe..c2eae53feba3e 100644 --- a/packages/aws-cdk/lib/build.ts +++ b/packages/aws-cdk/test/helpers/build.ts @@ -1,5 +1,4 @@ import * as cxapi from '@aws-cdk/cx-api'; -import { ToolkitError } from './toolkit/error'; type Options = { buildStackAssets: (stack: cxapi.CloudFormationStackArtifact) => Promise; @@ -19,6 +18,6 @@ export async function buildAllStackAssets(stacks: cxapi.CloudFormationStackArtif } if (buildingErrors.length) { - throw new ToolkitError(`Building Assets Failed: ${buildingErrors.join(', ')}`); + throw new Error(`Building Assets Failed: ${buildingErrors.join(', ')}`); } } diff --git a/packages/aws-cdk/test/import.test.ts b/packages/aws-cdk/test/import.test.ts index bb3b294d3bb69..f02705ca47db6 100644 --- a/packages/aws-cdk/test/import.test.ts +++ b/packages/aws-cdk/test/import.test.ts @@ -6,6 +6,8 @@ jest.mock('promptly', () => { }; }); +import { Deployments } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { ResourceImporter, ImportMap } from '@aws-cdk/tmp-toolkit-helpers/lib/api/import'; import { CreateChangeSetCommand, DescribeChangeSetCommand, @@ -17,8 +19,6 @@ import { import * as promptly from 'promptly'; import { testStack } from './util'; import { MockSdkProvider, mockCloudFormationClient, restoreSdkMocksToDefault } from './util/mock-sdk'; -import { Deployments } from '../lib/api/deployments'; -import { ResourceImporter, ImportMap } from '../lib/import'; const promptlyConfirm = promptly.confirm as jest.Mock; const promptlyPrompt = promptly.prompt as jest.Mock; diff --git a/packages/aws-cdk/test/init.test.ts b/packages/aws-cdk/test/init.test.ts index 08764756beda2..5111e85e8d3e2 100644 --- a/packages/aws-cdk/test/init.test.ts +++ b/packages/aws-cdk/test/init.test.ts @@ -2,7 +2,7 @@ import * as os from 'os'; import * as path from 'path'; import * as cxapi from '@aws-cdk/cx-api'; import * as fs from 'fs-extra'; -import { availableInitLanguages, availableInitTemplates, cliInit, currentlyRecommendedAwsCdkLibFlags, printAvailableTemplates } from '../lib/init'; +import { availableInitLanguages, availableInitTemplates, cliInit, currentlyRecommendedAwsCdkLibFlags, printAvailableTemplates } from '../lib/commands/init'; describe('constructs version', () => { cliTest('create a TypeScript library project', async (workDir) => { diff --git a/packages/aws-cdk/test/list-stacks.test.ts b/packages/aws-cdk/test/list-stacks.test.ts index c6788df91670b..6b047c890598b 100644 --- a/packages/aws-cdk/test/list-stacks.test.ts +++ b/packages/aws-cdk/test/list-stacks.test.ts @@ -1,9 +1,9 @@ import * as cxschema from '@aws-cdk/cloud-assembly-schema';; +import { Bootstrapper } from '@aws-cdk/tmp-toolkit-helpers/lib/api/bootstrap'; +import { Deployments } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { listStacks } from '@aws-cdk/tmp-toolkit-helpers/lib/api/list-stacks'; import { instanceMockFrom, MockCloudExecutable, TestStackArtifact } from './util'; -import { Bootstrapper } from '../lib/api/bootstrap'; -import { Deployments } from '../lib/api/deployments'; import { CdkToolkit } from '../lib/cdk-toolkit'; -import { listStacks } from '../lib/list-stacks'; describe('list', () => { let cloudFormation: jest.Mocked; @@ -43,7 +43,7 @@ describe('list', () => { }); // WHEN - const workflow = await listStacks(toolkit, { selectors: ['Test-Stack-A', 'Test-Stack-B'] }); + const workflow = await listStacks(await toolkit.assembly(), { selectors: ['Test-Stack-A', 'Test-Stack-B'] }); // THEN expect(JSON.stringify(workflow)).toEqual(JSON.stringify([{ @@ -97,7 +97,7 @@ describe('list', () => { }); // WHEN - const workflow = await listStacks( toolkit, { selectors: ['Test-Stack-A', 'Test-Stack-B'] }); + const workflow = await listStacks(await toolkit.assembly(), { selectors: ['Test-Stack-A', 'Test-Stack-B'] }); // THEN expect(JSON.stringify(workflow)).toEqual(JSON.stringify([{ @@ -157,7 +157,7 @@ describe('list', () => { }); // WHEN - const workflow = await listStacks( toolkit, { selectors: ['Test-Stack-A', 'Test-Stack-A/Test-Stack-B'] }); + const workflow = await listStacks(await toolkit.assembly(), { selectors: ['Test-Stack-A', 'Test-Stack-A/Test-Stack-B'] }); // THEN expect(JSON.stringify(workflow)).toEqual(JSON.stringify([{ @@ -229,7 +229,7 @@ describe('list', () => { }); // WHEN - const workflow = await listStacks( toolkit, { selectors: ['Test-Stack-A', 'Test-Stack-A/Test-Stack-B', 'Test-Stack-A/Test-Stack-B/Test-Stack-C'] }); + const workflow = await listStacks(await toolkit.assembly(), { selectors: ['Test-Stack-A', 'Test-Stack-A/Test-Stack-B', 'Test-Stack-A/Test-Stack-B/Test-Stack-C'] }); // THEN expect(JSON.stringify(workflow)).toEqual(JSON.stringify([{ @@ -315,7 +315,7 @@ describe('list', () => { }); // WHEN - const workflow = await listStacks( toolkit, { selectors: ['Test-Stack-A', 'Test-Stack-B', 'Test-Stack-C'] }); + const workflow = await listStacks(await toolkit.assembly(), { selectors: ['Test-Stack-A', 'Test-Stack-B', 'Test-Stack-C'] }); // THEN expect(JSON.stringify(workflow)).toEqual(JSON.stringify([{ @@ -405,7 +405,7 @@ describe('list', () => { }); // WHEN - const workflow = await listStacks( toolkit, { selectors: ['Test-Stack-A', 'Test-Stack-C'] }); + const workflow = await listStacks(await toolkit.assembly(), { selectors: ['Test-Stack-A', 'Test-Stack-C'] }); // THEN expect(JSON.stringify(workflow)).toEqual(JSON.stringify([{ @@ -474,8 +474,8 @@ describe('list', () => { }); // WHEN - await expect(() => - listStacks( toolkit, { selectors: ['Test-Stack-A', 'Test-Stack-B'] }), + await expect(async () => + listStacks(await toolkit.assembly(), { selectors: ['Test-Stack-A', 'Test-Stack-B'] }), ).rejects.toThrow('Could not determine ordering'); }); }); diff --git a/packages/aws-cdk/test/notices.test.ts b/packages/aws-cdk/test/notices.test.ts index f082091c5ae31..7b989b3c3ccee 100644 --- a/packages/aws-cdk/test/notices.test.ts +++ b/packages/aws-cdk/test/notices.test.ts @@ -4,7 +4,7 @@ import * as os from 'os'; import * as path from 'path'; import * as fs from 'fs-extra'; import * as nock from 'nock'; -import * as logging from '../lib/logging'; +import * as logging from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; import { CachedDataSource, Notice, @@ -13,12 +13,12 @@ import { FilteredNotice, WebsiteNoticeDataSource, BootstrappedEnvironment, -} from '../lib/notices'; +} from '@aws-cdk/tmp-toolkit-helpers/lib/api/notices'; import * as version from '../lib/version'; -import { Context, Settings } from '../lib/settings'; +import { Context, Settings } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; const BASIC_BOOTSTRAP_NOTICE = { - title: 'Exccessive permissions on file asset publishing role', + title: 'Excessive permissions on file asset publishing role', issueNumber: 16600, overview: 'FilePublishingRoleDefaultPolicy has too many permissions', components: [{ @@ -510,7 +510,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenCalledWith(new FilteredNotice(BOOTSTRAP_NOTICE_V10).format()); expect(print).toHaveBeenCalledWith(new FilteredNotice(BOOTSTRAP_NOTICE_V11).format()); }); @@ -520,13 +520,10 @@ describe(Notices, () => { notices.addBootstrappedEnvironment({ bootstrapStackVersion: 10, environment: { account: 'account', region: 'region', name: 'env' } }); notices.addBootstrappedEnvironment({ bootstrapStackVersion: 10, environment: { account: 'account', region: 'region', name: 'env' } }); - // mock cli version number - jest.spyOn(version, 'versionNumber').mockImplementation(() => '1.0.0'); - - notices.display(); + notices.display('1.0.0'); const filter = jest.spyOn(NoticesFilter, 'filter'); - notices.display(); + notices.display('1.0.0'); expect(filter).toHaveBeenCalledTimes(1); expect(filter).toHaveBeenCalledWith({ @@ -557,7 +554,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenCalledWith(new FilteredNotice(BASIC_NOTICE).format()); }); @@ -572,7 +569,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display({ showTotal: true }); + notices.display('2.0.0', { showTotal: true }); expect(print).toHaveBeenNthCalledWith(1, ''); expect(print).toHaveBeenNthCalledWith(2, 'There are 0 unacknowledged notice(s).'); expect(print).toHaveBeenCalledTimes(2); @@ -617,7 +614,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenNthCalledWith(4, new FilteredNotice(BASIC_NOTICE).format()); expect(print).toHaveBeenNthCalledWith(6, 'If you don’t want to see a notice anymore, use \"cdk acknowledge \". For example, \"cdk acknowledge 16603\".'); }); @@ -635,7 +632,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenCalledWith(new FilteredNotice(BASIC_NOTICE).format()); expect(print).toHaveBeenCalledWith(new FilteredNotice(MULTIPLE_AFFECTED_VERSIONS_NOTICE).format()); }); @@ -653,7 +650,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenNthCalledWith(2, 'NOTICES (What\'s this? https://github.com/aws/aws-cdk/wiki/CLI-Notices)'); expect(print).toHaveBeenNthCalledWith(6, 'If you don’t want to see a notice anymore, use \"cdk acknowledge \". For example, \"cdk acknowledge 16603\".'); }); @@ -669,7 +666,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenNthCalledWith(4, new FilteredNotice(BASIC_NOTICE).format()); expect(print).toHaveBeenNthCalledWith(6, 'If you don’t want to see a notice anymore, use \"cdk acknowledge \". For example, \"cdk acknowledge 16603\".'); }); @@ -680,21 +677,21 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenCalledTimes(0); }); test('nothing when there are no notices', async () => { const print = jest.spyOn(logging, 'info'); - Notices.create({ context: new Context() }).display(); + Notices.create({ context: new Context() }).display('2.0.0'); expect(print).toHaveBeenCalledTimes(0); }); test('total count when show total is true', async () => { const print = jest.spyOn(logging, 'info'); - Notices.create({ context: new Context() }).display({ showTotal: true }); + Notices.create({ context: new Context() }).display('2.0.0', { showTotal: true }); expect(print).toHaveBeenNthCalledWith(2, 'There are 0 unacknowledged notice(s).'); }); @@ -709,7 +706,7 @@ describe(Notices, () => { const warning = jest.spyOn(logging, 'warning'); - notices.display(); + notices.display('2.0.0'); expect(warning).toHaveBeenNthCalledWith(1, new FilteredNotice(BASIC_NOTICE).format()); expect(warning).toHaveBeenCalledTimes(1); }); @@ -725,7 +722,7 @@ describe(Notices, () => { const error = jest.spyOn(logging, 'error'); - notices.display(); + notices.display('2.0.0'); expect(error).toHaveBeenNthCalledWith(1, new FilteredNotice(BASIC_NOTICE).format()); expect(error).toHaveBeenCalledTimes(1); }); @@ -741,7 +738,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenNthCalledWith(4, new FilteredNotice(BASIC_NOTICE).format()); }); @@ -758,7 +755,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenNthCalledWith(4, new FilteredNotice(BASIC_NOTICE).format()); }); @@ -774,7 +771,7 @@ describe(Notices, () => { const print = jest.spyOn(logging, 'info'); - notices.display(); + notices.display('2.0.0'); expect(print).toHaveBeenNthCalledWith(4, new FilteredNotice(BASIC_NOTICE).format()); expect(print).toHaveBeenNthCalledWith(6, new FilteredNotice(MULTIPLE_AFFECTED_VERSIONS_NOTICE).format()); }); diff --git a/packages/aws-cdk/test/platform-warnings.test.ts b/packages/aws-cdk/test/platform-warnings.test.ts index 8299e46441904..61f109a30e16e 100644 --- a/packages/aws-cdk/test/platform-warnings.test.ts +++ b/packages/aws-cdk/test/platform-warnings.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { isVersionBetween } from '../lib/platform-warnings'; +import { isVersionBetween } from '../lib/cli/platform-warnings'; test.each([ ['2.1', false], diff --git a/packages/aws-cdk/test/rwlock.test.ts b/packages/aws-cdk/test/rwlock.test.ts index 4ffa95cee4e42..44fbddc9a4517 100644 --- a/packages/aws-cdk/test/rwlock.test.ts +++ b/packages/aws-cdk/test/rwlock.test.ts @@ -1,7 +1,7 @@ /* eslint-disable import/order */ import * as os from 'os'; import * as path from 'path'; -import { RWLock } from '../lib/api/util/rwlock'; +import { RWLock } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/rwlock'; function testDir() { return path.join(os.tmpdir(), 'rwlock-tests'); diff --git a/packages/aws-cdk/test/serialize.test.ts b/packages/aws-cdk/test/serialize.test.ts index c30e3caec2715..64ac66be5095e 100644 --- a/packages/aws-cdk/test/serialize.test.ts +++ b/packages/aws-cdk/test/serialize.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { toYAML } from '../lib/serialize'; +import { toYAML } from '@aws-cdk/tmp-toolkit-helpers/lib/util/serialize'; describe(toYAML, () => { test('does not wrap lines', () => { diff --git a/packages/aws-cdk/test/settings.test.ts b/packages/aws-cdk/test/settings.test.ts index 7edc2e9b487a2..c78752d07b02d 100644 --- a/packages/aws-cdk/test/settings.test.ts +++ b/packages/aws-cdk/test/settings.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ -import { Command, Context, Settings } from '../lib/settings'; -import { Tag } from '../lib/cdk-toolkit'; +import { Tag } from '@aws-cdk/tmp-toolkit-helpers/lib/api/deployments'; +import { Command, Context, Settings } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; test('can delete values from Context object', () => { // GIVEN diff --git a/packages/aws-cdk/test/toolkit-error.test.ts b/packages/aws-cdk/test/toolkit-error.test.ts index 1aef772e186a5..e3824319ad454 100644 --- a/packages/aws-cdk/test/toolkit-error.test.ts +++ b/packages/aws-cdk/test/toolkit-error.test.ts @@ -1,4 +1,4 @@ -import { AuthenticationError, ToolkitError } from '../lib/toolkit/error'; +import { AuthenticationError, ToolkitError } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/error'; describe('toolkit error', () => { let toolkitError = new ToolkitError('Test toolkit error'); diff --git a/packages/aws-cdk/test/toolkit/cli-io-host.test.ts b/packages/aws-cdk/test/toolkit/cli-io-host.test.ts index 7ea32efcf6c2e..4811318611ad8 100644 --- a/packages/aws-cdk/test/toolkit/cli-io-host.test.ts +++ b/packages/aws-cdk/test/toolkit/cli-io-host.test.ts @@ -1,5 +1,5 @@ +import { CliIoHost, IoMessage } from '@aws-cdk/tmp-toolkit-helpers/lib/toolkit/cli-io-host'; import * as chalk from 'chalk'; -import { CliIoHost, IoMessage } from '../../lib/toolkit/cli-io-host'; describe('CliIoHost', () => { let mockStdout: jest.Mock; diff --git a/packages/aws-cdk/test/tree.test.ts b/packages/aws-cdk/test/tree.test.ts index 06a7e324d3fa1..fa7d084fb14c8 100644 --- a/packages/aws-cdk/test/tree.test.ts +++ b/packages/aws-cdk/test/tree.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ import * as path from 'path'; -import { ConstructTreeNode, loadTreeFromDir, some } from '../lib/tree'; +import { ConstructTreeNode, loadTreeFromDir, some } from '@aws-cdk/tmp-toolkit-helpers/lib/util/tree'; describe('some', () => { const tree: ConstructTreeNode = { diff --git a/packages/aws-cdk/test/usersettings.test.ts b/packages/aws-cdk/test/usersettings.test.ts index 6f5e0fb4fb642..ad008777e0341 100644 --- a/packages/aws-cdk/test/usersettings.test.ts +++ b/packages/aws-cdk/test/usersettings.test.ts @@ -2,7 +2,7 @@ import * as os from 'os'; import * as fs_path from 'path'; import * as fs from 'fs-extra'; -import { Configuration, PROJECT_CONFIG, PROJECT_CONTEXT } from '../lib/settings'; +import { Configuration, PROJECT_CONFIG, PROJECT_CONTEXT } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; // mock fs deeply jest.mock('fs-extra'); diff --git a/packages/aws-cdk/test/util.ts b/packages/aws-cdk/test/util.ts index 7df664dbade9f..d48f293d3e560 100644 --- a/packages/aws-cdk/test/util.ts +++ b/packages/aws-cdk/test/util.ts @@ -2,10 +2,10 @@ import * as fs from 'fs'; import * as path from 'path'; import { ArtifactMetadataEntryType, ArtifactType, type AssetManifest, type AssetMetadataEntry, type AwsCloudFormationStackProperties, type MetadataEntry, type MissingContext } from '@aws-cdk/cloud-assembly-schema'; import { type CloudAssembly, CloudAssemblyBuilder, type CloudFormationStackArtifact, type StackMetadata } from '@aws-cdk/cx-api'; -import { MockSdkProvider } from './util/mock-sdk'; -import { CloudExecutable } from '../lib/api/cxapp/cloud-executable'; -import { Configuration } from '../lib/settings'; +import { CloudExecutable } from '@aws-cdk/tmp-toolkit-helpers/lib/api/cxapp/cloud-executable'; +import { Configuration } from '@aws-cdk/tmp-toolkit-helpers/lib/api/settings'; import { cxapiAssemblyWithForcedVersion } from './api/assembly-versions'; +import { MockSdkProvider } from './util/mock-sdk'; export const DEFAULT_FAKE_TEMPLATE = { No: 'Resources' }; diff --git a/packages/aws-cdk/test/util/applydefaults.test.ts b/packages/aws-cdk/test/util/applydefaults.test.ts index 925adf753a09f..143c623944fc5 100644 --- a/packages/aws-cdk/test/util/applydefaults.test.ts +++ b/packages/aws-cdk/test/util/applydefaults.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { applyDefaults } from '../../lib/util'; +import { applyDefaults } from '@aws-cdk/tmp-toolkit-helpers/lib/util'; test('applyDefaults() works', () => { const given = { a: 1 }; diff --git a/packages/aws-cdk/test/util/arrays.test.ts b/packages/aws-cdk/test/util/arrays.test.ts index b9d09c2b1c5e3..2ca161e75f953 100644 --- a/packages/aws-cdk/test/util/arrays.test.ts +++ b/packages/aws-cdk/test/util/arrays.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { flatMap, flatten, partition } from '../../lib/util'; +import { flatMap, flatten, partition } from '@aws-cdk/tmp-toolkit-helpers/lib/util'; test('flatten combines arrays', () => { const output = flatten([ diff --git a/packages/aws-cdk/test/util/cloudformation.test.ts b/packages/aws-cdk/test/util/cloudformation.test.ts index b42de6fe1da41..297488d13e055 100644 --- a/packages/aws-cdk/test/util/cloudformation.test.ts +++ b/packages/aws-cdk/test/util/cloudformation.test.ts @@ -1,8 +1,8 @@ import { SSMPARAM_NO_INVALIDATE } from '@aws-cdk/cx-api'; +import { CloudFormationStack, TemplateParameters } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; import { DescribeStacksCommand, GetTemplateCommand, StackStatus } from '@aws-sdk/client-cloudformation'; import { MockSdk, mockCloudFormationClient } from './mock-sdk'; import type { ICloudFormationClient } from '../../lib'; -import { CloudFormationStack, TemplateParameters } from '../../lib/api/util/cloudformation'; const PARAM = 'TheParameter'; const DEFAULT = 'TheDefault'; diff --git a/packages/aws-cdk/test/util/console-formatters.test.ts b/packages/aws-cdk/test/util/console-formatters.test.ts index b4b9457a43f13..e6722c66bb011 100644 --- a/packages/aws-cdk/test/util/console-formatters.test.ts +++ b/packages/aws-cdk/test/util/console-formatters.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ import * as chalk from 'chalk'; -import { formatAsBanner } from '../../lib/util/console-formatters'; +import { formatAsBanner } from '@aws-cdk/tmp-toolkit-helpers/lib/util/console-formatters'; test('no banner on empty msg list', () => expect(formatAsBanner([])).toEqual([])); diff --git a/packages/aws-cdk/test/util/mock-sdk.ts b/packages/aws-cdk/test/util/mock-sdk.ts index 414fc525e08d5..ed7c0dfab71d6 100644 --- a/packages/aws-cdk/test/util/mock-sdk.ts +++ b/packages/aws-cdk/test/util/mock-sdk.ts @@ -1,5 +1,7 @@ import 'aws-sdk-client-mock-jest'; import { Environment } from '@aws-cdk/cx-api'; +import { SDK, SdkProvider } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { CloudFormationStack } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; import { AppSyncClient } from '@aws-sdk/client-appsync'; import { CloudFormationClient, Stack, StackStatus } from '@aws-sdk/client-cloudformation'; import { CloudWatchLogsClient } from '@aws-sdk/client-cloudwatch-logs'; @@ -21,8 +23,6 @@ import { createCredentialChain } from '@aws-sdk/credential-providers'; import { AwsCredentialIdentity } from '@smithy/types'; import { mockClient } from 'aws-sdk-client-mock'; import { Account } from 'cdk-assets'; -import { SDK, SdkProvider } from '../../lib'; -import { CloudFormationStack } from '../../lib/api/util/cloudformation'; export const FAKE_CREDENTIALS: AwsCredentialIdentity = { accessKeyId: 'ACCESS', diff --git a/packages/aws-cdk/test/util/mock-toolkitinfo.ts b/packages/aws-cdk/test/util/mock-toolkitinfo.ts index f45a4aa6ab901..f066a7d9e98ce 100644 --- a/packages/aws-cdk/test/util/mock-toolkitinfo.ts +++ b/packages/aws-cdk/test/util/mock-toolkitinfo.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ -import { ToolkitInfo, DEFAULT_BOOTSTRAP_VARIANT } from '../../lib/api'; -import { CloudFormationStack } from '../../lib/api/util/cloudformation'; +import { ToolkitInfo, DEFAULT_BOOTSTRAP_VARIANT } from '@aws-cdk/tmp-toolkit-helpers/lib/api'; +import { CloudFormationStack } from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation'; export interface MockToolkitInfoProps { readonly bucketName?: string; diff --git a/packages/aws-cdk/test/util/objects.test.ts b/packages/aws-cdk/test/util/objects.test.ts index 836741aafbf73..062c55620f93f 100644 --- a/packages/aws-cdk/test/util/objects.test.ts +++ b/packages/aws-cdk/test/util/objects.test.ts @@ -1,6 +1,6 @@ /* eslint-disable import/order */ import * as fc from 'fast-check'; -import { deepClone, deepGet, deepMerge, deepSet, splitBySize } from '../../lib/util'; +import { deepClone, deepGet, deepMerge, deepSet, splitBySize } from '@aws-cdk/tmp-toolkit-helpers/lib/util'; test('deepSet can set deeply', () => { const obj = {}; diff --git a/packages/aws-cdk/test/util/parallel.test.ts b/packages/aws-cdk/test/util/parallel.test.ts index 65dca423a5d0b..58ac11a8ce198 100644 --- a/packages/aws-cdk/test/util/parallel.test.ts +++ b/packages/aws-cdk/test/util/parallel.test.ts @@ -1,4 +1,4 @@ -import { parallelPromises } from '../../lib/util/parallel'; +import { parallelPromises } from '@aws-cdk/tmp-toolkit-helpers/lib/util/parallel'; import { sleep } from '../util'; test('parallelPromises', async () => { diff --git a/packages/aws-cdk/test/util/silent.ts b/packages/aws-cdk/test/util/silent.ts index dff91132a7390..7ee2d42677c9b 100644 --- a/packages/aws-cdk/test/util/silent.ts +++ b/packages/aws-cdk/test/util/silent.ts @@ -1,5 +1,5 @@ /* eslint-disable jest/no-export */ -import * as logging from '../../lib/logging'; +import * as logging from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; export function silentTest(name: string, callback: () => void | Promise, timeout?: number): void { const spy = jest.spyOn(logging, 'info'); diff --git a/packages/aws-cdk/test/util/stack-monitor.test.ts b/packages/aws-cdk/test/util/stack-monitor.test.ts index ef01a30adab4f..fcec09034a93e 100644 --- a/packages/aws-cdk/test/util/stack-monitor.test.ts +++ b/packages/aws-cdk/test/util/stack-monitor.test.ts @@ -1,3 +1,8 @@ +import { + StackActivityMonitor, + type IActivityPrinter, + type StackActivity, +} from '@aws-cdk/tmp-toolkit-helpers/lib/api/util/cloudformation/stack-activity-monitor'; import { DescribeStackEventsCommand, ResourceStatus, @@ -5,11 +10,6 @@ import { StackStatus, } from '@aws-sdk/client-cloudformation'; import { MockSdk, mockCloudFormationClient, restoreSdkMocksToDefault } from './mock-sdk'; -import { - StackActivityMonitor, - type IActivityPrinter, - type StackActivity, -} from '../../lib/api/util/cloudformation/stack-activity-monitor'; let sdk: MockSdk; let printer: FakePrinter; diff --git a/packages/aws-cdk/test/util/validate-notification-arn.test.ts b/packages/aws-cdk/test/util/validate-notification-arn.test.ts index d418546eda923..152eb4b6533ae 100644 --- a/packages/aws-cdk/test/util/validate-notification-arn.test.ts +++ b/packages/aws-cdk/test/util/validate-notification-arn.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { validateSnsTopicArn } from '../../lib/util/validate-notification-arn'; +import { validateSnsTopicArn } from '@aws-cdk/tmp-toolkit-helpers/lib/util/validate-notification-arn'; describe('validate sns arns', () => { test('empty string', () => { diff --git a/packages/aws-cdk/test/util/version-range.test.ts b/packages/aws-cdk/test/util/version-range.test.ts index 840e504898160..4f4bf463194c7 100644 --- a/packages/aws-cdk/test/util/version-range.test.ts +++ b/packages/aws-cdk/test/util/version-range.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { rangeFromSemver } from '../../lib/util/version-range'; +import { rangeFromSemver } from '@aws-cdk/tmp-toolkit-helpers/lib/util/version-range'; describe('rangeFromSemver', () => { describe('bracket', () => { diff --git a/packages/aws-cdk/test/util/yargs-helpers.test.ts b/packages/aws-cdk/test/util/yargs-helpers.test.ts index 5ad8a17a62f78..e8113a61255a8 100644 --- a/packages/aws-cdk/test/util/yargs-helpers.test.ts +++ b/packages/aws-cdk/test/util/yargs-helpers.test.ts @@ -1,4 +1,4 @@ -import { isCI } from '../../lib/util/yargs-helpers'; +import { isCI } from '../../lib/cli/yargs-helpers'; test.each([ ['true', true], diff --git a/packages/aws-cdk/test/version.test.ts b/packages/aws-cdk/test/version.test.ts index c0242d779ef48..820341c6c5b77 100644 --- a/packages/aws-cdk/test/version.test.ts +++ b/packages/aws-cdk/test/version.test.ts @@ -5,8 +5,8 @@ import { promisify } from 'util'; import * as fs from 'fs-extra'; import * as os from 'os'; import * as sinon from 'sinon'; -import * as logging from '../lib/logging'; -import * as npm from '../lib/util/npm'; +import * as logging from '@aws-cdk/tmp-toolkit-helpers/lib/api/logging'; +import * as npm from '@aws-cdk/tmp-toolkit-helpers/lib/util/npm'; import { latestVersionIfHigher, VersionCheckTTL, displayVersionMessage, isDeveloperBuild } from '../lib/version'; jest.setTimeout(10_000); diff --git a/packages/aws-cdk/test/work-graph-builder.test.ts b/packages/aws-cdk/test/work-graph-builder.test.ts index eb40873d346c3..7090bed701324 100644 --- a/packages/aws-cdk/test/work-graph-builder.test.ts +++ b/packages/aws-cdk/test/work-graph-builder.test.ts @@ -3,11 +3,11 @@ import * as path from 'path'; import * as cxschema from '@aws-cdk/cloud-assembly-schema'; import * as cxapi from '@aws-cdk/cx-api'; import { CloudAssemblyBuilder } from '@aws-cdk/cx-api'; +import { WorkGraph } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph'; +import { WorkGraphBuilder } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-builder'; +import { AssetBuildNode, AssetPublishNode, StackNode, WorkNode } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-types'; // eslint-disable-next-line import/no-extraneous-dependencies import { expect } from '@jest/globals'; -import { WorkGraph } from '../lib/util/work-graph'; -import { WorkGraphBuilder } from '../lib/util/work-graph-builder'; -import { AssetBuildNode, AssetPublishNode, StackNode, WorkNode } from '../lib/util/work-graph-types'; let rootBuilder: CloudAssemblyBuilder; beforeEach(() => { diff --git a/packages/aws-cdk/test/work-graph.test.ts b/packages/aws-cdk/test/work-graph.test.ts index 0ac789729c6ea..e6f5fdfce475e 100644 --- a/packages/aws-cdk/test/work-graph.test.ts +++ b/packages/aws-cdk/test/work-graph.test.ts @@ -1,5 +1,5 @@ -import { WorkGraph } from '../lib/util/work-graph'; -import { AssetBuildNode, AssetPublishNode, DeploymentState, StackNode } from '../lib/util/work-graph-types'; +import { WorkGraph } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph'; +import { AssetBuildNode, AssetPublishNode, DeploymentState, StackNode } from '@aws-cdk/tmp-toolkit-helpers/lib/util/work-graph-types'; const DUMMY: any = 'DUMMY'; diff --git a/packages/aws-cdk/test/yaml.test.ts b/packages/aws-cdk/test/yaml.test.ts index f7cfc8fd7586f..596ec8e71c929 100644 --- a/packages/aws-cdk/test/yaml.test.ts +++ b/packages/aws-cdk/test/yaml.test.ts @@ -1,5 +1,5 @@ /* eslint-disable import/order */ -import { deserializeStructure, toYAML } from '../lib/serialize'; +import { deserializeStructure, toYAML } from '@aws-cdk/tmp-toolkit-helpers/lib/util/serialize'; // Preferred quote of the YAML library const q = '"'; diff --git a/packages/aws-cdk/tsconfig.json b/packages/aws-cdk/tsconfig.json index 86529a2bdeb65..ba3ebb6f6db63 100644 --- a/packages/aws-cdk/tsconfig.json +++ b/packages/aws-cdk/tsconfig.json @@ -25,16 +25,13 @@ "include": [ "**/*.ts", "**/*.d.ts", - "lib/init-templates/**/*.hook.ts" + "resources/init-templates/**/*.hook.ts" ], "exclude": [ - "lib/init-templates/**/typescript/*/*.ts", - "test/integ/cli/sam_cdk_integ_app/**/*", - "vendor/**/*", + "resources/init-templates/**/typescript/*/*.ts", ], "references": [ - { - "path": "../@aws-cdk/cloudformation-diff" - } + { "path": "../@aws-cdk/cx-api" }, + { "path": "../@aws-cdk/tmp-toolkit-helpers" }, ] } diff --git a/tools/@aws-cdk/pkglint/lib/rules.ts b/tools/@aws-cdk/pkglint/lib/rules.ts index 808911a78e36d..2e9eb64be4152 100644 --- a/tools/@aws-cdk/pkglint/lib/rules.ts +++ b/tools/@aws-cdk/pkglint/lib/rules.ts @@ -1074,6 +1074,7 @@ export class MustDependonCdkByPointVersions extends ValidationRule { '@aws-cdk/asset-node-proxy-agent-v6', '@aws-cdk/asset-awscli-v1', '@aws-cdk/cdk-cli-wrapper', + '@aws-cdk/tmp-toolkit-helpers', ]; for (const [depName, depVersion] of Object.entries(pkg.dependencies)) { diff --git a/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts b/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts index b348059eff33e..baaefe32d8be5 100644 --- a/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts +++ b/tools/@aws-cdk/user-input-gen/lib/convert-to-user-input-gen.ts @@ -15,7 +15,7 @@ export async function renderUserInputFuncs(config: CliConfig): Promise { scope.documentation.push('Do not edit by hand; all changes will be overwritten at build time from the config file.'); scope.documentation.push('-------------------------------------------------------------------------------------------'); - scope.addImport(new SelectiveModuleImport(scope, './settings', ['Command'])); + scope.addImport(new SelectiveModuleImport(scope, '@aws-cdk/tmp-toolkit-helpers/lib/api/settings', ['Command'])); scope.addImport(new SelectiveModuleImport(scope, './user-input', ['UserInput', 'GlobalOptions'])); const userInputType = Type.fromName(scope, 'UserInput'); diff --git a/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts b/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts index e6f97f90e8865..d22067f18e1cc 100644 --- a/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts +++ b/tools/@aws-cdk/user-input-gen/lib/user-input-gen.ts @@ -21,7 +21,7 @@ export async function renderUserInputType(config: CliConfig): Promise { }); // add required command - scope.addImport(new SelectiveModuleImport(scope, './settings', ['Command'])); + scope.addImport(new SelectiveModuleImport(scope, '@aws-cdk/tmp-toolkit-helpers/lib/api/settings', ['Command'])); const commandEnum = Type.fromName(scope, 'Command'); userInputType.addProperty({ diff --git a/yarn.lock b/yarn.lock index bc30463b93516..220da8fd8bc00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9901,17 +9901,6 @@ cli-boxes@^3.0.0: resolved "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145" integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g== -cli-color@^2.0.0: - version "2.0.4" - resolved "https://registry.npmjs.org/cli-color/-/cli-color-2.0.4.tgz#d658080290968816b322248b7306fad2346fb2c8" - integrity sha512-zlnpg0jNcibNrO7GG9IeHH7maWFeCz+Ja1wx/7tZNU5ASSSSZ+/qZciM0/LHCYxSdqv5h2sdbQ/PXYdOuetXvA== - dependencies: - d "^1.0.1" - es5-ext "^0.10.64" - es6-iterator "^2.0.3" - memoizee "^0.4.15" - timers-ext "^0.1.7" - cli-columns@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646" @@ -10629,14 +10618,6 @@ cssesc@^3.0.0: resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -d@1, d@^1.0.1, d@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de" - integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw== - dependencies: - es5-ext "^0.10.64" - type "^2.7.2" - dargs@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" @@ -11005,13 +10986,6 @@ diff@^5.1.0, diff@^5.2.0: resolved "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A== -difflib@~0.2.1: - version "0.2.4" - resolved "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz#b5e30361a6db023176d562892db85940a718f47e" - integrity sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w== - dependencies: - heap ">= 0.2.0" - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -11094,13 +11068,6 @@ downlevel-dts@^0.11.0: shelljs "^0.8.3" typescript next -dreamopt@~0.8.0: - version "0.8.0" - resolved "https://registry.npmjs.org/dreamopt/-/dreamopt-0.8.0.tgz#5bcc80be7097e45fc489c342405ab68140a8c1d9" - integrity sha512-vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg== - dependencies: - wordwrap ">=0.0.2" - duplexer@^0.1.1: version "0.1.2" resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" @@ -11315,48 +11282,11 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.2: - version "0.10.64" - resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714" - integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg== - dependencies: - es6-iterator "^2.0.3" - es6-symbol "^3.1.3" - esniff "^2.0.1" - next-tick "^1.1.0" - es6-error@^4.0.1: version "4.1.1" resolved "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== -es6-iterator@^2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g== - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.1.1, es6-symbol@^3.1.3: - version "3.1.4" - resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c" - integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg== - dependencies: - d "^1.0.2" - ext "^1.7.0" - -es6-weak-map@^2.0.3: - version "2.0.3" - resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53" - integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA== - dependencies: - d "1" - es5-ext "^0.10.46" - es6-iterator "^2.0.3" - es6-symbol "^3.1.1" - esbuild@^0.24.0: version "0.24.0" resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz#f2d470596885fcb2e91c21eb3da3b3c89c0b55e7" @@ -11554,16 +11484,6 @@ eslint@^8: strip-ansi "^6.0.1" text-table "^0.2.0" -esniff@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308" - integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg== - dependencies: - d "^1.0.1" - es5-ext "^0.10.62" - event-emitter "^0.3.5" - type "^2.7.2" - espree@^10.3.0: version "10.3.0" resolved "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a" @@ -11616,14 +11536,6 @@ etag@~1.8.1: resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -event-emitter@^0.3.5: - version "0.3.5" - resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA== - dependencies: - d "1" - es5-ext "~0.10.14" - event-target-shim@^5.0.0: version "5.0.1" resolved "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" @@ -11737,13 +11649,6 @@ express@^4.14.0: utils-merge "1.0.1" vary "~1.1.2" -ext@^1.7.0: - version "1.7.0" - resolved "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f" - integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw== - dependencies: - type "^2.7.2" - external-editor@^3.0.3: version "3.1.0" resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" @@ -12620,11 +12525,6 @@ header-case@^2.0.4: capital-case "^1.0.4" tslib "^2.0.3" -"heap@>= 0.2.0": - version "0.2.7" - resolved "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz#1e6adf711d3f27ce35a81fe3b7bd576c2260a8fc" - integrity sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg== - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -13154,11 +13054,6 @@ is-plain-object@^5.0.0: resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== -is-promise@^2.2.2: - version "2.2.2" - resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" - integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== - is-regex@^1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -13977,15 +13872,6 @@ json-buffer@3.0.1: resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-diff@^0.10.0: - version "0.10.0" - resolved "https://registry.npmjs.org/json-diff/-/json-diff-0.10.0.tgz#9ded0aea47bccad7900eabce441d03a82cbd19af" - integrity sha512-jOkbyMEdbIhROk4s9qWyD+YZ1jSHX8mHlUqWz71jwnRB/rDhWZBLdhv84j5pu4Ri8fFAnFOZANHKIlExcf2+KQ== - dependencies: - cli-color "^2.0.0" - difflib "~0.2.1" - dreamopt "~0.8.0" - json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -14651,13 +14537,6 @@ lru-cache@^7.14.0, lru-cache@^7.14.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-ca resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== -lru-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" - integrity sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ== - dependencies: - es5-ext "~0.10.2" - madge@^5.0.2: version "5.0.2" resolved "https://registry.npmjs.org/madge/-/madge-5.0.2.tgz#d34527af7e96de9625e8069902667c4c5a073ada" @@ -14850,20 +14729,6 @@ media-typer@0.3.0: resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== -memoizee@^0.4.15: - version "0.4.17" - resolved "https://registry.npmjs.org/memoizee/-/memoizee-0.4.17.tgz#942a5f8acee281fa6fb9c620bddc57e3b7382949" - integrity sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA== - dependencies: - d "^1.0.2" - es5-ext "^0.10.64" - es6-weak-map "^2.0.3" - event-emitter "^0.3.5" - is-promise "^2.2.2" - lru-queue "^0.1.0" - next-tick "^1.1.0" - timers-ext "^0.1.7" - meow@^8.0.0, meow@^8.1.2: version "8.1.2" resolved "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" @@ -15280,11 +15145,6 @@ netmask@^2.0.2: resolved "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7" integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg== -next-tick@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" - integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== - nise@^4.0.4: version "4.1.0" resolved "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz#8fb75a26e90b99202fa1e63f448f58efbcdedaf6" @@ -18256,14 +18116,6 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== -timers-ext@^0.1.7: - version "0.1.8" - resolved "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.8.tgz#b4e442f10b7624a29dd2aa42c295e257150cf16c" - integrity sha512-wFH7+SEAcKfJpfLPkrgMPvvwnEtj8W4IurvEyrKsDleXnKLCDw71w8jltvfLa8Rm4qQxxT4jmDBYbJG/z7qoww== - dependencies: - es5-ext "^0.10.64" - next-tick "^1.1.0" - tiny-invariant@^1.3.3: version "1.3.3" resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127" @@ -18527,11 +18379,6 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -type@^2.7.2: - version "2.7.3" - resolved "https://registry.npmjs.org/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486" - integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ== - typed-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" @@ -18637,6 +18484,11 @@ typescript@~5.7: resolved "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6" integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg== +typescript@~5.7.3: + version "5.7.3" + resolved "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e" + integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -19069,7 +18921,7 @@ word-wrap@^1.2.5: resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -wordwrap@>=0.0.2, wordwrap@^1.0.0: +wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==