Merge branch 'master' into apigv2-aws-integration

package.json

@@ -16,15 +16,15 @@
   },
   "devDependencies": {
     "@yarnpkg/lockfile": "^1.1.0",
-    "cdk-generate-synthetic-examples": "^0.1.1",
+    "cdk-generate-synthetic-examples": "^0.1.2",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.9",
     "jest-junit": "^13.0.0",
-    "jsii-diff": "^1.50.0",
-    "jsii-pacmak": "^1.50.0",
-    "jsii-reflect": "^1.50.0",
-    "jsii-rosetta": "^1.50.0",
+    "jsii-diff": "^1.52.1",
+    "jsii-pacmak": "^1.52.1",
+    "jsii-reflect": "^1.52.1",
+    "jsii-rosetta": "^1.52.1",
     "lerna": "^4.0.0",
     "patch-package": "^6.4.7",
     "standard-version": "^9.3.2",

packages/@aws-cdk/app-delivery/package.json

@@ -66,7 +66,7 @@
     "@aws-cdk/cdk-integ-tools": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.0",
-    "fast-check": "^2.20.0",
+    "fast-check": "^2.21.0",
     "jest": "^27.4.7"
   },
   "repository": {

packages/@aws-cdk/aws-applicationautoscaling/package.json

@@ -84,7 +84,7 @@
     "@aws-cdk/cfn2ts": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.0",
-    "fast-check": "^2.20.0",
+    "fast-check": "^2.21.0",
     "jest": "^27.4.7"
   },
   "dependencies": {

packages/@aws-cdk/aws-autoscaling-common/package.json

@@ -69,7 +69,7 @@
     "@aws-cdk/cdk-integ-tools": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.0",
-    "fast-check": "^2.20.0",
+    "fast-check": "^2.21.0",
     "jest": "^27.4.7"
   },
   "dependencies": {

packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json

@@ -43,7 +43,7 @@
     "jest": "^27.4.7",
     "lambda-tester": "^3.6.0",
     "sinon": "^9.2.4",
-    "nock": "^13.2.1",
+    "nock": "^13.2.2",
     "ts-jest": "^27.1.2"
   }
 }

packages/@aws-cdk/aws-dynamodb-global/lambda-packages/aws-global-table-coordinator/package.json

@@ -39,6 +39,6 @@
     "eslint-plugin-standard": "^4.1.0",
     "jest": "^27.4.7",
     "lambda-tester": "^3.6.0",
-    "nock": "^13.2.1"
+    "nock": "^13.2.2"
   }
 }

packages/@aws-cdk/aws-eks/package.json

@@ -89,8 +89,8 @@
     "@types/sinon": "^9.0.11",
     "@types/yaml": "1.9.6",
     "aws-sdk": "^2.848.0",
-    "cdk8s": "^1.3.26",
-    "cdk8s-plus-21": "^1.0.0-beta.72",
+    "cdk8s": "^1.3.32",
+    "cdk8s-plus-21": "^1.0.0-beta.73",
     "jest": "^27.4.7",
     "sinon": "^9.2.4"
   },

packages/@aws-cdk/aws-lambda-nodejs/package.json

@@ -78,7 +78,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.0",
     "delay": "5.0.0",
-    "esbuild": "^0.14.10"
+    "esbuild": "^0.14.11"
   },
   "dependencies": {
     "@aws-cdk/aws-lambda": "0.0.0",

packages/@aws-cdk/aws-logs/package.json

@@ -90,7 +90,7 @@
     "aws-sdk": "^2.848.0",
     "aws-sdk-mock": "^5.5.1",
     "jest": "^27.4.7",
-    "nock": "^13.2.1",
+    "nock": "^13.2.2",
     "sinon": "^9.2.4"
   },
   "dependencies": {

packages/@aws-cdk/cloud-assembly-schema/package.json

@@ -67,7 +67,7 @@
     "@types/semver": "^7.3.9",
     "jest": "^27.4.7",
     "mock-fs": "^4.14.0",
-    "typescript-json-schema": "^0.52.0"
+    "typescript-json-schema": "^0.53.0"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",

packages/@aws-cdk/cloudformation-diff/package.json

@@ -36,7 +36,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.4.0",
     "@types/string-width": "^4.0.1",
-    "fast-check": "^2.20.0",
+    "fast-check": "^2.21.0",
     "jest": "^27.4.7",
     "ts-jest": "^27.1.2"
   },

packages/@aws-cdk/core/package.json

@@ -185,7 +185,7 @@
     "@types/minimatch": "^3.0.5",
     "@types/node": "^10.17.60",
     "@types/sinon": "^9.0.11",
-    "fast-check": "^2.20.0",
+    "fast-check": "^2.21.0",
     "jest": "^27.4.7",
     "lodash": "^4.17.21",
     "sinon": "^9.2.4",

packages/@aws-cdk/custom-resources/package.json

