@aws-cdk/toolkit-lib 0.1.7 → 0.1.8

package/lib/api/aws-cdk.js

@@ -57,6 +57,7 @@ __export(aws_cdk_exports, {
   StackCollection: () => StackCollection,
   WorkGraphBuilder: () => WorkGraphBuilder,
   contextproviders: () => context_providers_exports,
+  createDiffChangeSet: () => createDiffChangeSet,
   findCloudWatchLogGroups: () => findCloudWatchLogGroups,
   guessExecutable: () => guessExecutable,
   loadTree: () => loadTree,
@@ -98,14 +99,104 @@ var path2 = __toESM(require("path"));
 var fs3 = __toESM(require("fs-extra"));
 
 // ../../aws-cdk/lib/logging.ts
-var chalk4 = __toESM(require("chalk"));
+var chalk5 = __toESM(require("chalk"));
 
 // ../../aws-cdk/lib/cli/io-host/cli-io-host.ts
 var util5 = __toESM(require("node:util"));
 var import_cloud_assembly_schema = require("@aws-cdk/cloud-assembly-schema");
-var chalk3 = __toESM(require("chalk"));
+var chalk4 = __toESM(require("chalk"));
 var promptly = __toESM(require("promptly"));
 
+// ../tmp-toolkit-helpers/src/api/diff/diff-formatter.ts
+var cxschema = __toESM(require("@aws-cdk/cloud-assembly-schema"));
+var import_cloudformation_diff = require("@aws-cdk/cloudformation-diff");
+var chalk = __toESM(require("chalk"));
+
+// ../tmp-toolkit-helpers/src/api/io/private/span.ts
+var util = __toESM(require("node:util"));
+var uuid = __toESM(require("uuid"));
+
+// ../tmp-toolkit-helpers/src/util/archive.ts
+var glob = __toESM(require("glob"));
+
+// ../tmp-toolkit-helpers/src/util/format-error.ts
+function formatErrorMessage(error2) {
+  if (error2 && Array.isArray(error2.errors)) {
+    const innerMessages = error2.errors.map((innerError) => innerError?.message || innerError?.toString()).join("\n");
+    return `AggregateError: ${innerMessages}`;
+  }
+  return error2?.message || error2?.toString() || "Unknown error";
+}
+
+// ../tmp-toolkit-helpers/src/util/archive.ts
+var archiver = require("archiver");
+
+// ../tmp-toolkit-helpers/src/util/arrays.ts
+function flatMap(xs, fn) {
+  return flatten(xs.map(fn));
+}
+function flatten(xs) {
+  return Array.prototype.concat.apply([], xs);
+}
+
+// ../tmp-toolkit-helpers/src/util/cloudformation.ts
+function stackEventHasErrorMessage(status) {
+  return status.endsWith("_FAILED") || status === "ROLLBACK_IN_PROGRESS" || status === "UPDATE_ROLLBACK_IN_PROGRESS";
+}
+function maxResourceTypeLength(template, startWidth = "AWS::CloudFormation::Stack".length) {
+  const resources = template && template.Resources || {};
+  let maxWidth = startWidth;
+  for (const id of Object.keys(resources)) {
+    const type = resources[id].Type || "";
+    if (type.length > maxWidth) {
+      maxWidth = type.length;
+    }
+  }
+  return maxWidth;
+}
+
+// ../tmp-toolkit-helpers/src/util/content-hash.ts
+var crypto = __toESM(require("crypto"));
+function contentHash(data) {
+  return crypto.createHash("sha256").update(data).digest("hex");
+}
+function contentHashAny(value) {
+  const ret = crypto.createHash("sha256");
+  recurse(value);
+  return ret.digest("hex");
+  function recurse(x) {
+    if (typeof x === "string") {
+      ret.update(x);
+      return;
+    }
+    if (Array.isArray(x)) {
+      ret.update("[");
+      for (const e of x) {
+        recurse(e);
+        ret.update("||");
+      }
+      ret.update("]");
+      return;
+    }
+    if (x && typeof x === "object") {
+      ret.update("{");
+      for (const key of Object.keys(x).sort()) {
+        ret.update(key);
+        ret.update(":");
+        recurse(x[key]);
+      }
+      ret.update("}");
+      return;
+    }
+    ret.update(`${x}${typeof x}`);
+  }
+}
+
+// ../tmp-toolkit-helpers/src/util/directories.ts
+var fs = __toESM(require("fs"));
+var os = __toESM(require("os"));
+var path = __toESM(require("path"));
+
 // ../tmp-toolkit-helpers/src/api/toolkit-error.ts
 var TOOLKIT_ERROR_SYMBOL = Symbol.for("@aws-cdk/toolkit-lib.ToolkitError");
 var AUTHENTICATION_ERROR_SYMBOL = Symbol.for("@aws-cdk/toolkit-lib.AuthenticationError");
@@ -218,90 +309,7 @@ var ContextProviderError = class _ContextProviderError extends ToolkitError {
   }
 };
 
-// ../tmp-toolkit-helpers/src/api/io/private/span.ts
-var util = __toESM(require("node:util"));
-var uuid = __toESM(require("uuid"));
-
-// ../tmp-toolkit-helpers/src/util/archive.ts
-var glob = __toESM(require("glob"));
-
-// ../tmp-toolkit-helpers/src/util/format-error.ts
-function formatErrorMessage(error2) {
-  if (error2 && Array.isArray(error2.errors)) {
-    const innerMessages = error2.errors.map((innerError) => innerError?.message || innerError?.toString()).join("\n");
-    return `AggregateError: ${innerMessages}`;
-  }
-  return error2?.message || error2?.toString() || "Unknown error";
-}
-
-// ../tmp-toolkit-helpers/src/util/archive.ts
-var archiver = require("archiver");
-
-// ../tmp-toolkit-helpers/src/util/arrays.ts
-function flatMap(xs, fn) {
-  return flatten(xs.map(fn));
-}
-function flatten(xs) {
-  return Array.prototype.concat.apply([], xs);
-}
-
-// ../tmp-toolkit-helpers/src/util/cloudformation.ts
-function stackEventHasErrorMessage(status) {
-  return status.endsWith("_FAILED") || status === "ROLLBACK_IN_PROGRESS" || status === "UPDATE_ROLLBACK_IN_PROGRESS";
-}
-function maxResourceTypeLength(template, startWidth = "AWS::CloudFormation::Stack".length) {
-  const resources = template && template.Resources || {};
-  let maxWidth = startWidth;
-  for (const id of Object.keys(resources)) {
-    const type = resources[id].Type || "";
-    if (type.length > maxWidth) {
-      maxWidth = type.length;
-    }
-  }
-  return maxWidth;
-}
-
-// ../tmp-toolkit-helpers/src/util/content-hash.ts
-var crypto = __toESM(require("crypto"));
-function contentHash(data) {
-  return crypto.createHash("sha256").update(data).digest("hex");
-}
-function contentHashAny(value) {
-  const ret = crypto.createHash("sha256");
-  recurse(value);
-  return ret.digest("hex");
-  function recurse(x) {
-    if (typeof x === "string") {
-      ret.update(x);
-      return;
-    }
-    if (Array.isArray(x)) {
-      ret.update("[");
-      for (const e of x) {
-        recurse(e);
-        ret.update("||");
-      }
-      ret.update("]");
-      return;
-    }
-    if (x && typeof x === "object") {
-      ret.update("{");
-      for (const key of Object.keys(x).sort()) {
-        ret.update(key);
-        ret.update(":");
-        recurse(x[key]);
-      }
-      ret.update("}");
-      return;
-    }
-    ret.update(`${x}${typeof x}`);
-  }
-}
-
 // ../tmp-toolkit-helpers/src/util/directories.ts
-var fs = __toESM(require("fs"));
-var os = __toESM(require("os"));
-var path = __toESM(require("path"));
 function cdkHomeDir() {
   const tmpDir = fs.realpathSync(os.tmpdir());
   let home;
@@ -848,6 +856,16 @@ var IO = {
     interface: "ErrorPayload"
   }),
   // 4: Diff (4xxx)
+  CDK_TOOLKIT_I4000: trace({
+    code: "CDK_TOOLKIT_I4000",
+    description: "Diff stacks is starting",
+    interface: "StackSelectionDetails"
+  }),
+  CDK_TOOLKIT_I4001: info({
+    code: "CDK_TOOLKIT_I4001",
+    description: "Output of the diff command",
+    interface: "DiffResult"
+  }),
   // 5: Deploy & Watch (5xxx)
   CDK_TOOLKIT_I5000: info({
     code: "CDK_TOOLKIT_I5000",
@@ -1134,6 +1152,14 @@ var IO = {
     code: "CDK_ASSEMBLY_I0000",
     description: "Default debug messages emitted from Cloud Assembly operations"
   }),
+  DEFAULT_ASSEMBLY_INFO: info({
+    code: "CDK_ASSEMBLY_I0000",
+    description: "Default info messages emitted from Cloud Assembly operations"
+  }),
+  DEFAULT_ASSEMBLY_WARN: warn({
+    code: "CDK_ASSEMBLY_W0000",
+    description: "Default warning messages emitted from Cloud Assembly operations"
+  }),
   CDK_ASSEMBLY_I0010: debug({
     code: "CDK_ASSEMBLY_I0010",
     description: "Generic environment preparation debug messages"
@@ -1235,6 +1261,11 @@ var SPAN = {
     start: IO.CDK_TOOLKIT_I6100,
     end: IO.CDK_TOOLKIT_I6000
   },
+  DIFF_STACK: {
+    name: "Diff",
+    start: IO.CDK_TOOLKIT_I4000,
+    end: IO.CDK_TOOLKIT_I4001
+  },
   DESTROY_STACK: {
     name: "Destroy",
     start: IO.CDK_TOOLKIT_I7100,
@@ -1313,6 +1344,14 @@ var IoDefaultMessages = class {
   }
 };
 
+// ../tmp-toolkit-helpers/src/api/resource-import/importer.ts
+function removeNonImportResources(stack) {
+  const template = stack.template;
+  delete template.Resources.CDKMetadata;
+  delete template.Outputs;
+  return template;
+}
+
 // ../../aws-cdk/lib/cli/activity-printer/base.ts
 var ActivityPrinterBase = class {
   constructor(props) {
@@ -1419,7 +1458,7 @@ var ActivityPrinterBase = class {
 
 // ../../aws-cdk/lib/cli/activity-printer/history.ts
 var util3 = __toESM(require("util"));
-var chalk = __toESM(require("chalk"));
+var chalk2 = __toESM(require("chalk"));
 var HistoryActivityPrinter = class _HistoryActivityPrinter extends ActivityPrinterBase {
   constructor(props) {
     super(props);
@@ -1462,7 +1501,7 @@ var HistoryActivityPrinter = class _HistoryActivityPrinter extends ActivityPrint
   printOne(activity, progress) {
     const event = activity.event;
     const color = colorFromStatusResult(event.ResourceStatus);
-    let reasonColor = chalk.cyan;
+    let reasonColor = chalk2.cyan;
     let stackTrace = "";
     const metadata = activity.metadata;
     if (event.ResourceStatus && event.ResourceStatus.indexOf("FAILED") !== -1) {
@@ -1473,7 +1512,7 @@ var HistoryActivityPrinter = class _HistoryActivityPrinter extends ActivityPrint
         stackTrace = metadata.entry.trace ? `
 	${metadata.entry.trace.join("\n	\\_ ")}` : "";
       }
-      reasonColor = chalk.red;
+      reasonColor = chalk2.red;
     }
     const resourceName = metadata ? metadata.constructPath : event.LogicalResourceId || "";
     const logicalId = resourceName !== event.LogicalResourceId ? `(${event.LogicalResourceId}) ` : "";
@@ -1486,9 +1525,9 @@ var HistoryActivityPrinter = class _HistoryActivityPrinter extends ActivityPrint
         color(padRight(_HistoryActivityPrinter.STATUS_WIDTH, (event.ResourceStatus || "").slice(0, _HistoryActivityPrinter.STATUS_WIDTH))),
         // pad left and trim
         padRight(this.resourceTypeColumnWidth, event.ResourceType || ""),
-        color(chalk.bold(resourceName)),
+        color(chalk2.bold(resourceName)),
         logicalId,
-        reasonColor(chalk.bold(event.ResourceStatusReason ? event.ResourceStatusReason : "")),
+        reasonColor(chalk2.bold(event.ResourceStatusReason ? event.ResourceStatusReason : "")),
         reasonColor(stackTrace)
       )
     );
@@ -1506,7 +1545,7 @@ var HistoryActivityPrinter = class _HistoryActivityPrinter extends ActivityPrint
         util3.format(
           "%s Currently in progress: %s\n",
           progress,
-          chalk.bold(Object.keys(this.resourcesInProgress).join(", "))
+          chalk2.bold(Object.keys(this.resourcesInProgress).join(", "))
         )
       );
     }
@@ -1515,23 +1554,23 @@ var HistoryActivityPrinter = class _HistoryActivityPrinter extends ActivityPrint
 };
 function colorFromStatusResult(status) {
   if (!status) {
-    return chalk.reset;
+    return chalk2.reset;
   }
   if (status.indexOf("FAILED") !== -1) {
-    return chalk.red;
+    return chalk2.red;
   }
   if (status.indexOf("ROLLBACK") !== -1) {
-    return chalk.yellow;
+    return chalk2.yellow;
   }
   if (status.indexOf("COMPLETE") !== -1) {
-    return chalk.green;
+    return chalk2.green;
   }
-  return chalk.reset;
+  return chalk2.reset;
 }
 
 // ../../aws-cdk/lib/cli/activity-printer/current.ts
 var util4 = __toESM(require("util"));
-var chalk2 = __toESM(require("chalk"));
+var chalk3 = __toESM(require("chalk"));
 
 // ../../aws-cdk/lib/cli/activity-printer/display.ts
 var wrapAnsi = require("wrap-ansi");
@@ -1619,7 +1658,7 @@ var CurrentActivityPrinter = class _CurrentActivityPrinter extends ActivityPrint
           padLeft(_CurrentActivityPrinter.TIMESTAMP_WIDTH, new Date(res.event.Timestamp).toLocaleTimeString()),
           color(padRight(_CurrentActivityPrinter.STATUS_WIDTH, (res.event.ResourceStatus || "").slice(0, _CurrentActivityPrinter.STATUS_WIDTH))),
           padRight(this.resourceTypeColumnWidth, res.event.ResourceType || ""),
-          color(chalk2.bold(shorten(40, resourceName))),
+          color(chalk3.bold(shorten(40, resourceName))),
           this.failureReasonOnNextLine(res)
         );
       })
@@ -1635,7 +1674,7 @@ var CurrentActivityPrinter = class _CurrentActivityPrinter extends ActivityPrint
       }
       lines.push(
         util4.format(
-          chalk2.red("%s | %s | %s | %s%s") + "\n",
+          chalk3.red("%s | %s | %s | %s%s") + "\n",
           padLeft(_CurrentActivityPrinter.TIMESTAMP_WIDTH, new Date(failure.event.Timestamp).toLocaleTimeString()),
           padRight(_CurrentActivityPrinter.STATUS_WIDTH, (failure.event.ResourceStatus || "").slice(0, _CurrentActivityPrinter.STATUS_WIDTH)),
           padRight(this.resourceTypeColumnWidth, failure.event.ResourceType || ""),
@@ -1643,9 +1682,9 @@ var CurrentActivityPrinter = class _CurrentActivityPrinter extends ActivityPrint
           this.failureReasonOnNextLine(failure)
         )
       );
