From 07137e34474282bee7feaadf74ab0e43e8b36c60 Mon Sep 17 00:00:00 2001 From: epolon Date: Thu, 19 Sep 2024 14:22:34 +0300 Subject: [PATCH] mid work --- build.assume-role-additional-options.sh | 15 +++-- packages/@aws-cdk/cx-api/package.json | 4 +- packages/@aws-cdk/integ-runner/package.json | 4 +- packages/aws-cdk/package.json | 4 +- yarn.lock | 71 +++++++++------------ 5 files changed, 46 insertions(+), 52 deletions(-) diff --git a/build.assume-role-additional-options.sh b/build.assume-role-additional-options.sh index 4eca0e3f6084f..d7fb2af22250a 100755 --- a/build.assume-role-additional-options.sh +++ b/build.assume-role-additional-options.sh @@ -34,7 +34,7 @@ cd ${builddir} echo "Working directory: ${builddir}" -git clone https://github.com/cdklabs/cloud-assembly-schema.git -b sumughan/add-session-tags-to-schema --single-branch +git clone https://github.com/cdklabs/cloud-assembly-schema.git -b main --single-branch git clone https://github.com/cdklabs//cdk-assets.git -b sumughan/add-session-tags-to-client-options --single-branch git clone https://github.com/aws/aws-cdk.git -b sumughan/session-tags --single-branch @@ -98,10 +98,12 @@ echo "Building aws-cdk" cp ${cloud_assembly_schema_pkg} aws-cdk/packages/aws-cdk/cloud-assembly-schema.tgz cp ${cdk_assets_pkg} aws-cdk/packages/aws-cdk/cdk-assets.tgz cp ${cx_api_pkg} aws-cdk/packages/aws-cdk/cx-api.tgz +cp ${cdk_assets_pkg} aws-cdk/packages/@aws-cdk/integ-runner/cdk-assets.tgz (cd aws-cdk/packages/@aws-cdk/cx-api && set_peer_dependency_version "@aws-cdk/cloud-assembly-schema" "./cloud-assembly-schema.tgz") (cd aws-cdk/packages/@aws-cdk/cx-api && set_dev_dependency_version "@aws-cdk/cloud-assembly-schema" "./cloud-assembly-schema.tgz") (cd aws-cdk/packages/@aws-cdk/integ-runner && set_dependency_version "@aws-cdk/cloud-assembly-schema" "./cloud-assembly-schema.tgz") +(cd aws-cdk/packages/@aws-cdk/integ-runner && set_dependency_version "cdk-assets" "./cdk-assets.tgz") (cd aws-cdk/packages/aws-cdk && set_dependency_version "@aws-cdk/cloud-assembly-schema" "./cloud-assembly-schema.tgz") (cd aws-cdk/packages/aws-cdk-lib && set_dependency_version "@aws-cdk/cloud-assembly-schema" "./cloud-assembly-schema.tgz") @@ -113,6 +115,7 @@ cp ${cx_api_pkg} aws-cdk/packages/aws-cdk/cx-api.tgz (cd aws-cdk/packages/@aws-cdk/cx-api && set_peer_dependency_version "@aws-cdk/cloud-assembly-schema" "${allow_all_version_range}") (cd aws-cdk/packages/@aws-cdk/cx-api && set_dev_dependency_version "@aws-cdk/cloud-assembly-schema" "${allow_all_version_range}") (cd aws-cdk/packages/@aws-cdk/integ-runner && set_dependency_version "@aws-cdk/cloud-assembly-schema" "${allow_all_version_range}") +(cd aws-cdk/packages/@aws-cdk/integ-runner && set_dependency_version "cdk-assets" "${allow_all_version_range}") (cd aws-cdk/packages/aws-cdk && set_dependency_version "@aws-cdk/cloud-assembly-schema" "${allow_all_version_range}") (cd aws-cdk/packages/aws-cdk-lib && set_dependency_version "@aws-cdk/cloud-assembly-schema" "${allow_all_version_range}") @@ -139,11 +142,11 @@ echo "aws-cdk package: ${aws_cdk_pkg}" workdir=$(mktemp -d) -(cd ${workdir} && mv ${cloud_assembly_schema_pkg} "cloud-assembly-schema.tgz") -(cd ${workdir} && mv ${cx_api_pkg} "cx-api.tgz") -(cd ${workdir} && mv ${cdk_assets_pkg} "cdk-assets.tgz") -(cd ${workdir} && mv ${aws_cdk_lib_pkg} "aws-cdk-lib.tgz") -(cd ${workdir} && mv ${aws_cdk_pkg} "aws-cdk.tgz") +(cd ${workdir} && cp ${cloud_assembly_schema_pkg} "cloud-assembly-schema.tgz") +(cd ${workdir} && cp ${cx_api_pkg} "cx-api.tgz") +(cd ${workdir} && cp ${cdk_assets_pkg} "cdk-assets.tgz") +(cd ${workdir} && cp ${aws_cdk_lib_pkg} "aws-cdk-lib.tgz") +(cd ${workdir} && cp ${aws_cdk_pkg} "aws-cdk.tgz") (cd ${workdir} && npm install "./cloud-assembly-schema.tgz") (cd ${workdir} && npm install "./cx-api.tgz") diff --git a/packages/@aws-cdk/cx-api/package.json b/packages/@aws-cdk/cx-api/package.json index 750fe90d3e2d4..31cc267e1ecc8 100644 --- a/packages/@aws-cdk/cx-api/package.json +++ b/packages/@aws-cdk/cx-api/package.json @@ -82,12 +82,12 @@ "semver": "^7.6.3" }, "peerDependencies": { - "@aws-cdk/cloud-assembly-schema": "^36.0.5" + "@aws-cdk/cloud-assembly-schema": "^38.0.0" }, "license": "Apache-2.0", "devDependencies": { "@aws-cdk/cdk-build-tools": "0.0.0", - "@aws-cdk/cloud-assembly-schema": "^36.0.24", + "@aws-cdk/cloud-assembly-schema": "^38.0.0", "@aws-cdk/pkglint": "0.0.0", "@types/jest": "^29.5.12", "@types/mock-fs": "^4.13.4", diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json index 756b87472a57a..65a03c0dee58d 100644 --- a/packages/@aws-cdk/integ-runner/package.json +++ b/packages/@aws-cdk/integ-runner/package.json @@ -71,11 +71,11 @@ }, "dependencies": { "chokidar": "^3.6.0", - "@aws-cdk/cloud-assembly-schema": "^36.0.24", + "@aws-cdk/cloud-assembly-schema": "^38.0.0", "@aws-cdk/cloudformation-diff": "0.0.0", "@aws-cdk/cx-api": "0.0.0", "@aws-cdk/aws-service-spec": "^0.1.23", - "cdk-assets": "^2.151.29", + "cdk-assets": "^2.152.0", "@aws-cdk/cdk-cli-wrapper": "0.0.0", "aws-cdk": "0.0.0", "chalk": "^4", diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index 79f9e8064b5d6..b57114cf0c19a 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -96,7 +96,7 @@ "xml-js": "^1.6.11" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "^36.0.24", + "@aws-cdk/cloud-assembly-schema": "^38.0.0", "@aws-cdk/cloudformation-diff": "0.0.0", "@aws-cdk/cx-api": "0.0.0", "@aws-cdk/region-info": "0.0.0", @@ -104,7 +104,7 @@ "archiver": "^5.3.2", "aws-sdk": "^2.1691.0", "camelcase": "^6.3.0", - "cdk-assets": "^2.151.29", + "cdk-assets": "^2.152.0", "cdk-from-cfn": "^0.162.0", "chalk": "^4", "chokidar": "^3.6.0", diff --git a/yarn.lock b/yarn.lock index ec85df378061c..1c36618fa6caf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -59,6 +59,14 @@ "@aws-cdk/service-spec-types" "^0.0.90" "@cdklabs/tskb" "^0.0.3" +"@aws-cdk/cloud-assembly-schema@2.153.0": + version "2.153.0" + resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.153.0.tgz#43d86b52f4fd9aa5ad384d30e7001e116917dab2" + integrity sha512-m304DL4pIfY7N3qWcXzkpKEUL/kqpOdmPgGvWrx5JDW5/oxT5xByzBiWyNTU3u+IlEcaPXndKI02dUMbVJ3bSA== + dependencies: + jsonschema "^1.4.1" + semver "^7.6.2" + "@aws-cdk/cloud-assembly-schema@^36.0.24": version "36.0.24" resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-36.0.24.tgz#f6f05615223e800771ca99c88ad631c32b33d642" @@ -67,10 +75,18 @@ jsonschema "^1.4.1" semver "^7.6.3" -"@aws-cdk/cx-api@^2.157.0": - version "2.157.0" - resolved "https://registry.npmjs.org/@aws-cdk/cx-api/-/cx-api-2.157.0.tgz#c0721f1d27778dd740c98f12efaf89b105cf89ce" - integrity sha512-PRZAbVVPyhcrnNW4tmSKIp8WMxjo9ImSa1K7MAbK8ufafD+KFWGQgxhVIl3bY6WVeZVaduoXRD2gQZwUaDj3XQ== +"@aws-cdk/cloud-assembly-schema@^38.0.0": + version "38.0.1" + resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-38.0.1.tgz#cdf4684ae8778459e039cd44082ea644a3504ca9" + integrity sha512-KvPe+NMWAulfNVwY7jenFhzhuLhLqJ/OPy5jx7wUstbjnYnjRVLpUHPU3yCjXFE0J8cuJVdx95BJ4rOs66Pi9w== + dependencies: + jsonschema "^1.4.1" + semver "^7.6.3" + +"@aws-cdk/cx-api@2.153.0": + version "2.153.0" + resolved "https://registry.npmjs.org/@aws-cdk/cx-api/-/cx-api-2.153.0.tgz#3115624a66a0eb4b5409b696916859d851ba856e" + integrity sha512-64NWRwjgAHuMQ9FyBmuNDMUUa26vNlhmgXZwccw7iH/8VhfksY8KWlcpWp2hUSSpByoSIBjpF6zngr0/uJmwsw== dependencies: semver "^7.6.2" @@ -8305,7 +8321,7 @@ aws-sdk-mock@5.6.0: sinon "^11.1.1" traverse "^0.6.6" -aws-sdk@^2.1691.0, aws-sdk@^2.928.0: +aws-sdk@^2.1653.0, aws-sdk@^2.1691.0, aws-sdk@^2.928.0: version "2.1691.0" resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1691.0.tgz#9d6ccdcbae03c806fc62667b76eb3e33e5294dcc" integrity sha512-/F2YC+DlsY3UBM2Bdnh5RLHOPNibS/+IcjUuhP8XuctyrN+MlL+fWDAiela32LTDk7hMy4rx8MTgvbJ+0blO5g== @@ -8761,15 +8777,15 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdk-assets@^2.151.29: - version "2.151.30" - resolved "https://registry.npmjs.org/cdk-assets/-/cdk-assets-2.151.30.tgz#6b8bc669540641370c18de8b103821cc1c44ec3e" - integrity sha512-adI0yZIJDh/rz/9FUMcAKokc/9BSj2NzTkVYe03Ca4347SHsWzzLwo3fRFywfCg4/QNGvh9aNNNz6YR7zLII9g== +cdk-assets@^2.152.0: + version "2.153.0" + resolved "https://registry.npmjs.org/cdk-assets/-/cdk-assets-2.153.0.tgz#828330cfe8bd3d3aaf9448a29283cfa15dc45daf" + integrity sha512-uXPVTvzUlVG9OdOM1B77SRmhzwJod2pW3bMLRiCwKfL5qsiYVYumX/FVa6CveF6GEGa31PVRu12SBzcR5d+qyQ== dependencies: - "@aws-cdk/cloud-assembly-schema" "^36.0.24" - "@aws-cdk/cx-api" "^2.157.0" + "@aws-cdk/cloud-assembly-schema" "2.153.0" + "@aws-cdk/cx-api" "2.153.0" archiver "^5.3.2" - aws-sdk "^2.1691.0" + aws-sdk "^2.1653.0" glob "^7.2.3" mime "^2.6.0" yargs "^16.2.0" @@ -16563,16 +16579,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@*, string-width@^1.0.1, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2: +"string-width-cjs@npm:string-width@^4.2.0", string-width@*, string-width@^1.0.1, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -16637,7 +16644,7 @@ stringify-package@^1.0.1: resolved "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -16651,13 +16658,6 @@ strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -17655,7 +17655,7 @@ workerpool@^6.5.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -17673,15 +17673,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"