From dba55ea1eae625d7f206a6328cbefdd6364785ae Mon Sep 17 00:00:00 2001 From: AWS CDK Team Date: Thu, 28 Jul 2022 14:16:31 +0000 Subject: [PATCH 1/3] chore(release): 1.166.0 --- CHANGELOG.md | 12 ++++++++++++ version.v1.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4ba371bcc9e8..24c1971d0bdf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.166.0](https://github.com/aws/aws-cdk/compare/v1.165.0...v1.166.0) (2022-07-28) + + +### Features + +* **cfnspec:** cloudformation spec v81.1.0 ([#21308](https://github.com/aws/aws-cdk/issues/21308)) ([2443310](https://github.com/aws/aws-cdk/commit/2443310cd799b4b0758de403a63657ed98ff3ec2)) + + +### Bug Fixes + +* **aws-lambda:** FunctionUrl incorrectly uses Alias ARNs ([#21351](https://github.com/aws/aws-cdk/issues/21351)) ([9f34d60](https://github.com/aws/aws-cdk/commit/9f34d6018abcc9e2b73da4466e921624099a9949)) + ## [1.165.0](https://github.com/aws/aws-cdk/compare/v1.164.0...v1.165.0) (2022-07-19) diff --git a/version.v1.json b/version.v1.json index f9c6f4656452f..d8ec0ef80e91b 100644 --- a/version.v1.json +++ b/version.v1.json @@ -1,3 +1,3 @@ { - "version": "1.165.0" + "version": "1.166.0" } \ No newline at end of file From 5deac0dbe1cd6aae0d4c88069871525f3173a163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=A7=91=F0=9F=8F=BB=E2=80=8D=F0=9F=92=BB=20Romain=20M?= =?UTF-8?q?arcadier?= Date: Fri, 29 Jul 2022 10:37:11 +0200 Subject: [PATCH 2/3] chore: enabe unsafe-perm for npm install This is necessary when running as root (which CodeBuild does) and the install requires using node-gyp-build. --- buildspec-pr.yaml | 3 +++ buildspec.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/buildspec-pr.yaml b/buildspec-pr.yaml index ade1f4a9be0c6..07de3486b6d92 100644 --- a/buildspec-pr.yaml +++ b/buildspec-pr.yaml @@ -10,6 +10,9 @@ phases: # this also takes care of launching the docker daemon. - /root/ecr-proxy/start.sh + # CodeBuild always runs as root, allow npm to operate as such + - npm config set unsafe-perm true + # Install yarn if it wasn't already present in the image - yarn --version || npm -g install yarn diff --git a/buildspec.yaml b/buildspec.yaml index db462c8b987be..8ed31b025927d 100644 --- a/buildspec.yaml +++ b/buildspec.yaml @@ -10,6 +10,9 @@ phases: # this also takes care of launching the docker daemon. - /root/ecr-proxy/start.sh + # CodeBuild always runs as root, allow npm to operate as such + - npm config set unsafe-perm true + # Install yarn if it wasn't already present in the image - yarn --version || npm -g install yarn From 19c03aa0e7714e9c147744d6a38b665f2fba9fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=A7=91=F0=9F=8F=BB=E2=80=8D=F0=9F=92=BB=20Romain=20M?= =?UTF-8?q?arcadier?= Date: Fri, 29 Jul 2022 15:49:09 +0200 Subject: [PATCH 3/3] chore: revert to jsii-pacmak@1.62.0 The Python dynamic type checking includes incorrect type references in case of nested classes. --- CHANGELOG.md | 7 ++ package.json | 5 +- tools/@aws-cdk/cdk-build-tools/package.json | 2 +- version.v1.json | 4 +- yarn.lock | 105 ++++++++++++++++++-- 5 files changed, 109 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24c1971d0bdf4..bbd9bd77fd8a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.166.1](https://github.com/aws/aws-cdk/compare/v1.166.0...v1.166.1) (2022-07-29) + + +### Bug Fixes + +* Revert to `jsii-pacmak@1.62.0` as dynamic runtime type-checking it introduced for Python results in incorrect code being produced. + ## [1.166.0](https://github.com/aws/aws-cdk/compare/v1.165.0...v1.166.0) (2022-07-28) diff --git a/package.json b/package.json index ba10ec2039da5..8267d222c60c6 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "graceful-fs": "^4.2.10", "jest-junit": "^13.2.0", "jsii-diff": "^1.63.0", - "jsii-pacmak": "^1.63.0", + "jsii-pacmak": "^1.62.0", "jsii-reflect": "^1.63.0", "jsii-rosetta": "^1.63.0", "lerna": "^4.0.0", @@ -35,7 +35,8 @@ "resolutions": { "colors": "1.4.0", "string-width": "^4.2.3", - "markdown-it": "^12.3.2" + "markdown-it": "^12.3.2", + "jsii-pacmak": "1.62.0" }, "repository": { "type": "git", diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index 7313685a07cbc..ee0df7eaa9b4f 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -58,7 +58,7 @@ "jest": "^27.5.1", "jest-junit": "^13.2.0", "jsii": "^1.63.0", - "jsii-pacmak": "^1.63.0", + "jsii-pacmak": "^1.62.0", "jsii-reflect": "^1.63.0", "markdownlint-cli": "^0.32.1", "nyc": "^15.1.0", diff --git a/version.v1.json b/version.v1.json index d8ec0ef80e91b..1d654107a8d1e 100644 --- a/version.v1.json +++ b/version.v1.json @@ -1,3 +1,3 @@ { - "version": "1.166.0" -} \ No newline at end of file + "version": "1.166.1" +} diff --git a/yarn.lock b/yarn.lock index 57a24f6f250f7..374f55a33a73b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -645,6 +645,14 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jsii/check-node@1.62.0": + version "1.62.0" + resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.62.0.tgz#3d3353d37ed1537acdfb63ea3e1506d82adb09b1" + integrity sha512-jYmY12Vrz3/0MJ9GTEfIxf4yh/7fsgYmuBp2UQfDLSfx+eaBvOG4xbjvsoa/AvfWF5VU95QqKAJLBDMOQK4z1g== + dependencies: + chalk "^4.1.2" + semver "^7.3.7" + "@jsii/check-node@1.63.0": version "1.63.0" resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.63.0.tgz#e7f1a3a837107b1fd1b7060ee15e126bf9502375" @@ -653,6 +661,14 @@ chalk "^4.1.2" semver "^7.3.7" +"@jsii/check-node@1.63.1": + version "1.63.1" + resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.63.1.tgz#90c983b2b69e58646013c1670875c237d7a41b5f" + integrity sha512-7XOFJQCIxq5Yh6ldFWCY/h3lh/7UCJRBiu6YZliUVudZAVc4vbKz3Z7fD7Ha2XRGC45zdeoOhO/9z2h6ri35Mg== + dependencies: + chalk "^4.1.2" + semver "^7.3.7" + "@jsii/spec@1.63.0", "@jsii/spec@^1.59.0", "@jsii/spec@^1.63.0": version "1.63.0" resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.63.0.tgz#23db14bf4670a9506e0d4bf86c80bc1f76c6311f" @@ -660,6 +676,13 @@ dependencies: ajv "^8.11.0" +"@jsii/spec@1.63.1", "@jsii/spec@^1.62.0", "@jsii/spec@^1.63.1": + version "1.63.1" + resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.63.1.tgz#eb36ca6d171cc06e6511be62bac0183259fd3b8a" + integrity sha512-XXbmiJK8Uk9Hfb7f3Q0NZX7ArLwoM0GGRrvghh6s9D+yQ1zS6Sj4ETO6A8sXE4tBEaqgFMKr/DDHIc/UuV30Fw== + dependencies: + ajv "^8.11.0" + "@lerna/add@4.0.0": version "4.0.0" resolved "https://registry.npmjs.org/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f" @@ -3237,6 +3260,15 @@ co@^4.6.0: resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== +codemaker@^1.62.0, codemaker@^1.63.1: + version "1.63.1" + resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.63.1.tgz#b3e4caa84d22d919097d167e96d2186309f2493e" + integrity sha512-DkWzb+gS5Khd8VvAgQqUDiT5XRCYiwD1UIkSuGlSTtEGVL5X1TlcQHs9pgmyFiCjTZXvZl4Ax0CSQs7iuibefA== + dependencies: + camelcase "^6.3.0" + decamelize "^5.0.1" + fs-extra "^10.1.0" + codemaker@^1.63.0: version "1.63.0" resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.63.0.tgz#5bb481b88e19dcdd762d67f77124eb8e5811e064" @@ -6770,20 +6802,20 @@ jsii-diff@^1.63.0: log4js "^6.6.0" yargs "^16.2.0" -jsii-pacmak@^1.63.0: - version "1.63.0" - resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.63.0.tgz#c220bcbd4f41aefd3925ad1e6bd904ad88efdabe" - integrity sha512-4FBVnyt0N8el30JZjW9QMsvEiQCQ85C5YRCDF/FoFiNpbP+BiUg+1LhKr4KmTll5f5E0dD5bt7JiqmwWyuXfPQ== +jsii-pacmak@1.62.0, jsii-pacmak@^1.62.0: + version "1.62.0" + resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.62.0.tgz#f95702c21555e66025a0c73ec43b3108b97d210b" + integrity sha512-WL0+QMJHtjaFrDRm8qiBcjUqG/Cio1QJa7up3WCHOFATMAyrpX+cGXA3nfPpTv1xq7nAA7XJgVQv2OIpBR0syQ== dependencies: - "@jsii/check-node" "1.63.0" - "@jsii/spec" "^1.63.0" + "@jsii/check-node" "1.62.0" + "@jsii/spec" "^1.62.0" clone "^2.1.2" - codemaker "^1.63.0" + codemaker "^1.62.0" commonmark "^0.30.0" escape-string-regexp "^4.0.0" fs-extra "^10.1.0" - jsii-reflect "^1.63.0" - jsii-rosetta "^1.63.0" + jsii-reflect "^1.62.0" + jsii-rosetta "^1.62.0" semver "^7.3.7" spdx-license-list "^6.6.0" xmlbuilder "^15.1.1" @@ -6801,6 +6833,18 @@ jsii-reflect@^1.59.0, jsii-reflect@^1.63.0: oo-ascii-tree "^1.63.0" yargs "^16.2.0" +jsii-reflect@^1.62.0, jsii-reflect@^1.63.1: + version "1.63.1" + resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.63.1.tgz#f24b346ddc85b648eb80236e43efe7f18ec54f21" + integrity sha512-4tka0fPDR93UBXggTCyzKBJWsxjfV2lVcD6ulIODSLfXfHHc/0oAxEW7nbOJWA30LeUCuMMRvhGjLA0NO1A08Q== + dependencies: + "@jsii/check-node" "1.63.1" + "@jsii/spec" "^1.63.1" + chalk "^4" + fs-extra "^10.1.0" + oo-ascii-tree "^1.63.1" + yargs "^16.2.0" + jsii-rosetta@^1.59.0, jsii-rosetta@^1.63.0: version "1.63.0" resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.63.0.tgz#e491a3543601e9a5b5874fd5b44ab4b8233778c4" @@ -6820,6 +6864,25 @@ jsii-rosetta@^1.59.0, jsii-rosetta@^1.63.0: workerpool "^6.2.1" yargs "^16.2.0" +jsii-rosetta@^1.62.0, jsii-rosetta@^1.63.1: + version "1.63.1" + resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.63.1.tgz#715aa0ca75ac9f972bf825bd55e024fac95a9238" + integrity sha512-IR9kLOmmnAiwNjrMIBNY/6SlomJOCsDpT6x9nDzaTQS6BojMsSSCQOz5dUboRUoAx19lbbCL7UMoE3/rwwzbcQ== + dependencies: + "@jsii/check-node" "1.63.1" + "@jsii/spec" "1.63.1" + "@xmldom/xmldom" "^0.8.2" + commonmark "^0.30.0" + fast-glob "^3.2.11" + fs-extra "^10.1.0" + jsii "1.63.1" + semver "^7.3.7" + semver-intersect "^1.4.0" + sort-json "^2.0.1" + typescript "~3.9.10" + workerpool "^6.2.1" + yargs "^16.2.0" + jsii@1.63.0, jsii@^1.59.0, jsii@^1.63.0: version "1.63.0" resolved "https://registry.npmjs.org/jsii/-/jsii-1.63.0.tgz#b0b38166d34849ea91f7afeeb04ed46948fb1926" @@ -6839,6 +6902,25 @@ jsii@1.63.0, jsii@^1.59.0, jsii@^1.63.0: typescript "~3.9.10" yargs "^16.2.0" +jsii@1.63.1: + version "1.63.1" + resolved "https://registry.npmjs.org/jsii/-/jsii-1.63.1.tgz#742c8659f171342d81a7786528fc7bc30052b1a3" + integrity sha512-5Y2hrG2UGT4PbmtdTOr9u36PyreTAtDDdTBjJyGv2v7T0bMKrVI3ZK4Z/v1UJllR/uxNnxY7eABULmSL4PrxJw== + dependencies: + "@jsii/check-node" "1.63.1" + "@jsii/spec" "^1.63.1" + case "^1.6.3" + chalk "^4" + fast-deep-equal "^3.1.3" + fs-extra "^10.1.0" + log4js "^6.6.0" + semver "^7.3.7" + semver-intersect "^1.4.0" + sort-json "^2.0.1" + spdx-license-list "^6.6.0" + typescript "~3.9.10" + yargs "^16.2.0" + json-buffer@3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" @@ -8348,6 +8430,11 @@ oo-ascii-tree@^1.63.0: resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.63.0.tgz#7983759d783c709b5f847622032690e453e8e3c5" integrity sha512-Lo8oruFqEzVASt0zp1oGxJqzX0Rlz16tAHkm4Z8yypUdX+gGQXZiyvDcuyEu07QruZTEbdbLMsOu2npR5w5Qog== +oo-ascii-tree@^1.63.1: + version "1.63.1" + resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.63.1.tgz#07bd598f05a82aa39b92482b472efebf16571ec7" + integrity sha512-ztZJV5TGPo+Q3mLMQgxa4l9hpGbO7KXY++sus51+JJjJNUI5aZ9qRsAEoi2LkgspN3cs9+sOq8KZN0e9a329YQ== + open@^7.4.2: version "7.4.2" resolved "https://registry.npmjs.org/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"