-      const trace3 = failure.metadata?.entry?.trace;
-      if (trace3) {
-        lines.push(chalk2.red(`	${trace3.join("\n	\\_ ")}
+      const trace2 = failure.metadata?.entry?.trace;
+      if (trace2) {
+        lines.push(chalk3.red(`	${trace2.join("\n	\\_ ")}
 `));
       }
     }
@@ -1663,12 +1702,12 @@ var CurrentActivityPrinter = class _CurrentActivityPrinter extends ActivityPrint
     const fullChars = FULL_BLOCK.repeat(Math.floor(chars));
     const partialChar = PARTIAL_BLOCK[Math.floor(remainder * PARTIAL_BLOCK.length)];
     const filler = "\xB7".repeat(innerWidth - Math.floor(chars) - (partialChar ? 1 : 0));
-    const color = this.rollingBack ? chalk2.yellow : chalk2.green;
+    const color = this.rollingBack ? chalk3.yellow : chalk3.green;
     return "[" + color(fullChars + partialChar) + filler + `] (${this.stackProgress.completed}/${this.stackProgress.total})`;
   }
   failureReasonOnNextLine(activity) {
     return stackEventHasErrorMessage(activity.event.ResourceStatus ?? "") ? `
-${" ".repeat(_CurrentActivityPrinter.TIMESTAMP_WIDTH + _CurrentActivityPrinter.STATUS_WIDTH + 6)}${chalk2.red(this.failureReason(activity) ?? "")}` : "";
+${" ".repeat(_CurrentActivityPrinter.TIMESTAMP_WIDTH + _CurrentActivityPrinter.STATUS_WIDTH + 6)}${chalk3.red(this.failureReason(activity) ?? "")}` : "";
   }
 };
 var FULL_BLOCK = "\u2588";
