Merge branch 'master' into hotswap/cfn-exec

aws · Sep 30, 2021 · e00d8a2 · e00d8a2
2 parents 6e50d63 + 5e8e7ab
commit e00d8a2
Show file tree

Hide file tree

Showing 1,092 changed files with 4,801 additions and 3,772 deletions.
diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml
@@ -24,10 +24,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install & Build prlint
-        run: cd tools/prlint && yarn install --frozen-lockfile && yarn build+test
+        run: cd tools/@aws-cdk/prlint && yarn install --frozen-lockfile && yarn build+test
 
       - name: Validate
-        uses: ./tools/prlint
+        uses: ./tools/@aws-cdk/prlint
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO_ROOT: ${{ github.workspace }}
diff --git 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.125.0](https://github.com/aws/aws-cdk/compare/v1.124.0...v1.125.0) (2021-09-29)
+
+
+### Features
+
+* **lambda:** support for ARM architecture ([b3ba35e](https://github.com/aws/aws-cdk/commit/b3ba35e9b8b157303a29350031885eff0c73b05b))
+
 ## [1.124.0](https://github.com/aws/aws-cdk/compare/v1.123.0...v1.124.0) (2021-09-21)
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -602,7 +602,7 @@ The following linters are used:
 
 #### eslint
 
-All packages in the repo use a standard base configuration found at [eslintrc.js](tools/cdk-build-tools/config/eslintrc.js).
+All packages in the repo use a standard base configuration found at [eslintrc.js](tools/@aws-cdk/cdk-build-tools/config/eslintrc.js).
 This can be customized for any package by modifying the `.eslintrc` file found at its root.
 
 If you're using the VS Code and would like to see eslint violations on it, install the [eslint
@@ -780,7 +780,7 @@ the feature flag.
 A couple of [jest helper methods] are available for use with unit tests. These help run unit tests that test
 behaviour when flags are enabled or disabled in the two major versions.
 
-[jest helper methods]: https://github.com/aws/aws-cdk/blob/master/tools/cdk-build-tools/lib/feature-flag.ts
+[jest helper methods]: https://github.com/aws/aws-cdk/blob/master/tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts
 
 ## Versioning and Release
 

diff --git a/bump.sh b/bump.sh
@@ -18,6 +18,6 @@ cd ${scriptdir}
 yarn install --frozen-lockfile
 if [[ "${LEGACY_BUMP:-}" == "" ]]; then
   #  if we're using 'cdk-release' for the bump, build that package, including all of its dependencies
-  npx lerna run build --include-dependencies --scope cdk-release
+  npx lerna run build --include-dependencies --scope @aws-cdk/cdk-release
 fi
 ${scriptdir}/scripts/bump.js ${1:-minor}
diff --git a/lerna.json b/lerna.json
@@ -9,7 +9,9 @@
     "packages/@monocdk-experiment/*",
     "packages/@aws-cdk/*/lambda-packages/*",
     "tools/*",
-    "scripts/script-tests"
+    "tools/@aws-cdk/*",
+    "scripts/script-tests",
+    "packages/individual-packages/*"
   ],
   "rejectCycles": "true",
   "version": "0.0.0"

diff --git a/pack.sh b/pack.sh
@@ -5,6 +5,7 @@
 set -eu
 export PATH=$PWD/node_modules/.bin:$PATH
 export NODE_OPTIONS="--max-old-space-size=8192 ${NODE_OPTIONS:-}"
+export JSII_ROSETTA_MAX_WORKER_COUNT="${JSII_ROSETTA_MAX_WORKER_COUNT:-8}"
 root=$PWD
 
 # Get version and changelog file name (these require that .versionrc.json would have been generated)

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "include": "dependencies/node-version"
   },
   "scripts": {
-    "pkglint": "lerna --scope pkglint run build && lerna run pkglint",
+    "pkglint": "lerna --scope @aws-cdk/pkglint run build && lerna run pkglint",
     "build": "./build.sh",
     "pack": "./pack.sh",
     "compat": "./scripts/check-api-compatibility.sh",
@@ -18,12 +18,12 @@
     "@yarnpkg/lockfile": "^1.1.0",
     "conventional-changelog-cli": "^2.1.1",
     "fs-extra": "^9.1.0",
-    "graceful-fs": "^4.2.6",
-    "jest-junit": "^12.2.0",
-    "jsii-diff": "^1.34.0",
-    "jsii-pacmak": "^1.34.0",
-    "jsii-reflect": "^1.34.0",
-    "jsii-rosetta": "^1.34.0",
+    "graceful-fs": "^4.2.8",
+    "jest-junit": "^12.3.0",
+    "jsii-diff": "^1.35.0",
+    "jsii-pacmak": "^1.35.0",
+    "jsii-reflect": "^1.35.0",
+    "jsii-rosetta": "^1.35.0",
     "lerna": "^4.0.0",
     "patch-package": "^6.4.7",
     "standard-version": "^9.3.1",
@@ -64,7 +64,9 @@
       "packages/@monocdk-experiment/*",
       "packages/@aws-cdk/*/lambda-packages/*",
       "tools/*",
-      "scripts/script-tests"
+      "tools/@aws-cdk/*",
+      "scripts/@aws-cdk/script-tests",
+      "packages/individual-packages/*"
     ],
     "nohoist": [
       "**/jszip",
@@ -180,5 +182,8 @@
       "monocdk/yaml",
       "monocdk/yaml/**"
     ]
+  },
+  "dependencies": {
+    "string-width": "^4.2.2"
   }
 }
diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/.eslintrc.js b/packages/@aws-cdk-containers/ecs-service-extensions/.eslintrc.js
@@ -1,3 +1,3 @@
-const baseConfig = require('cdk-build-tools/config/eslintrc');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/jest.config.js b/packages/@aws-cdk-containers/ecs-service-extensions/jest.config.js
@@ -1,4 +1,4 @@
-const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config');
+const baseConfig = require('../../../tools/@aws-cdk/cdk-build-tools/config/jest.config');
 module.exports = {
   ...baseConfig,
   coverageThreshold: {

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/package.json b/packages/@aws-cdk-containers/ecs-service-extensions/package.json
@@ -38,11 +38,11 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/jest": "^26.0.24",
-    "cdk-build-tools": "0.0.0",
-    "cdk-integ-tools": "0.0.0",
-    "cfn2ts": "0.0.0",
+    "@aws-cdk/cdk-build-tools": "0.0.0",
+    "@aws-cdk/cdk-integ-tools": "0.0.0",
+    "@aws-cdk/cfn2ts": "0.0.0",
     "jest": "^26.6.3",
-    "pkglint": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
     "@aws-cdk/assert-internal": "0.0.0"
   },
   "dependencies": {

diff --git a/packages/@aws-cdk-containers/ecs-service-extensions/tsconfig.json b/packages/@aws-cdk-containers/ecs-service-extensions/tsconfig.json
@@ -92,16 +92,16 @@
       "path": "../../@aws-cdk/assert"
     },
     {
-      "path": "../../../tools/cdk-build-tools"
+      "path": "../../../tools/@aws-cdk/cdk-build-tools"
     },
     {
-      "path": "../../../tools/cdk-integ-tools"
+      "path": "../../../tools/@aws-cdk/cdk-integ-tools"
     },
     {
-      "path": "../../../tools/cfn2ts"
+      "path": "../../../tools/@aws-cdk/cfn2ts"
     },
     {
-      "path": "../../../tools/pkglint"
+      "path": "../../../tools/@aws-cdk/pkglint"
     }
   ],
   "_generated_by_jsii_": "Generated by jsii - safe to delete, and ideally should be in .gitignore"

diff --git a/packages/@aws-cdk/alexa-ask/.eslintrc.js b/packages/@aws-cdk/alexa-ask/.eslintrc.js
@@ -1,3 +1,3 @@
-const baseConfig = require('cdk-build-tools/config/eslintrc');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk/alexa-ask/jest.config.js b/packages/@aws-cdk/alexa-ask/jest.config.js
@@ -1,2 +1,2 @@
-const baseConfig = require('cdk-build-tools/config/jest.config');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk/alexa-ask/package.json b/packages/@aws-cdk/alexa-ask/package.json
@@ -73,11 +73,11 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/jest": "^26.0.24",
-    "cdk-build-tools": "0.0.0",
-    "cfn2ts": "0.0.0",
-    "pkglint": "0.0.0",
-    "@aws-cdk/assertions": "0.0.0"
+    "@aws-cdk/assertions": "0.0.0",
+    "@aws-cdk/cdk-build-tools": "0.0.0",
+    "@aws-cdk/cfn2ts": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
+    "@types/jest": "^26.0.24"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

