diff --git a/.projenrc.ts b/.projenrc.ts index 2c0579583..6e8c625da 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -1144,12 +1144,9 @@ const cli = configureProject( '@aws-sdk/credential-providers', '@aws-sdk/ec2-metadata-service', '@aws-sdk/lib-storage', - '@aws-sdk/middleware-endpoint', - '@aws-sdk/util-retry', - '@aws-sdk/util-waiter', '@smithy/middleware-endpoint', - '@smithy/shared-ini-file-loader', '@smithy/property-provider', + '@smithy/shared-ini-file-loader', '@smithy/types', '@smithy/util-retry', '@smithy/util-waiter', diff --git a/packages/aws-cdk/.projen/deps.json b/packages/aws-cdk/.projen/deps.json index cb5e2ac45..cd2092fc6 100644 --- a/packages/aws-cdk/.projen/deps.json +++ b/packages/aws-cdk/.projen/deps.json @@ -289,18 +289,6 @@ "name": "@aws-sdk/lib-storage", "type": "runtime" }, - { - "name": "@aws-sdk/middleware-endpoint", - "type": "runtime" - }, - { - "name": "@aws-sdk/util-retry", - "type": "runtime" - }, - { - "name": "@aws-sdk/util-waiter", - "type": "runtime" - }, { "name": "@smithy/middleware-endpoint", "type": "runtime" diff --git a/packages/aws-cdk/.projen/tasks.json b/packages/aws-cdk/.projen/tasks.json index d74a391b4..eaf1f7ed8 100644 --- a/packages/aws-cdk/.projen/tasks.json +++ b/packages/aws-cdk/.projen/tasks.json @@ -53,7 +53,7 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --no-deprecated --dep=dev,peer,prod,optional --filter=@cdklabs/eslint-plugin,@types/archiver,@types/jest,@types/mockery,@types/promptly,@types/semver,@types/sinon,aws-cdk-lib,aws-sdk-client-mock,aws-sdk-client-mock-jest,axios,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-jest,eslint-plugin-jsdoc,eslint-plugin-prettier,fast-check,jest,jest-environment-node,jest-mock,license-checker,madge,node-backpack,sinon,ts-jest,ts-mock-imports,xml-js,@aws-cdk/cx-api,@aws-sdk/client-appsync,@aws-sdk/client-cloudcontrol,@aws-sdk/client-cloudformation,@aws-sdk/client-cloudwatch-logs,@aws-sdk/client-codebuild,@aws-sdk/client-ec2,@aws-sdk/client-ecr,@aws-sdk/client-ecs,@aws-sdk/client-elastic-load-balancing-v2,@aws-sdk/client-iam,@aws-sdk/client-kms,@aws-sdk/client-lambda,@aws-sdk/client-route-53,@aws-sdk/client-s3,@aws-sdk/client-secrets-manager,@aws-sdk/client-sfn,@aws-sdk/client-ssm,@aws-sdk/client-sts,@aws-sdk/credential-providers,@aws-sdk/ec2-metadata-service,@aws-sdk/lib-storage,@aws-sdk/middleware-endpoint,@aws-sdk/util-retry,@aws-sdk/util-waiter,@smithy/middleware-endpoint,@smithy/property-provider,@smithy/shared-ini-file-loader,@smithy/types,@smithy/util-retry,@smithy/util-waiter,archiver,cdk-from-cfn,enquirer,glob,minimatch,promptly,proxy-agent,semver,uuid" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --no-deprecated --dep=dev,peer,prod,optional --filter=@cdklabs/eslint-plugin,@types/archiver,@types/jest,@types/mockery,@types/promptly,@types/semver,@types/sinon,aws-cdk-lib,aws-sdk-client-mock,aws-sdk-client-mock-jest,axios,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-jest,eslint-plugin-jsdoc,eslint-plugin-prettier,fast-check,jest,jest-environment-node,jest-mock,license-checker,madge,node-backpack,sinon,ts-jest,ts-mock-imports,xml-js,@aws-cdk/cx-api,@aws-sdk/client-appsync,@aws-sdk/client-cloudcontrol,@aws-sdk/client-cloudformation,@aws-sdk/client-cloudwatch-logs,@aws-sdk/client-codebuild,@aws-sdk/client-ec2,@aws-sdk/client-ecr,@aws-sdk/client-ecs,@aws-sdk/client-elastic-load-balancing-v2,@aws-sdk/client-iam,@aws-sdk/client-kms,@aws-sdk/client-lambda,@aws-sdk/client-route-53,@aws-sdk/client-s3,@aws-sdk/client-secrets-manager,@aws-sdk/client-sfn,@aws-sdk/client-ssm,@aws-sdk/client-sts,@aws-sdk/credential-providers,@aws-sdk/ec2-metadata-service,@aws-sdk/lib-storage,@smithy/middleware-endpoint,@smithy/property-provider,@smithy/shared-ini-file-loader,@smithy/types,@smithy/util-retry,@smithy/util-waiter,archiver,cdk-from-cfn,enquirer,glob,minimatch,promptly,proxy-agent,semver,uuid" } ] }, diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index c80d02aa9..7e680df96 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -105,9 +105,6 @@ "@aws-sdk/credential-providers": "^3", "@aws-sdk/ec2-metadata-service": "^3", "@aws-sdk/lib-storage": "^3", - "@aws-sdk/middleware-endpoint": "^3.374.0", - "@aws-sdk/util-retry": "^3.374.0", - "@aws-sdk/util-waiter": "^3.374.0", "@smithy/middleware-endpoint": "^4.2.1", "@smithy/property-provider": "^4.1.1", "@smithy/shared-ini-file-loader": "^4.1.1", diff --git a/yarn.lock b/yarn.lock index 88d1f0ffa..70c125329 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1601,14 +1601,6 @@ "@aws-sdk/protocol-http" "3.0.0" tslib "^1.8.0" -"@aws-sdk/middleware-endpoint@^3.374.0": - version "3.374.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.374.0.tgz#a10c0a3d9fbe29ae0f63fc579037845c43bb7e65" - integrity sha512-bCE1C4JvCqy0dG6yExl0ssvGBVoiG1WzJhcOtUb3Aiyu9x6tueyBonfGYYGGwtxlXAnVBmM+JMG9EeFZ07LIxQ== - dependencies: - "@smithy/middleware-endpoint" "^1.0.2" - tslib "^2.5.0" - "@aws-sdk/middleware-expect-continue@3.887.0": version "3.887.0" resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.887.0.tgz#cc52bc31752875a8d3dfa84a5705e2b563ffc39f" @@ -2067,14 +2059,6 @@ dependencies: tslib "^2.6.2" -"@aws-sdk/util-retry@^3.374.0": - version "3.374.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.374.0.tgz#7fd819d5857609b65a1bf06c39701fe5de5ad6cd" - integrity sha512-0p/trhYU+Ys8j3vMnWCvAkSOL6JRMooV9dVlQ+o7EHbQs9kDtnyucMUHU09ahHSIPTA/n/013hv7bzIt3MyKQg== - dependencies: - "@smithy/util-retry" "^1.0.3" - tslib "^2.5.0" - "@aws-sdk/util-uri-escape@3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-3.0.0.tgz#90cbcdc7502e3be4df8afc86a9800914b403d3b8" @@ -2148,14 +2132,6 @@ "@aws-sdk/types" "3.0.0" tslib "^1.8.0" -"@aws-sdk/util-waiter@^3.374.0": - version "3.374.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-waiter/-/util-waiter-3.374.0.tgz#b93855b2766ae008b3c359d5aee279333c846b15" - integrity sha512-NlPn+hC4H+tPOnJ00g/DjYcwTVWdkNlOtUUmQ9c7u3EsPSNbaw8vEPkh+YdWENtX8NmG0yn0D29fTp/vfvLfAw== - dependencies: - "@smithy/util-waiter" "^1.0.1" - tslib "^2.5.0" - "@aws-sdk/xml-builder@3.887.0": version "3.887.0" resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.887.0.tgz#376754d19384bbe5b8139c0a0e6521a4a6500c67" @@ -3982,14 +3958,6 @@ resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz#282046f03e886e352b2d5f5da5eb755e01457f3f" integrity sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA== -"@smithy/abort-controller@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-1.1.0.tgz#2da0d73c504b93ca8bb83bdc8d6b8208d73f418b" - integrity sha512-5imgGUlZL4dW4YWdMYAKLmal9ny/tlenM81QZY7xYyb76z9Z/QOg7oM5Ak9HQl8QfFTlGVWwcMXl+54jroRgEQ== - dependencies: - "@smithy/types" "^1.2.0" - tslib "^2.5.0" - "@smithy/abort-controller@^4.0.5", "@smithy/abort-controller@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.1.1.tgz#9b3872ab6b2c061486175c281dadc0a853260533" @@ -4177,17 +4145,6 @@ "@smithy/types" "^4.5.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^1.0.2": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-1.1.0.tgz#ce3cfd5933c5a088339192d4fb1dd09ce6186777" - integrity sha512-PvpazNjVpxX2ICrzoFYCpFnjB39DKCpZds8lRpAB3p6HGrx6QHBaNvOzVhJGBf0jcAbfCdc5/W0n9z8VWaSSww== - dependencies: - "@smithy/middleware-serde" "^1.1.0" - "@smithy/types" "^1.2.0" - "@smithy/url-parser" "^1.1.0" - "@smithy/util-middleware" "^1.1.0" - tslib "^2.5.0" - "@smithy/middleware-endpoint@^4", "@smithy/middleware-endpoint@^4.2.1": version "4.2.1" resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.1.tgz#54c61a113e6da7b615724d03517879d377d3888d" @@ -4218,14 +4175,6 @@ tslib "^2.6.2" uuid "^9.0.1" -"@smithy/middleware-serde@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-1.1.0.tgz#daed29eb34337d1206f10c09d801cc28f13e5819" - integrity sha512-RiBMxhxuO9VTjHsjJvhzViyceoLhU6gtrnJGpAXY43wE49IstXIGEQz8MT50/hOq5EumX16FCpup0r5DVyfqNQ== - dependencies: - "@smithy/types" "^1.2.0" - tslib "^2.5.0" - "@smithy/middleware-serde@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz#cfb99f53c744d7730928235cbe66cc7ff8a8a9b2" @@ -4289,14 +4238,6 @@ "@smithy/util-uri-escape" "^4.1.0" tslib "^2.6.2" -"@smithy/querystring-parser@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-1.1.0.tgz#4bf4be6d1db8b769d346a0d98c5b0db4e99a8ba6" - integrity sha512-Lm/FZu2qW3XX+kZ4WPwr+7aAeHf1Lm84UjNkKyBu16XbmEV7ukfhXni2aIwS2rcVf8Yv5E7wchGGpOFldj9V4Q== - dependencies: - "@smithy/types" "^1.2.0" - tslib "^2.5.0" - "@smithy/querystring-parser@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz#21b861439b2db16abeb0a6789b126705fa25eea1" @@ -4305,11 +4246,6 @@ "@smithy/types" "^4.5.0" tslib "^2.6.2" -"@smithy/service-error-classification@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-1.1.0.tgz#264dd432ae513b3f2ad9fc6f461deda8c516173c" - integrity sha512-OCTEeJ1igatd5kFrS2VDlYbainNNpf7Lj1siFOxnRWqYOP9oNvC5HOJBd3t+Z8MbrmehBtuDJ2QqeBsfeiNkww== - "@smithy/service-error-classification@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.1.1.tgz#86a615298ae406c3b6c7dc63c1c1738c54cfdfc6" @@ -4352,13 +4288,6 @@ "@smithy/util-stream" "^4.3.1" tslib "^2.6.2" -"@smithy/types@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-1.2.0.tgz#9dc65767b0ee3d6681704fcc67665d6fc9b6a34e" - integrity sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA== - dependencies: - tslib "^2.5.0" - "@smithy/types@^4.5.0": version "4.5.0" resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.5.0.tgz#850e334662a1ef1286c35814940c80880400a370" @@ -4366,15 +4295,6 @@ dependencies: tslib "^2.6.2" -"@smithy/url-parser@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-1.1.0.tgz#1d88af653b02fda0be59064bfe5420c0b34b4dcb" - integrity sha512-tpvi761kzboiLNGEWczuybMPCJh6WHB3cz9gWAG95mSyaKXmmX8ZcMxoV+irZfxDqLwZVJ22XTumu32S7Ow8aQ== - dependencies: - "@smithy/querystring-parser" "^1.1.0" - "@smithy/types" "^1.2.0" - tslib "^2.5.0" - "@smithy/url-parser@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.1.1.tgz#0e9a5e72b3cf9d7ab7305f9093af5528d9debaf6" @@ -4470,13 +4390,6 @@ dependencies: tslib "^2.6.2" -"@smithy/util-middleware@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-1.1.0.tgz#9f186489437ca2ef753c5e1de2930f76fd1edc14" - integrity sha512-6hhckcBqVgjWAqLy2vqlPZ3rfxLDhFWEmM7oLh2POGvsi7j0tHkbN7w4DFhuBExVJAbJ/qqxqZdRY6Fu7/OezQ== - dependencies: - tslib "^2.5.0" - "@smithy/util-middleware@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.1.1.tgz#e19749a127499c9bdada713a8afd807d92d846e2" @@ -4485,14 +4398,6 @@ "@smithy/types" "^4.5.0" tslib "^2.6.2" -"@smithy/util-retry@^1.0.3": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-1.1.0.tgz#f6e62ec7d7d30f1dd9608991730ba7a86e445047" - integrity sha512-ygQW5HBqYXpR3ua09UciS0sL7UGJzGiktrKkOuEJwARoUuzz40yaEGU6xd9Gs7KBmAaFC8gMfnghHtwZ2nyBCQ== - dependencies: - "@smithy/service-error-classification" "^1.1.0" - tslib "^2.5.0" - "@smithy/util-retry@^4", "@smithy/util-retry@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.1.1.tgz#f4a99d9b0ffb9e4bb119ac5a24e54e54d891e22c" @@ -4539,15 +4444,6 @@ "@smithy/util-buffer-from" "^4.1.0" tslib "^2.6.2" -"@smithy/util-waiter@^1.0.1": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-1.1.0.tgz#214ce9327100636701d55516cc4188cacc6cc325" - integrity sha512-S6FNIB3UJT+5Efd/0DeziO5Rs82QAMODHW4v2V3oNRrwaBigY/7Yx3SiLudZuF9WpVsV08Ih3BjIH34nzZiinQ== - dependencies: - "@smithy/abort-controller" "^1.1.0" - "@smithy/types" "^1.2.0" - tslib "^2.5.0" - "@smithy/util-waiter@^4", "@smithy/util-waiter@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.1.1.tgz#5b74429ca9e37f61838800b919d0063b1a865bef" @@ -13770,7 +13666,7 @@ tslib@^1.11.1, tslib@^1.8.0, tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2: +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.6.2: version "2.8.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==