@@ -1678,21 +1717,21 @@ var MIN_PROGRESSBAR_WIDTH = 10;
 var PROGRESSBAR_EXTRA_SPACE = 2 + 2 + 4 + 6;
 function colorFromStatusActivity(status) {
   if (!status) {
-    return chalk2.reset;
+    return chalk3.reset;
   }
   if (status.endsWith("_FAILED")) {
-    return chalk2.red;
+    return chalk3.red;
   }
   if (status.startsWith("CREATE_") || status.startsWith("UPDATE_") || status.startsWith("IMPORT_")) {
-    return chalk2.green;
+    return chalk3.green;
   }
   if (status.indexOf("ROLLBACK_") !== -1) {
-    return chalk2.yellow;
+    return chalk3.yellow;
   }
   if (status.startsWith("DELETE_")) {
-    return chalk2.yellow;
+    return chalk3.yellow;
   }
-  return chalk2.reset;
+  return chalk3.reset;
 }
 function shorten(maxWidth, p) {
   if (p.length <= maxWidth) {
@@ -1905,14 +1944,14 @@ var CliIoHost = class _CliIoHost {
         return true;
       }
       if (isConfirmationPrompt(msg)) {
-        const confirmed = await promptly.confirm(`${chalk3.cyan(msg.message)} (y/n)`);
+        const confirmed = await promptly.confirm(`${chalk4.cyan(msg.message)} (y/n)`);
         if (!confirmed) {
           throw new ToolkitError("Aborted by user");
         }
         return confirmed;
       }
       const prompt4 = extractPromptInfo(msg);
-      const answer = await promptly.prompt(`${chalk3.cyan(msg.message)} (${prompt4.default})`, {
+      const answer = await promptly.prompt(`${chalk4.cyan(msg.message)} (${prompt4.default})`, {
         default: prompt4.default
       });
       return prompt4.convertAnswer(answer);
@@ -1962,12 +2001,12 @@ function extractPromptInfo(msg) {
   };
 }
 var styleMap = {
-  error: chalk3.red,
-  warn: chalk3.yellow,
-  result: chalk3.white,
-  info: chalk3.white,
-  debug: chalk3.gray,
-  trace: chalk3.gray
+  error: chalk4.red,
+  warn: chalk4.yellow,
+  result: chalk4.white,
+  info: chalk4.white,
+  debug: chalk4.gray,
+  trace: chalk4.gray
 };
 function isCI() {
   return process.env.CI !== void 0 && process.env.CI !== "false" && process.env.CI !== "0";
@@ -2005,9 +2044,6 @@ function formatMessageAndLog(level, input, ...args) {
 var warning = (input, ...args) => {
   return formatMessageAndLog("warn", input, ...args);
 };
-var info2 = (input, ...args) => {
-  return formatMessageAndLog("info", input, ...args);
-};
 var debug2 = (input, ...args) => {
   return formatMessageAndLog("debug", input, ...args);
 };
@@ -3299,15 +3335,15 @@ var Context = class {
 // ../../aws-cdk/lib/api/deployments/deployments.ts
 var import_crypto = require("crypto");
 var cdk_assets = __toESM(require("cdk-assets"));
-var chalk11 = __toESM(require("chalk"));
+var chalk12 = __toESM(require("chalk"));
 
 // ../../aws-cdk/lib/api/deployments/asset-manifest-builder.ts
-var cxschema = __toESM(require("@aws-cdk/cloud-assembly-schema"));
+var cxschema2 = __toESM(require("@aws-cdk/cloud-assembly-schema"));
 var import_cdk_assets = require("cdk-assets");
 var AssetManifestBuilder = class {
   constructor() {
     this.manifest = {
-      version: cxschema.Manifest.version(),
+      version: cxschema2.Manifest.version(),
       files: {},
       dockerImages: {}
     };
@@ -3889,7 +3925,7 @@ var util6 = __toESM(require("node:util"));
 var import_cx_api3 = require("@aws-cdk/cx-api");
 var import_client_s32 = require("@aws-sdk/client-s3");
 var import_middleware_endpoint2 = require("@smithy/middleware-endpoint");
-var chalk5 = __toESM(require("chalk"));
+var chalk6 = __toESM(require("chalk"));
 var LARGE_TEMPLATE_SIZE_KB = 50;
 async function makeBodyParameter(ioHelper, stack, resolvedEnvironment, assetManifest, resources, overrideTemplate) {
   if (stack.stackTemplateAssetObjectUrl && !overrideTemplate) {
@@ -3909,7 +3945,7 @@ async function makeBodyParameter(ioHelper, stack, resolvedEnvironment, assetMani
 Run the following command in order to setup an S3 bucket in this environment, and then re-deploy:
 
 `,
-        chalk5.blue(`	$ cdk bootstrap ${resolvedEnvironment.name}
+        chalk6.blue(`	$ cdk bootstrap ${resolvedEnvironment.name}
 `)
       ))
     );
@@ -4637,6 +4673,15 @@ async function waitForChangeSet(cfn, ioHelper, stackName, changeSetName, { fetch
   }
   return ret;
 }
+async function createDiffChangeSet(ioHelper, options) {
+  for (const resource of Object.values(options.stack.template.Resources ?? {})) {
+    if (resource.Type === "AWS::CloudFormation::Stack") {
+      await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg("This stack contains one or more nested stacks, falling back to template-only diff..."));
+      return void 0;
+    }
+  }
+  return uploadBodyParameterAndCreateChangeSet(ioHelper, options);
+}
 function templatesFromAssetManifestArtifact(artifact) {
   const assets = [];
   const fileName = artifact.file;
@@ -4651,6 +4696,43 @@ function templatesFromAssetManifestArtifact(artifact) {
   });
   return [assetManifest, assets];
 }
+async function uploadBodyParameterAndCreateChangeSet(ioHelper, options) {
+  try {
+    await uploadStackTemplateAssets(options.stack, options.deployments);
+    const env = await options.deployments.envs.accessStackForMutableStackOperations(options.stack);
+    const bodyParameter = await makeBodyParameter(
+      ioHelper,
+      options.stack,
+      env.resolvedEnvironment,
+      new AssetManifestBuilder(),
+      env.resources
+    );
+    const cfn = env.sdk.cloudFormation();
+    const exists = (await CloudFormationStack.lookup(cfn, options.stack.stackName, false)).exists;
+    const executionRoleArn = await env.replacePlaceholders(options.stack.cloudFormationExecutionRoleArn);
+    await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(
+      "Hold on while we create a read-only change set to get a diff with accurate replacement information (use --no-change-set to use a less accurate but faster template-only diff)\n"
+    ));
+    return await createChangeSet(ioHelper, {
+      cfn,
+      changeSetName: "cdk-diff-change-set",
+      stack: options.stack,
+      exists,
+      uuid: options.uuid,
+      willExecute: options.willExecute,
+      bodyParameter,
+      parameters: options.parameters,
+      resourcesToImport: options.resourcesToImport,
+      role: executionRoleArn
+    });
+  } catch (e) {
+    await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(String(e)));
+    await ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(
+      "Could not create a change set, will base the diff on template differences (run again with -v to see the reason)\n"
+    ));
+    return void 0;
+  }
+}
 async function uploadStackTemplateAssets(stack, deployments) {
   for (const artifact of stack.dependencies) {
     if (!cxapi.AssetManifestArtifact.isAssetManifestArtifact(artifact)) {
@@ -4667,6 +4749,45 @@ async function uploadStackTemplateAssets(stack, deployments) {
     }
   }
 }
+async function createChangeSet(ioHelper, options) {
+  await cleanupOldChangeset(options.cfn, ioHelper, options.changeSetName, options.stack.stackName);
+  await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Attempting to create ChangeSet with name ${options.changeSetName} for stack ${options.stack.stackName}`));
+  const templateParams = TemplateParameters.fromTemplate(options.stack.template);
+  const stackParams = templateParams.supplyAll(options.parameters);
+  const changeSet = await options.cfn.createChangeSet({
+    StackName: options.stack.stackName,
+    ChangeSetName: options.changeSetName,
+    ChangeSetType: options.resourcesToImport ? "IMPORT" : options.exists ? "UPDATE" : "CREATE",
+    Description: `CDK Changeset for diff ${options.uuid}`,
+    ClientToken: `diff${options.uuid}`,
+    TemplateURL: options.bodyParameter.TemplateURL,
+    TemplateBody: options.bodyParameter.TemplateBody,
+    Parameters: stackParams.apiParameters,
+    ResourcesToImport: options.resourcesToImport,
+    RoleARN: options.role,
+    Tags: toCfnTags(options.stack.tags),
+    Capabilities: ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
+  });
+  await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg((0, import_util21.format)("Initiated creation of changeset: %s; waiting for it to finish creating...", changeSet.Id)));
+  const createdChangeSet = await waitForChangeSet(options.cfn, ioHelper, options.stack.stackName, options.changeSetName, {
+    fetchAll: options.willExecute
+  });
+  await cleanupOldChangeset(options.cfn, ioHelper, options.changeSetName, options.stack.stackName);
+  return createdChangeSet;
+}
+function toCfnTags(tags) {
+  return Object.entries(tags).map(([k, v]) => ({
+    Key: k,
+    Value: v
+  }));
+}
+async function cleanupOldChangeset(cfn, ioHelper, changeSetName, stackName) {
+  await ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Removing existing change set with name ${changeSetName} if it exists`));
+  await cfn.deleteChangeSet({
+    StackName: stackName,
+    ChangeSetName: changeSetName
+  });
+}
 function changeSetHasNoChanges(description) {
   const noChangeErrorPrefixes = [
     // Error message for a regular template
@@ -4855,14 +4976,14 @@ async function getBootstrapStackInfo(sdk, stackName) {
 
 // ../../aws-cdk/lib/api/deployments/deploy-stack.ts
 var import_util28 = require("util");
-var chalk8 = __toESM(require("chalk"));
+var chalk9 = __toESM(require("chalk"));
 var uuid3 = __toESM(require("uuid"));
 
 // ../../aws-cdk/lib/api/deployments/assets.ts
 var path6 = __toESM(require("path"));
-var cxschema2 = __toESM(require("@aws-cdk/cloud-assembly-schema"));
+var cxschema3 = __toESM(require("@aws-cdk/cloud-assembly-schema"));
 var cxapi2 = __toESM(require("@aws-cdk/cx-api"));
-var chalk6 = __toESM(require("chalk"));
+var chalk7 = __toESM(require("chalk"));
 async function addMetadataAssetsToManifest(ioHelper, stack, assetManifest, envResources, reuse) {
   reuse = reuse || [];
   const assets = stack.assets;
@@ -4871,7 +4992,7 @@ async function addMetadataAssetsToManifest(ioHelper, stack, assetManifest, envRe
   }
   const toolkitInfo = await envResources.lookupToolkit();
   if (!toolkitInfo.found) {
-    throw new ToolkitError(`This stack uses assets, so the toolkit stack must be deployed to the environment (Run "${chalk6.blue("cdk bootstrap " + stack.environment.name)}")`);
+    throw new ToolkitError(`This stack uses assets, so the toolkit stack must be deployed to the environment (Run "${chalk7.blue("cdk bootstrap " + stack.environment.name)}")`);
   }
   const params = {};
   for (const asset of assets) {
@@ -4897,7 +5018,7 @@ async function prepareAsset(ioHelper, asset, assetManifest, envResources, toolki
         asset,
         assetManifest,
         toolkitInfo,
-        asset.packaging === "zip" ? cxschema2.FileAssetPackaging.ZIP_DIRECTORY : cxschema2.FileAssetPackaging.FILE
+        asset.packaging === "zip" ? cxschema3.FileAssetPackaging.ZIP_DIRECTORY : cxschema3.FileAssetPackaging.FILE
       );
     case "container-image":
       return prepareDockerImageAsset(asset, assetManifest, envResources);
@@ -4906,7 +5027,7 @@ async function prepareAsset(ioHelper, asset, assetManifest, envResources, toolki
   }
 }
 async function prepareFileAsset(ioHelper, asset, assetManifest, toolkitInfo, packaging) {
-  const extension = packaging === cxschema2.FileAssetPackaging.ZIP_DIRECTORY ? ".zip" : path6.extname(asset.path);
+  const extension = packaging === cxschema3.FileAssetPackaging.ZIP_DIRECTORY ? ".zip" : path6.extname(asset.path);
   const baseName = `${asset.sourceHash}${extension}`;
   const s3Prefix = asset.id === asset.sourceHash ? "assets/" : `assets/${asset.id}/`;
   const key = `${s3Prefix}${baseName}`;
@@ -4954,7 +5075,7 @@ async function prepareDockerImageAsset(asset, assetManifest, envResources) {
 // ../../aws-cdk/lib/api/deployments/hotswap-deployments.ts
 var import_util26 = require("util");
 var cfn_diff = __toESM(require("@aws-cdk/cloudformation-diff"));
-var chalk7 = __toESM(require("chalk"));
+var chalk8 = __toESM(require("chalk"));
 
 // ../../aws-cdk/lib/api/hotswap/common.ts
 var ICON = "\u2728";
@@ -6118,7 +6239,7 @@ async function applyHotswapOperation(sdk, ioSpan, hotswapOperation) {
   sdk.appendCustomUserAgent(customUserAgent);
   const resourceText = (r) => r.description ?? `${r.resourceType} '${r.physicalName ?? r.logicalId}'`;
   await ioSpan.notify(IO.CDK_TOOLKIT_I5402.msg(
-    hotswapOperation.change.resources.map((r) => (0, import_util26.format)(`   ${ICON} %s`, chalk7.bold(resourceText(r)))).join("\n"),
+    hotswapOperation.change.resources.map((r) => (0, import_util26.format)(`   ${ICON} %s`, chalk8.bold(resourceText(r)))).join("\n"),
     hotswapOperation.change
   ));
   try {
@@ -6133,7 +6254,7 @@ async function applyHotswapOperation(sdk, ioSpan, hotswapOperation) {
     throw e;
   }
   await ioSpan.notify(IO.CDK_TOOLKIT_I5403.msg(
-    hotswapOperation.change.resources.map((r) => (0, import_util26.format)(`   ${ICON} %s %s`, chalk7.bold(resourceText(r)), chalk7.green("hotswapped!"))).join("\n"),
+    hotswapOperation.change.resources.map((r) => (0, import_util26.format)(`   ${ICON} %s %s`, chalk8.bold(resourceText(r)), chalk8.green("hotswapped!"))).join("\n"),
     hotswapOperation.change
   ));
   sdk.removeCustomUserAgent(customUserAgent);
@@ -6162,9 +6283,9 @@ async function logRejectedChanges(ioSpan, rejectedChanges, hotswapMode) {
   }
   const messages = [""];
   if (hotswapMode === "hotswap-only") {
-    messages.push((0, import_util26.format)("%s %s", chalk7.red("\u26A0\uFE0F"), chalk7.red("The following non-hotswappable changes were found. To reconcile these using CloudFormation, specify --hotswap-fallback")));
+    messages.push((0, import_util26.format)("%s %s", chalk8.red("\u26A0\uFE0F"), chalk8.red("The following non-hotswappable changes were found. To reconcile these using CloudFormation, specify --hotswap-fallback")));
   } else {
-    messages.push((0, import_util26.format)("%s %s", chalk7.red("\u26A0\uFE0F"), chalk7.red("The following non-hotswappable changes were found:")));
+    messages.push((0, import_util26.format)("%s %s", chalk8.red("\u26A0\uFE0F"), chalk8.red("The following non-hotswappable changes were found:")));
   }
   for (const { change } of rejectedChanges) {
     messages.push("    " + nonHotswappableChangeMessage(change));
@@ -6179,8 +6300,8 @@ function nonHotswappableChangeMessage(change) {
     case "Output":
       return (0, import_util26.format)(
         "output: %s, reason: %s",
-        chalk7.bold(subject.logicalId),
-        chalk7.red(reason)
+        chalk8.bold(subject.logicalId),
+        chalk8.red(reason)
       );
     case "Resource":
       return nonHotswappableResourceMessage(subject, reason);
@@ -6190,17 +6311,17 @@ function nonHotswappableResourceMessage(subject, reason) {
   if (subject.rejectedProperties?.length) {
     return (0, import_util26.format)(
       "resource: %s, type: %s, rejected changes: %s, reason: %s",
-      chalk7.bold(subject.logicalId),
-      chalk7.bold(subject.resourceType),
-      chalk7.bold(subject.rejectedProperties),
-      chalk7.red(reason)
+      chalk8.bold(subject.logicalId),
+      chalk8.bold(subject.resourceType),
+      chalk8.bold(subject.rejectedProperties),
+      chalk8.red(reason)
     );
   }
   return (0, import_util26.format)(
     "resource: %s, type: %s, reason: %s",
-    chalk7.bold(subject.logicalId),
-    chalk7.bold(subject.resourceType),
-    chalk7.red(reason)
+    chalk8.bold(subject.logicalId),
+    chalk8.bold(subject.resourceType),
+    chalk8.red(reason)
   );
 }
 
@@ -6246,7 +6367,7 @@ async function deployStack(options, ioHelper) {
           `
  ${ICON} %s
 `,
-          chalk8.bold("hotswap deployment skipped - no changes were detected (use --force to override)")
+          chalk9.bold("hotswap deployment skipped - no changes were detected (use --force to override)")
         )
       ));
     }
@@ -6416,7 +6537,7 @@ var FullCloudFormationDeployment = class {
   async createChangeSet(changeSetName, willExecute, importExistingResources) {
     await this.cleanupOldChangeset(changeSetName);
     await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_DEBUG.msg(`Attempting to create ChangeSet with name ${changeSetName} to ${this.verb} stack ${this.stackName}`));
-    await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util28.format)("%s: creating CloudFormation changeset...", chalk8.bold(this.stackName))));
+    await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util28.format)("%s: creating CloudFormation changeset...", chalk9.bold(this.stackName))));
     const changeSet = await this.cfn.createChangeSet({
       StackName: this.stackName,
       ChangeSetName: changeSetName,
@@ -6478,7 +6599,7 @@ var FullCloudFormationDeployment = class {
     }
   }
   async directDeployment() {
-    await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util28.format)("%s: %s stack...", chalk8.bold(this.stackName), this.update ? "updating" : "creating")));
+    await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util28.format)("%s: %s stack...", chalk9.bold(this.stackName), this.update ? "updating" : "creating")));
     const startTime = /* @__PURE__ */ new Date();
     if (this.update) {
       await this.updateTerminationProtection();
@@ -6685,28 +6806,28 @@ function some(node, predicate) {
     return Object.values(node?.children ?? {}).some((child) => some(child, predicate));
   }
 }