diff --git a/packages/@aws-cdk/app-delivery/.eslintrc.js b/packages/@aws-cdk/app-delivery/.eslintrc.js
@@ -1,3 +1,3 @@
-const baseConfig = require('cdk-build-tools/config/eslintrc');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk/app-delivery/jest.config.js b/packages/@aws-cdk/app-delivery/jest.config.js
@@ -1,2 +1,2 @@
-const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config');
+const baseConfig = require('../../../tools/@aws-cdk/cdk-build-tools/config/jest.config');
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk/app-delivery/package.json b/packages/@aws-cdk/app-delivery/package.json
@@ -54,20 +54,20 @@
     "@aws-cdk/aws-codepipeline-actions": "0.0.0",
     "@aws-cdk/aws-events": "0.0.0",
     "@aws-cdk/aws-iam": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "constructs": "^3.3.69"
   },
   "devDependencies": {
+    "@aws-cdk/assert-internal": "0.0.0",
     "@aws-cdk/aws-s3": "0.0.0",
+    "@aws-cdk/cdk-build-tools": "0.0.0",
+    "@aws-cdk/cdk-integ-tools": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^26.0.24",
-    "cdk-build-tools": "0.0.0",
-    "cdk-integ-tools": "0.0.0",
     "fast-check": "^2.17.0",
-    "jest": "^26.6.3",
-    "pkglint": "0.0.0",
-    "@aws-cdk/assert-internal": "0.0.0"
+    "jest": "^26.6.3"
   },
   "repository": {
     "type": "git",
@@ -92,9 +92,9 @@
     "@aws-cdk/aws-codepipeline-actions": "0.0.0",
     "@aws-cdk/aws-events": "0.0.0",
     "@aws-cdk/aws-iam": "0.0.0",
+    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/core": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "constructs": "^3.3.69"
   },
   "engines": {

diff --git a/packages/@aws-cdk/assert-internal/.eslintrc.js b/packages/@aws-cdk/assert-internal/.eslintrc.js
@@ -1,3 +1,3 @@
-const baseConfig = require('cdk-build-tools/config/eslintrc');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk/assert-internal/jest.config.js b/packages/@aws-cdk/assert-internal/jest.config.js
@@ -1,4 +1,4 @@
-const baseConfig = require('cdk-build-tools/config/jest.config');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
 module.exports = {
     ...baseConfig,
     coverageThreshold: {

diff --git a/packages/@aws-cdk/assert-internal/package.json b/packages/@aws-cdk/assert-internal/package.json
@@ -24,10 +24,10 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "@aws-cdk/cdk-build-tools": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^26.0.24",
-    "cdk-build-tools": "0.0.0",
     "jest": "^26.6.3",
-    "pkglint": "0.0.0",
     "ts-jest": "^26.5.6"
   },
   "dependencies": {

diff --git a/packages/@aws-cdk/assert/.eslintrc.js b/packages/@aws-cdk/assert/.eslintrc.js
@@ -1,3 +1,3 @@
-const baseConfig = require('cdk-build-tools/config/eslintrc');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk/assert/jest.config.js b/packages/@aws-cdk/assert/jest.config.js
@@ -1,4 +1,4 @@
-const baseConfig = require('cdk-build-tools/config/jest.config');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
 module.exports = {
     ...baseConfig,
     coverageThreshold: {

diff --git a/packages/@aws-cdk/assert/package.json b/packages/@aws-cdk/assert/package.json
@@ -34,13 +34,13 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "aws-cdk-migration": "0.0.0",
+    "@aws-cdk/assert-internal": "0.0.0",
+    "@aws-cdk/cdk-build-tools": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^26.0.24",
-    "cdk-build-tools": "0.0.0",
+    "aws-cdk-migration": "0.0.0",
     "constructs": "^3.3.69",
     "jest": "^26.6.3",
-    "pkglint": "0.0.0",
-    "@aws-cdk/assert-internal": "0.0.0",
     "ts-jest": "^26.5.6"
   },
   "dependencies": {

diff --git a/packages/@aws-cdk/assertions/.eslintrc.js b/packages/@aws-cdk/assertions/.eslintrc.js
@@ -1,4 +1,4 @@
-const baseConfig = require('cdk-build-tools/config/eslintrc');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = {
   ...baseConfig,

diff --git a/packages/@aws-cdk/assertions/jest.config.js b/packages/@aws-cdk/assertions/jest.config.js
@@ -1,4 +1,4 @@
-const baseConfig = require('cdk-build-tools/config/jest.config');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
 module.exports = {
     ...baseConfig,
     coverageThreshold: {

diff --git a/packages/@aws-cdk/assertions/package.json b/packages/@aws-cdk/assertions/package.json
@@ -60,12 +60,12 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/jest": "^26.0.24",
-    "cdk-build-tools": "0.0.0",
+    "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cfnspec": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
+    "@types/jest": "^26.0.24",
     "constructs": "^3.3.69",
     "jest": "^26.6.3",
-    "pkglint": "0.0.0",
     "ts-jest": "^26.5.6"
   },
   "dependencies": {
@@ -76,7 +76,7 @@
     "constructs": "^3.3.69",
     "diff": "^5.0.0",
     "fast-deep-equal": "^3.1.3",
-    "string-width": "^4.2.2",
+    "string-width": "^4.2.3",
     "table": "^6.7.1"
   },
   "peerDependencies": {
@@ -107,7 +107,18 @@
     "node": ">= 10.13.0 <13 || >=13.7.0"
   },
   "nozem": {
-    "ostools": ["dirname", "cd", "bash", "rm", "xargs", "sed", "mkdir", "rsync", "cat", "find"],
+    "ostools": [
+      "dirname",
+      "cd",
+      "bash",
+      "rm",
+      "xargs",
+      "sed",
+      "mkdir",
+      "rsync",
+      "cat",
+      "find"
+    ],
     "additionalDirs": [
       "../cfnspec/lib",
       "ARTIFACTS:../cfnspec/spec",

diff --git a/packages/@aws-cdk/assets/.eslintrc.js b/packages/@aws-cdk/assets/.eslintrc.js
@@ -1,3 +1,3 @@
-const baseConfig = require('cdk-build-tools/config/eslintrc');
+const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
 baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
 module.exports = baseConfig;
diff --git a/packages/@aws-cdk/assets/jest.config.js b/packages/@aws-cdk/assets/jest.config.js
@@ -1,2 +1,2 @@
-const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config');
-module.exports = baseConfig;
+const baseConfig = require('../../../tools/@aws-cdk/cdk-build-tools/config/jest.config');
+module.exports = baseConfig;
diff --git a/packages/@aws-cdk/assets/package.json b/packages/@aws-cdk/assets/package.json
@@ -69,16 +69,16 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
+    "@aws-cdk/assert-internal": "0.0.0",
+    "@aws-cdk/cdk-build-tools": "0.0.0",
+    "@aws-cdk/cdk-integ-tools": "0.0.0",
+    "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^26.0.24",
     "@types/sinon": "^9.0.11",
     "aws-cdk": "0.0.0",
-    "cdk-build-tools": "0.0.0",
-    "cdk-integ-tools": "0.0.0",
     "jest": "^26.6.3",
-    "pkglint": "0.0.0",
     "sinon": "^9.2.4",
-    "ts-mock-imports": "^1.3.7",
-    "@aws-cdk/assertions": "0.0.0"
+    "ts-mock-imports": "^1.3.7"
   },
   "dependencies": {
     "@aws-cdk/core": "0.0.0",

diff --git a/packages/@aws-cdk/assets/test/compat.test.ts b/packages/@aws-cdk/assets/test/compat.test.ts
@@ -1,4 +1,5 @@
 import { SymlinkFollowMode } from '@aws-cdk/core';
+import '@aws-cdk/assert-internal/jest';
 import { FollowMode } from '../lib';
 import { toSymlinkFollow } from '../lib/compat';
 

diff --git a/packages/@aws-cdk/assets/test/staging.test.ts b/packages/@aws-cdk/assets/test/staging.test.ts
@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { App, Stack } from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
+import '@aws-cdk/assert-internal/jest';
 import { Staging } from '../lib';
 
 describe('staging', () => {