@@ -94,7 +94,7 @@
     "aws-sdk": "^2.848.0",
     "aws-sdk-mock": "^5.5.1",
     "fs-extra": "^9.1.0",
-    "nock": "^13.2.1",
+    "nock": "^13.2.2",
     "sinon": "^9.2.4"
   },
   "dependencies": {

packages/aws-cdk-lib/package.json

@@ -346,7 +346,7 @@
     "@types/fs-extra": "^8.1.2",
     "@types/node": "^10.17.60",
     "constructs": "^3.3.69",
-    "esbuild": "^0.14.10",
+    "esbuild": "^0.14.11",
     "fs-extra": "^9.1.0",
     "ts-node": "^9.1.1",
     "typescript": "~3.8.3"

packages/aws-cdk/lib/api/bootstrap/deploy-bootstrap.ts

@@ -3,6 +3,7 @@ import * as path from 'path';
 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 logging from '../../logging';
 import { Mode, SdkProvider, ISDK } from '../aws-auth';
 import { deployStack, DeployStackResult } from '../deploy-stack';
 import { DEFAULT_TOOLKIT_STACK_NAME, ToolkitInfo } from '../toolkit-info';
@@ -65,7 +66,18 @@ export class BootstrapStack {
 
     const newVersion = bootstrapVersionFromTemplate(template);
     if (this.currentToolkitInfo.found && newVersion < this.currentToolkitInfo.version && !options.force) {
-      throw new Error(`Not downgrading existing bootstrap stack from version '${this.currentToolkitInfo.version}' to version '${newVersion}'. Use --force to force or set the '@aws-cdk/core:newStyleStackSynthesis' feature flag in cdk.json to use the latest bootstrap version.`);
+      logging.warning(`Bootstrap stack already at version '${this.currentToolkitInfo.version}'. Not downgrading it to version '${newVersion}' (use --force if you intend to downgrade)`);
+      if (newVersion === 0) {
+        // A downgrade with 0 as target version means we probably have a new-style bootstrap in the account,
+        // and an old-style bootstrap as current target, which means the user probably forgot to put this flag in.
+        logging.warning('(Did you set the \'@aws-cdk/core:newStyleStackSynthesis\' feature flag in cdk.json?)');
+      }
+
+      return {
+        noOp: true,
+        outputs: {},
+        stackArn: this.currentToolkitInfo.bootstrapStack.stackId,
+      };
     }
 
     const outdir = await fs.mkdtemp(path.join(os.tmpdir(), 'cdk-bootstrap'));

packages/aws-cdk/lib/api/deploy-stack.ts

@@ -28,7 +28,6 @@ export interface DeployStackResult {
   readonly noOp: boolean;
   readonly outputs: { [name: string]: string };
   readonly stackArn: string;
-  readonly stackArtifact: cxapi.CloudFormationStackArtifact;
 }
 
 export interface DeployStackOptions {
@@ -241,7 +240,6 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
       noOp: true,
       outputs: cloudFormationStack.outputs,
       stackArn: cloudFormationStack.stackId,
-      stackArtifact,
     };
   } else {
     debug(`${deployName}: deploying...`);
@@ -330,7 +328,7 @@ async function prepareAndExecuteChangeSet(
       debug('Deleting empty change set %s', changeSet.Id);
       await cfn.deleteChangeSet({ StackName: deployName, ChangeSetName: changeSetName }).promise();
     }
-    return { noOp: true, outputs: cloudFormationStack.outputs, stackArn: changeSet.StackId!, stackArtifact };
+    return { noOp: true, outputs: cloudFormationStack.outputs, stackArn: changeSet.StackId! };
   }
 
   const execute = options.execute === undefined ? true : options.execute;
@@ -367,7 +365,7 @@ async function prepareAndExecuteChangeSet(
     print('Changeset %s created and waiting in review for manual execution (--no-execute)', changeSet.Id);
   }
 
-  return { noOp: false, outputs: cloudFormationStack.outputs, stackArn: changeSet.StackId!, stackArtifact };
+  return { noOp: false, outputs: cloudFormationStack.outputs, stackArn: changeSet.StackId! };
 }
 
 /**

packages/aws-cdk/lib/api/hotswap-deployments.ts

@@ -55,7 +55,7 @@ export async function tryHotswapDeployment(
   // apply the short-circuitable changes
   await applyAllHotswappableChanges(sdk, hotswappableChanges);
 
-  return { noOp: hotswappableChanges.length === 0, stackArn: cloudFormationStack.stackId, outputs: cloudFormationStack.outputs, stackArtifact };
+  return { noOp: hotswappableChanges.length === 0, stackArn: cloudFormationStack.stackId, outputs: cloudFormationStack.outputs };
 }
 
 async function findAllHotswappableChanges(

packages/aws-cdk/package.json

@@ -39,7 +39,7 @@
   "devDependencies": {
     "@aws-cdk/core": "0.0.0",
     "@octokit/rest": "^18.12.0",
-    "@types/archiver": "^5.3.0",
+    "@types/archiver": "^5.3.1",
     "@types/fs-extra": "^8.1.2",
     "@types/glob": "^7.2.0",
     "@types/jest": "^27.4.0",
@@ -50,7 +50,7 @@
     "@types/semver": "^7.3.9",
     "@types/sinon": "^9.0.11",
     "@types/table": "^6.0.0",
-    "@types/uuid": "^8.3.3",
+    "@types/uuid": "^8.3.4",
     "@types/wrap-ansi": "^3.0.0",
     "@types/yargs": "^15.0.14",
     "aws-sdk-mock": "^5.5.1",
@@ -59,7 +59,7 @@
     "jest": "^27.4.7",
     "make-runnable": "^1.3.10",
     "mockery": "^2.1.0",
-    "nock": "^13.2.1",
+    "nock": "^13.2.2",
     "@aws-cdk/pkglint": "0.0.0",
     "sinon": "^9.2.4",
     "ts-jest": "^27.1.2",
@@ -71,7 +71,7 @@
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
     "@aws-cdk/region-info": "0.0.0",
-    "@jsii/check-node": "1.50.0",
+    "@jsii/check-node": "1.52.1",
     "archiver": "^5.3.0",
     "aws-sdk": "^2.979.0",
     "camelcase": "^6.3.0",
@@ -87,7 +87,7 @@
     "proxy-agent": "^5.0.0",
     "semver": "^7.3.5",
     "source-map-support": "^0.5.21",
-    "strip-ansi": "^6.0.0",
+    "strip-ansi": "^6.0.1",
     "table": "^6.8.0",
     "uuid": "^8.3.2",
     "wrap-ansi": "^7.0.0",

packages/aws-cdk/test/api/bootstrap2.test.ts

@@ -172,8 +172,7 @@ describe('Bootstrapping v2', () => {
       parameters: {
         cloudFormationExecutionPolicies: ['arn:policy'],
       },
-    }))
-      .rejects.toThrow('Not downgrading existing bootstrap stack');
+    })).resolves.toEqual(expect.objectContaining({ noOp: true }));
   });
 
   test('bootstrap template has the right exports', async () => {

packages/awslint/package.json

@@ -18,11 +18,11 @@
     "awslint": "bin/awslint"
   },
   "dependencies": {
-    "@jsii/spec": "^1.50.0",
+    "@jsii/spec": "^1.52.1",
     "camelcase": "^6.3.0",
     "chalk": "^4",
     "fs-extra": "^9.1.0",
-    "jsii-reflect": "^1.50.0",
+    "jsii-reflect": "^1.52.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {

packages/cdk-assets/package.json

@@ -30,7 +30,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/archiver": "^5.3.0",
+    "@types/archiver": "^5.3.1",
     "@types/glob": "^7.2.0",
     "@types/jest": "^27.4.0",
     "@types/mime": "^2.0.3",

packages/cdk-dasm/package.json

@@ -28,7 +28,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "codemaker": "^1.50.0",
+    "codemaker": "^1.52.1",
     "yaml": "1.10.2"
   },
   "devDependencies": {

packages/decdk/package.json

@@ -253,7 +253,7 @@
     "@aws-cdk/region-info": "0.0.0",
     "constructs": "^3.3.69",
     "fs-extra": "^9.1.0",
-    "jsii-reflect": "^1.50.0",
+    "jsii-reflect": "^1.52.1",
     "jsonschema": "^1.4.0",
     "yaml": "1.10.2",
     "yargs": "^16.2.0"
@@ -264,7 +264,7 @@
     "@types/yaml": "1.9.7",
     "@types/yargs": "^15.0.14",
     "jest": "^27.4.7",
-    "jsii": "^1.50.0"
+    "jsii": "^1.52.1"
   },
   "keywords": [
     "aws",

tools/@aws-cdk/cdk-build-tools/package.json

@@ -56,9 +56,9 @@
     "fs-extra": "^9.1.0",
     "jest": "^27.4.7",
     "jest-junit": "^13.0.0",
-    "jsii": "^1.50.0",
-    "jsii-pacmak": "^1.50.0",
-    "jsii-reflect": "^1.50.0",
+    "jsii": "^1.52.1",
+    "jsii-pacmak": "^1.52.1",
+    "jsii-reflect": "^1.52.1",
     "markdownlint-cli": "^0.30.0",
     "nyc": "^15.1.0",
     "semver": "^7.3.5",

tools/@aws-cdk/cfn2ts/package.json

@@ -32,7 +32,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-cdk/cfnspec": "0.0.0",
-    "codemaker": "^1.50.0",
+    "codemaker": "^1.52.1",
     "fast-json-patch": "^3.1.0",
     "fs-extra": "^9.1.0",
     "yargs": "^16.2.0"