-function loadTree(assembly, trace3) {
+async function loadTree(assembly, trace2) {
   try {
     const outdir = assembly.directory;
     const fileName = assembly.tree()?.file;
     return fileName ? fs8.readJSONSync(path7.join(outdir, fileName)).tree : {};
   } catch (e) {
-    trace3(`Failed to get tree.json file: ${e}. Proceeding with empty tree.`);
+    await trace2(`Failed to get tree.json file: ${e}. Proceeding with empty tree.`);
     return void 0;
   }
 }
-function loadTreeFromDir(outdir, trace3) {
+function loadTreeFromDir(outdir, trace2) {
   try {
     return fs8.readJSONSync(path7.join(outdir, "tree.json")).tree;
   } catch (e) {
-    trace3(`Failed to get tree.json file: ${e}. Proceeding with empty tree.`);
+    trace2(`Failed to get tree.json file: ${e}. Proceeding with empty tree.`);
     return void 0;
   }
 }
 
 // ../../aws-cdk/lib/cli/version.ts
 var path9 = __toESM(require("path"));
-var chalk9 = __toESM(require("chalk"));
+var chalk10 = __toESM(require("chalk"));
 var fs10 = __toESM(require("fs-extra"));
 var semver3 = __toESM(require("semver"));
 
@@ -7129,7 +7250,7 @@ var CachedDataSource = class {
 
 // ../../aws-cdk/lib/api/toolkit-info.ts
 var import_util33 = require("util");
-var chalk10 = __toESM(require("chalk"));
+var chalk11 = __toESM(require("chalk"));
 
 // ../../aws-cdk/lib/api/bootstrap/bootstrap-props.ts
 var BUCKET_NAME_OUTPUT = "BucketName";
@@ -7157,7 +7278,7 @@ var ToolkitInfo = class _ToolkitInfo {
             "The environment %s doesn't have the CDK toolkit stack (%s) installed. Use %s to setup your environment for use with the toolkit.",
             environment.name,
             stackName,
-            chalk10.blue(`cdk bootstrap "${environment.name}"`)
+            chalk11.blue(`cdk bootstrap "${environment.name}"`)
           )
         ));
         return _ToolkitInfo.bootstrapStackNotFoundInfo(stackName);
@@ -7168,7 +7289,7 @@ var ToolkitInfo = class _ToolkitInfo {
             "The environment %s has a CDK toolkit stack (%s) that failed to create. Use %s to try provisioning it again.",
             environment.name,
             stackName,
-            chalk10.blue(`cdk bootstrap "${environment.name}"`)
+            chalk11.blue(`cdk bootstrap "${environment.name}"`)
           )
         ));
         return _ToolkitInfo.bootstrapStackNotFoundInfo(stackName);
@@ -7921,7 +8042,7 @@ var Deployments = class {
     if (existing) {
       return existing;
     }
-    const prefix = stackName ? `${chalk11.bold(stackName)}: ` : "";
+    const prefix = stackName ? `${chalk12.bold(stackName)}: ` : "";
     const publisher = new cdk_assets.AssetPublishing(assetManifest, {
       // The AssetPublishing class takes care of role assuming etc, so it's okay to
       // give it a direct `SdkProvider`.
@@ -7960,7 +8081,7 @@ function tagsForStack(stack) {
 // ../../aws-cdk/lib/api/resource-import/importer.ts
 var import_util37 = require("util");
 var cfnDiff = __toESM(require("@aws-cdk/cloudformation-diff"));
-var chalk12 = __toESM(require("chalk"));
+var chalk13 = __toESM(require("chalk"));
 var fs12 = __toESM(require("fs-extra"));
 var promptly3 = __toESM(require("promptly"));
 var ResourceImporter = class {
@@ -7995,12 +8116,12 @@ var ResourceImporter = class {
       const descr = this.describeResource(resource.logicalId);
       const idProps = contents[resource.logicalId];
       if (idProps) {
-        await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util37.format)("%s: importing using %s", chalk12.blue(descr), chalk12.blue(fmtdict(idProps)))));
+        await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util37.format)("%s: importing using %s", chalk13.blue(descr), chalk13.blue(fmtdict(idProps)))));
         ret.importResources.push(resource);
         ret.resourceMap[resource.logicalId] = idProps;
         delete contents[resource.logicalId];
       } else {
-        await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util37.format)("%s: skipping", chalk12.blue(descr))));
+        await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg((0, import_util37.format)("%s: skipping", chalk13.blue(descr))));
       }
     }
     const unknown = Object.keys(contents);
@@ -8044,9 +8165,9 @@ var ResourceImporter = class {
       });
       assertIsSuccessfulDeployStackResult(result2);
       const message2 = result2.noOp ? " \u2705  %s (no changes)" : " \u2705  %s";
-      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg("\n" + chalk12.green((0, import_util37.format)(message2, this.stack.displayName))));
+      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg("\n" + chalk13.green((0, import_util37.format)(message2, this.stack.displayName))));
     } catch (e) {
-      await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0, import_util37.format)("\n \u274C  %s failed: %s", chalk12.bold(this.stack.displayName), e), { error: e }));
+      await this.ioHelper.notify(IO.CDK_TOOLKIT_E3900.msg((0, import_util37.format)("\n \u274C  %s failed: %s", chalk13.bold(this.stack.displayName), e), { error: e }));
       throw e;
     }
   }
@@ -8148,21 +8269,21 @@ var ResourceImporter = class {
       const candidateProps = Object.fromEntries(satisfiedPropSet.map((p) => [p, resourceProps[p]]));
       const displayCandidateProps = fmtdict(candidateProps);
       if (await promptly3.confirm(
-        `${chalk12.blue(resourceName)} (${resourceType}): import with ${chalk12.yellow(displayCandidateProps)} (yes/no) [default: yes]? `,
+        `${chalk13.blue(resourceName)} (${resourceType}): import with ${chalk13.yellow(displayCandidateProps)} (yes/no) [default: yes]? `,
         { default: "yes" }
       )) {
         return candidateProps;
       }
     }
     if (satisfiedPropSets.length > 0) {
-      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(chalk12.grey(`Skipping import of ${resourceName}`)));
+      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(chalk13.grey(`Skipping import of ${resourceName}`)));
       return void 0;
     }
-    const prefix = `${chalk12.blue(resourceName)} (${resourceType})`;
+    const prefix = `${chalk13.blue(resourceName)} (${resourceType})`;
     let preamble;
     let promptPattern;
     if (idPropSets.length > 1) {
-      preamble = `${prefix}: enter one of ${idPropSets.map((x) => chalk12.blue(x.join("+"))).join(", ")} to import (all empty to skip)`;
+      preamble = `${prefix}: enter one of ${idPropSets.map((x) => chalk13.blue(x.join("+"))).join(", ")} to import (all empty to skip)`;
       promptPattern = `${prefix}: enter %`;
     } else {
       promptPattern = `${prefix}: enter %`;
@@ -8175,7 +8296,7 @@ var ResourceImporter = class {
       for (const idProp of idProps) {
         const defaultValue = resourceProps[idProp] ?? "";
         const prompt4 = [
-          promptPattern.replace(/%/g, chalk12.blue(idProp)),
+          promptPattern.replace(/%/g, chalk13.blue(idProp)),
           defaultValue ? `[${defaultValue}]` : "(empty to skip)"
         ].join(" ") + ":";
         const response = await promptly3.prompt(
@@ -8192,7 +8313,7 @@ var ResourceImporter = class {
         return input;
       }
     }
-    await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(chalk12.grey(`Skipping import of ${resourceName}`)));
+    await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(chalk13.grey(`Skipping import of ${resourceName}`)));
     return void 0;
   }
   /**
@@ -8222,12 +8343,6 @@ var ResourceImporter = class {
     return removeNonImportResources(this.stack);
   }
 };
-function removeNonImportResources(stack) {
-  const template = stack.template;
-  delete template.Resources.CDKMetadata;
-  delete template.Outputs;
-  return template;
-}
 function fmtdict(xs) {
   return Object.entries(xs).map(([k, v]) => `${k}=${v}`).join(", ");
 }
@@ -8242,7 +8357,7 @@ function addDefaultDeletionPolicy(resource) {
 }
 
 // ../../aws-cdk/lib/api/resource-import/migrator.ts
-var chalk13 = __toESM(require("chalk"));
+var chalk14 = __toESM(require("chalk"));
 var fs13 = __toESM(require("fs-extra"));
 var ResourceMigrator = class {
   constructor(props) {
@@ -8263,11 +8378,11 @@ var ResourceMigrator = class {
     });
     const resourcesToImport = await this.tryGetResources(await migrateDeployment.resolveEnvironment());
     if (resourcesToImport) {
-      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(`${chalk13.bold(stack.displayName)}: creating stack for resource migration...`));
-      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(`${chalk13.bold(stack.displayName)}: importing resources into stack...`));
+      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(`${chalk14.bold(stack.displayName)}: creating stack for resource migration...`));
+      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(`${chalk14.bold(stack.displayName)}: importing resources into stack...`));
       await this.performResourceMigration(migrateDeployment, resourcesToImport, options);
       fs13.rmSync("migrate.json");
-      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(`${chalk13.bold(stack.displayName)}: applying CDKMetadata and Outputs to stack (if applicable)...`));
+      await this.ioHelper.notify(IO.DEFAULT_TOOLKIT_INFO.msg(`${chalk14.bold(stack.displayName)}: applying CDKMetadata and Outputs to stack (if applicable)...`));
     }
   }
   /**
@@ -8306,7 +8421,7 @@ var ResourceMigrator = class {
 
 // ../../aws-cdk/lib/api/logs/logs-monitor.ts
 var util9 = __toESM(require("util"));
-var chalk14 = __toESM(require("chalk"));
+var chalk15 = __toESM(require("chalk"));
 var uuid4 = __toESM(require("uuid"));
 var CloudWatchLogEventMonitor = class {
   constructor(props) {
@@ -8426,8 +8541,8 @@ var CloudWatchLogEventMonitor = class {
     await this.ioHelper.notify(IO.CDK_TOOLKIT_I5033.msg(
       util9.format(
         "[%s] %s %s",
-        chalk14.blue(event.logGroupName),
-        chalk14.yellow(event.timestamp.toLocaleTimeString()),
+        chalk15.blue(event.logGroupName),
+        chalk15.yellow(event.timestamp.toLocaleTimeString()),
         event.message.trim()
       ),
       event
@@ -9502,7 +9617,7 @@ __export(context_providers_exports, {
   registerContextProviderFactory: () => registerContextProviderFactory,
   registerPluginContextProvider: () => registerPluginContextProvider
 });
-var cxschema3 = __toESM(require("@aws-cdk/cloud-assembly-schema"));
+var cxschema4 = __toESM(require("@aws-cdk/cloud-assembly-schema"));
 var cxapi4 = __toESM(require("@aws-cdk/cx-api"));
 
 // ../../aws-cdk/lib/context-providers/ami.ts
@@ -9589,7 +9704,7 @@ var CcApiContextProviderPlugin = class {
       if (args.exactIdentifier) {
         resources = await this.getResource(cloudControl, args.typeName, args.exactIdentifier);
       } else if (args.propertyMatch) {
-        resources = await this.listResources(cloudControl, args.typeName, args.propertyMatch);
+        resources = await this.listResources(cloudControl, args.typeName, args.propertyMatch, args.expectedMatchCount);
       } else {
         throw new ContextProviderError(`Provider protocol error: neither exactIdentifier nor propertyMatch is specified in ${JSON.stringify(args)}.`);
       }
@@ -9635,7 +9750,7 @@ var CcApiContextProviderPlugin = class {
    *
    * Does not currently paginate through more than one result page.
    */
-  async listResources(cc, typeName, propertyMatch) {
+  async listResources(cc, typeName, propertyMatch, expectedMatchCount) {
     try {
       const result2 = await cc.listResources({
         TypeName: typeName
@@ -9646,6 +9761,12 @@ var CcApiContextProviderPlugin = class {
           return propertyMatchesFilter(actual, expected);
         });
       });
+      if ((expectedMatchCount === "at-least-one" || expectedMatchCount === "exactly-one") && found.length === 0) {
+        throw new ZeroResourcesFoundError(`Could not find any resources matching ${JSON.stringify(propertyMatch)}`);
+      }
+      if ((expectedMatchCount === "at-most-one" || expectedMatchCount === "exactly-one") && found.length > 1) {
+        throw new ContextProviderError(`Found ${found.length} resources matching ${JSON.stringify(propertyMatch)}; please narrow the search criteria`);
+      }
       return found;
     } catch (err) {
       if (!(err instanceof ContextProviderError) && !(err instanceof ZeroResourcesFoundError)) {
@@ -10359,7 +10480,7 @@ var ContextProviderMessages = class {
 async function provideContextValues(missingValues, context, sdk, ioHelper) {
   for (const missingContext of missingValues) {
     const key = missingContext.key;
-    const providerName = missingContext.provider === cxschema3.ContextProvider.PLUGIN ? `${PLUGIN_PROVIDER_PREFIX}:${missingContext.props.pluginName}` : missingContext.provider;
+    const providerName = missingContext.provider === cxschema4.ContextProvider.PLUGIN ? `${PLUGIN_PROVIDER_PREFIX}:${missingContext.props.pluginName}` : missingContext.provider;
     let factory;
     if (providerName.startsWith(`${PLUGIN_PROVIDER_PREFIX}:`)) {
       const plugin = PluginHost.instance.contextProviderPlugins[providerName.substring(PLUGIN_PROVIDER_PREFIX.length + 1)];
@@ -10400,17 +10521,17 @@ function registerContextProviderFactory(name, provider) {
   availableContextProviders[name] = provider;
 }
 var availableContextProviders = {
-  [cxschema3.ContextProvider.AVAILABILITY_ZONE_PROVIDER]: (s, io) => new AZContextProviderPlugin(s, io),
-  [cxschema3.ContextProvider.SSM_PARAMETER_PROVIDER]: (s, io) => new SSMContextProviderPlugin(s, io),
-  [cxschema3.ContextProvider.HOSTED_ZONE_PROVIDER]: (s, io) => new HostedZoneContextProviderPlugin(s, io),
-  [cxschema3.ContextProvider.VPC_PROVIDER]: (s, io) => new VpcNetworkContextProviderPlugin(s, io),
-  [cxschema3.ContextProvider.AMI_PROVIDER]: (s, io) => new AmiContextProviderPlugin(s, io),
-  [cxschema3.ContextProvider.ENDPOINT_SERVICE_AVAILABILITY_ZONE_PROVIDER]: (s, io) => new EndpointServiceAZContextProviderPlugin(s, io),
-  [cxschema3.ContextProvider.SECURITY_GROUP_PROVIDER]: (s) => new SecurityGroupContextProviderPlugin(s),
-  [cxschema3.ContextProvider.LOAD_BALANCER_PROVIDER]: (s) => new LoadBalancerContextProviderPlugin(s),
-  [cxschema3.ContextProvider.LOAD_BALANCER_LISTENER_PROVIDER]: (s) => new LoadBalancerListenerContextProviderPlugin(s),
-  [cxschema3.ContextProvider.KEY_PROVIDER]: (s, io) => new KeyContextProviderPlugin(s, io),
-  [cxschema3.ContextProvider.CC_API_PROVIDER]: (s) => new CcApiContextProviderPlugin(s)
+  [cxschema4.ContextProvider.AVAILABILITY_ZONE_PROVIDER]: (s, io) => new AZContextProviderPlugin(s, io),
+  [cxschema4.ContextProvider.SSM_PARAMETER_PROVIDER]: (s, io) => new SSMContextProviderPlugin(s, io),
+  [cxschema4.ContextProvider.HOSTED_ZONE_PROVIDER]: (s, io) => new HostedZoneContextProviderPlugin(s, io),
+  [cxschema4.ContextProvider.VPC_PROVIDER]: (s, io) => new VpcNetworkContextProviderPlugin(s, io),
+  [cxschema4.ContextProvider.AMI_PROVIDER]: (s, io) => new AmiContextProviderPlugin(s, io),
+  [cxschema4.ContextProvider.ENDPOINT_SERVICE_AVAILABILITY_ZONE_PROVIDER]: (s, io) => new EndpointServiceAZContextProviderPlugin(s, io),
+  [cxschema4.ContextProvider.SECURITY_GROUP_PROVIDER]: (s) => new SecurityGroupContextProviderPlugin(s),
+  [cxschema4.ContextProvider.LOAD_BALANCER_PROVIDER]: (s) => new LoadBalancerContextProviderPlugin(s),
+  [cxschema4.ContextProvider.LOAD_BALANCER_LISTENER_PROVIDER]: (s) => new LoadBalancerListenerContextProviderPlugin(s),
+  [cxschema4.ContextProvider.KEY_PROVIDER]: (s, io) => new KeyContextProviderPlugin(s, io),
+  [cxschema4.ContextProvider.CC_API_PROVIDER]: (s) => new CcApiContextProviderPlugin(s)
 };
 
 // ../../aws-cdk/lib/api/util/rwlock.ts
@@ -10565,7 +10686,7 @@ function processExists(pid) {
 
 // ../../aws-cdk/lib/api/cxapp/cloud-assembly.ts
 var import_cx_api9 = require("@aws-cdk/cx-api");
-var chalk15 = __toESM(require("chalk"));
+var chalk16 = __toESM(require("chalk"));
 var import_minimatch = require("minimatch");
 var semver5 = __toESM(require("semver"));
 var ExtendedStackSelection = /* @__PURE__ */ ((ExtendedStackSelection2) => {
@@ -10575,9 +10696,10 @@ var ExtendedStackSelection = /* @__PURE__ */ ((ExtendedStackSelection2) => {
   return ExtendedStackSelection2;
 })(ExtendedStackSelection || {});
 var CloudAssembly2 = class {
-  constructor(assembly) {
+  constructor(assembly, ioHelper) {
     this.assembly = assembly;
     this.directory = assembly.directory;
+    this.ioHelper = ioHelper;
   }
   async selectStacks(selector, options) {
     const asm = this.assembly;
@@ -10599,14 +10721,14 @@ var CloudAssembly2 = class {
       return this.selectDefaultStacks(stacks, topLevelStacks, options.defaultBehavior);
     }
   }
-  selectTopLevelStacks(stacks, topLevelStacks, extend = 0 /* None */) {
+  async selectTopLevelStacks(stacks, topLevelStacks, extend = 0 /* None */) {
     if (topLevelStacks.length > 0) {
       return this.extendStacks(topLevelStacks, stacks, extend);
     } else {
       throw new ToolkitError('No stack found in the main cloud assembly. Use "list" to print manifest');
     }
   }
-  selectMatchingStacks(stacks, patterns, extend = 0 /* None */) {
+  async selectMatchingStacks(stacks, patterns, extend = 0 /* None */) {
     const matchingPattern = (pattern) => (stack) => (0, import_minimatch.minimatch)(stack.hierarchicalId, pattern);
     const matchedStacks = flatten(patterns.map((pattern) => stacks.filter(matchingPattern(pattern))));
     return this.extendStacks(matchedStacks, stacks, extend);
@@ -10630,7 +10752,7 @@ Stacks: ${stacks.map((x) => x.hierarchicalId).join(" \xB7 ")}`);
         throw new ToolkitError(`invalid default behavior: ${defaultSelection}`);
     }
   }
-  extendStacks(matched, all, extend = 0 /* None */) {
+  async extendStacks(matched, all, extend = 0 /* None */) {
     const allStacks = /* @__PURE__ */ new Map();
     for (const stack of all) {
       allStacks.set(stack.hierarchicalId, stack);
@@ -10638,10 +10760,10 @@ Stacks: ${stacks.map((x) => x.hierarchicalId).join(" \xB7 ")}`);
     const index = indexByHierarchicalId(matched);
     switch (extend) {
       case 2 /* Downstream */:
-        includeDownstreamStacks(index, allStacks);
+        await includeDownstreamStacks(this.ioHelper, index, allStacks);
         break;
       case 1 /* Upstream */:
-        includeUpstreamStacks(index, allStacks);
+        await includeUpstreamStacks(this.ioHelper, index, allStacks);
         break;
     }
     const selectedList = all.filter((s) => index.has(s.hierarchicalId));
@@ -10756,7 +10878,7 @@ function indexByHierarchicalId(stacks) {
   }
   return result2;
 }
-function includeDownstreamStacks(selectedStacks, allStacks) {
+async function includeDownstreamStacks(ioHelper, selectedStacks, allStacks) {
   const added = new Array();
   let madeProgress;
   do {
@@ -10770,10 +10892,10 @@ function includeDownstreamStacks(selectedStacks, allStacks) {
     }
   } while (madeProgress);
   if (added.length > 0) {
-    info2("Including depending stacks: %s", chalk15.bold(added.join(", ")));
+    await ioHelper.notify(IO.DEFAULT_ASSEMBLY_INFO.msg(`Including depending stacks: ${chalk16.bold(added.join(", "))}`));
   }
 }
-function includeUpstreamStacks(selectedStacks, allStacks) {
+async function includeUpstreamStacks(ioHelper, selectedStacks, allStacks) {
   const added = new Array();
   let madeProgress = true;
   while (madeProgress) {
@@ -10789,7 +10911,7 @@ function includeUpstreamStacks(selectedStacks, allStacks) {
     }
   }
   if (added.length > 0) {
-    info2("Including dependency stacks: %s", chalk15.bold(added.join(", ")));
+    await ioHelper.notify(IO.DEFAULT_ASSEMBLY_INFO.msg(`Including dependency stacks: ${chalk16.bold(added.join(", "))}`));
   }
 }
 function sanitizePatterns(patterns) {
@@ -10800,7 +10922,8 @@ function sanitizePatterns(patterns) {
 
 // ../../aws-cdk/lib/api/cxapp/exec.ts
 var path14 = __toESM(require("path"));
-var cxschema4 = __toESM(require("@aws-cdk/cloud-assembly-schema"));
+var import_util47 = require("util");
+var cxschema5 = __toESM(require("@aws-cdk/cloud-assembly-schema"));
 var cxapi5 = __toESM(require("@aws-cdk/cx-api"));
 var fs17 = __toESM(require("fs-extra"));
 var semver6 = __toESM(require("semver"));
@@ -10809,18 +10932,18 @@ var semver6 = __toESM(require("semver"));
 var fs16 = __toESM(require("fs-extra"));
 
 // ../../aws-cdk/lib/api/cxapp/exec.ts
-async function prepareDefaultEnvironment(aws, logFn = debug2) {
+async function prepareDefaultEnvironment(aws, debugFn) {
   const env = {};
   env[cxapi5.DEFAULT_REGION_ENV] = aws.defaultRegion;
-  await logFn(`Setting "${cxapi5.DEFAULT_REGION_ENV}" environment variable to`, env[cxapi5.DEFAULT_REGION_ENV]);
+  await debugFn(`Setting "${cxapi5.DEFAULT_REGION_ENV}" environment variable to ${env[cxapi5.DEFAULT_REGION_ENV]}`);
   const accountId = (await aws.defaultAccount())?.accountId;
   if (accountId) {
     env[cxapi5.DEFAULT_ACCOUNT_ENV] = accountId;
-    await logFn(`Setting "${cxapi5.DEFAULT_ACCOUNT_ENV}" environment variable to`, env[cxapi5.DEFAULT_ACCOUNT_ENV]);
+    await debugFn(`Setting "${cxapi5.DEFAULT_ACCOUNT_ENV}" environment variable to ${env[cxapi5.DEFAULT_ACCOUNT_ENV]}`);
   }
   return env;
 }
-async function prepareContext(settings, context, env) {
+async function prepareContext(settings, context, env, debugFn) {
   const debugMode = settings.get(["debug"]) ?? true;
   if (debugMode) {
     env.CDK_DEBUG = "true";
@@ -10846,7 +10969,7 @@ async function prepareContext(settings, context, env) {
   }
   const bundlingStacks = settings.get(["bundlingStacks"]) ?? ["**"];
   context[cxapi5.BUNDLING_STACKS] = bundlingStacks;
-  debug2("context:", context);
+  await debugFn((0, import_util47.format)("context:", context));
   return context;
 }
 function appToArray(app) {
@@ -10858,14 +10981,14 @@ function executeNode(scriptFile) {
 var EXTENSION_MAP = /* @__PURE__ */ new Map([
   [".js", executeNode]
 ]);
-async function guessExecutable(app) {
+async function guessExecutable(app, debugFn) {
   const commandLine = appToArray(app);
   if (commandLine.length === 1) {
     let fstat;
     try {
       fstat = await fs17.stat(commandLine[0]);
     } catch {
-      debug2(`Not a file: '${commandLine[0]}'. Using '${commandLine}' as command-line`);
+      await debugFn(`Not a file: '${commandLine[0]}'. Using '${commandLine}' as command-line`);
       return commandLine;
     }
     const isExecutable = (fstat.mode & fs17.constants.X_OK) !== 0;
@@ -10903,6 +11026,7 @@ function spaceAvailableForContext(env, limit) {
   StackCollection,
   WorkGraphBuilder,
   contextproviders,
+  createDiffChangeSet,
   findCloudWatchLogGroups,
   guessExecutable,
   loadTree,