aws-cdk 2.1136.0 → 2.1137.0

package/lib/index.js

@@ -3695,7 +3695,7 @@ var require_semver2 = __commonJS({
 // ../@aws-cdk/cloud-assembly-schema/cli-version.json
 var require_cli_version = __commonJS({
   "../@aws-cdk/cloud-assembly-schema/cli-version.json"(exports2, module2) {
-    module2.exports = { version: "2.1136.0" };
+    module2.exports = { version: "2.1137.0" };
   }
 });
 
@@ -95072,28 +95072,30 @@ async function createChangeSetAndCleanup(ioHelper, options) {
     Capabilities: ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
   });
   await ioHelper.defaults.debug((0, import_node_util2.format)("Initiated creation of changeset: %s; waiting for it to finish creating...", changeSet.Id));
-  const createdChangeSet = await new ChangeSetDescriber({
-    cfn: options.cfn,
-    ioHelper,
-    stackNameOrArn: changeSet.StackId ?? options.stack.stackName,
-    changeSetNameOrArn: changeSet.Id ?? options.changeSetName
-  }).waitAndThrowOnProblem({
-    diagnoser: options.diagnoser
-  });
-  await cleanupOldChangeset(
-    options.cfn,
-    ioHelper,
-    changeSet.Id ?? options.changeSetName,
-    changeSet.StackId ?? options.stack.stackName
-  );
-  if (!options.exists) {
-    await ioHelper.defaults.debug((0, import_node_util2.format)("Deleting empty stack created by diff changeset: %s", changeSet.StackId ?? options.stack.stackName));
-    await options.cfn.deleteStack({
-      StackName: changeSet.StackId ?? options.stack.stackName,
-      ClientRequestToken: (0, import_node_crypto9.randomUUID)()
+  const changeSetId = changeSet.Id ?? options.changeSetName;
+  const stackId = changeSet.StackId ?? options.stack.stackName;
+  try {
+    return await new ChangeSetDescriber({
+      cfn: options.cfn,
+      ioHelper,
+      stackNameOrArn: stackId,
+      changeSetNameOrArn: changeSetId
+    }).waitAndThrowOnProblem({
+      diagnoser: options.diagnoser
     });
+  } catch (e6) {
+    await ioHelper.defaults.warn((0, import_node_util2.format)("Change set %s failed: %s", changeSetId, e6));
+    throw e6;
+  } finally {
+    await cleanupOldChangeset(options.cfn, ioHelper, changeSetId, stackId);
+    if (!options.exists) {
+      await ioHelper.defaults.debug((0, import_node_util2.format)("Deleting empty stack created by diff changeset: %s", stackId));
+      await options.cfn.deleteStack({
+        StackName: stackId,
+        ClientRequestToken: (0, import_node_crypto9.randomUUID)()
+      });
+    }
   }
-  return createdChangeSet;
 }
 async function createValidationChangeSet(ioHelper, options) {
   const { cfn, bodyParameter, exists, stackExistedBefore, executionRoleArn, diagnoser } = await prepareChangeSetEnv(ioHelper, options);
@@ -95373,306 +95375,6 @@ var init_checks = __esm({
   }
 });
 
-// ../@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts
-async function addMetadataAssetsToManifest(ioHelper, stack, assetManifest, envResources, reuse) {
-  reuse = reuse || [];
-  const assets = stack.assets;
-  if (assets.length === 0) {
-    return {};
-  }
-  const toolkitInfo = await envResources.lookupToolkit();
-  if (!toolkitInfo.found) {
-    throw new ToolkitError("BootstrapStackRequired", `This stack uses assets, so the toolkit stack must be deployed to the environment (Run "${import_chalk3.default.blue("cdk bootstrap " + stack.environment.name)}")`);
-  }
-  const params = {};
-  for (const asset of assets) {
-    const reuseAsset = reuse.indexOf(asset.id) > -1;
-    if (reuseAsset) {
-      await ioHelper.defaults.debug(`Reusing asset ${asset.id}: ${JSON.stringify(asset)}`);
-      continue;
-    }
-    await ioHelper.defaults.debug(`Preparing asset ${asset.id}: ${JSON.stringify(asset)}`);
-    if (!stack.assembly) {
-      throw new ToolkitError("AssemblyRequired", "Unexpected: stack assembly is required in order to find assets in assembly directory");
-    }
-    Object.assign(params, await prepareAsset(ioHelper, asset, assetManifest, envResources, toolkitInfo));
-  }
-  return params;
-}
-async function prepareAsset(ioHelper, asset, assetManifest, envResources, toolkitInfo) {
-  switch (asset.packaging) {
-    case "zip":
-    case "file":
-      return prepareFileAsset(
-        ioHelper,
-        asset,
-        assetManifest,
-        toolkitInfo,
-        asset.packaging === "zip" ? cxschema8.FileAssetPackaging.ZIP_DIRECTORY : cxschema8.FileAssetPackaging.FILE
-      );
-    case "container-image":
-      return prepareDockerImageAsset(asset, assetManifest, envResources);
-    default:
-      throw new ToolkitError("UnsupportedPackaging", `Unsupported packaging type: ${asset.packaging}. You might need to upgrade your aws-cdk toolkit to support this asset type.`);
-  }
-}
-async function prepareFileAsset(ioHelper, asset, assetManifest, toolkitInfo, packaging) {
-  const extension = packaging === cxschema8.FileAssetPackaging.ZIP_DIRECTORY ? ".zip" : path18.extname(asset.path);
-  const baseName = `${asset.sourceHash}${extension}`;
-  const s3Prefix = asset.id === asset.sourceHash ? "assets/" : `assets/${asset.id}/`;
-  const key = `${s3Prefix}${baseName}`;
-  const s3url = `s3://${toolkitInfo.bucketName}/${key}`;
-  await ioHelper.defaults.debug(`Storing asset ${asset.path} at ${s3url}`);
-  assetManifest.addFileAsset(asset.sourceHash, {
-    path: asset.path,
-    packaging
-  }, {
-    bucketName: toolkitInfo.bucketName,
-    objectKey: key
-  });
-  return {
-    [asset.s3BucketParameter]: toolkitInfo.bucketName,
-    [asset.s3KeyParameter]: `${s3Prefix}${cxapi3.ASSET_PREFIX_SEPARATOR}${baseName}`,
-    [asset.artifactHashParameter]: asset.sourceHash
-  };
-}
-async function prepareDockerImageAsset(asset, assetManifest, envResources) {
-  if (!asset.imageNameParameter && (!asset.repositoryName || !asset.imageTag)) {
-    throw new ToolkitError("InvalidDockerAssetConfig", 'Invalid Docker image asset configuration: "repositoryName" and "imageTag" are required when "imageNameParameter" is left out');
-  }
-  const repositoryName = asset.repositoryName ?? "cdk/" + asset.id.replace(/[:/]/g, "-").toLowerCase();
-  const { repositoryUri: repositoryUri2 } = await envResources.prepareEcrRepository(repositoryName);
-  const imageTag = asset.imageTag ?? asset.sourceHash;
-  assetManifest.addDockerImageAsset(asset.sourceHash, {
-    directory: asset.path,
-    dockerBuildArgs: asset.buildArgs,
-    dockerBuildSecrets: asset.buildSecrets,
-    dockerBuildSsh: asset.buildSsh,
-    dockerBuildTarget: asset.target,
-    dockerFile: asset.file,
-    networkMode: asset.networkMode,
-    platform: asset.platform,
-    dockerOutputs: asset.outputs
-  }, {
-    repositoryName,
-    imageTag
-  });
-  if (!asset.imageNameParameter) {
-    return {};
-  }
-  return { [asset.imageNameParameter]: `${repositoryUri2}:${imageTag}` };
-}
-var path18, cxapi3, cxschema8, import_chalk3;
-var init_assets3 = __esm({
-  "../@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts"() {
-    "use strict";
-    path18 = __toESM(require("path"));
-    cxapi3 = __toESM(require_lib3());
-    cxschema8 = __toESM(require_lib2());
-    import_chalk3 = __toESM(require_source());
-    init_toolkit_error();
-    __name(addMetadataAssetsToManifest, "addMetadataAssetsToManifest");
-    __name(prepareAsset, "prepareAsset");
-    __name(prepareFileAsset, "prepareFileAsset");
-    __name(prepareDockerImageAsset, "prepareDockerImageAsset");
-  }
-});
-
-// ../@aws-cdk/toolkit-lib/lib/actions/deploy/private/deployment-method.ts
-function isChangeSetDeployment(method) {
-  return method?.method === "change-set";
-}
-function isExecutingChangeSetDeployment(method) {
-  return isChangeSetDeployment(method) && (method.execute ?? true);
-}
-function isNonExecutingChangeSetDeployment(method) {
-  return isChangeSetDeployment(method) && method.execute === false;
-}
-function isExecuteChangeSetDeployment(method) {
-  return method?.method === "execute-change-set";
-}
-function toExecuteChangeSetDeployment(method) {
-  return {
-    method: "execute-change-set",
-    changeSetName: method.changeSetName ?? DEFAULT_DEPLOY_CHANGE_SET_NAME
-  };
-}
-var DEFAULT_DEPLOY_CHANGE_SET_NAME;
-var init_deployment_method = __esm({
-  "../@aws-cdk/toolkit-lib/lib/actions/deploy/private/deployment-method.ts"() {
-    "use strict";
-    DEFAULT_DEPLOY_CHANGE_SET_NAME = "cdk-deploy-change-set";
-    __name(isChangeSetDeployment, "isChangeSetDeployment");
-    __name(isExecutingChangeSetDeployment, "isExecutingChangeSetDeployment");
-    __name(isNonExecutingChangeSetDeployment, "isNonExecutingChangeSetDeployment");
-    __name(isExecuteChangeSetDeployment, "isExecuteChangeSetDeployment");
-    __name(toExecuteChangeSetDeployment, "toExecuteChangeSetDeployment");
-  }
-});
-
-// ../@aws-cdk/toolkit-lib/lib/payloads/hotswap.ts
-var NonHotswappableReason;
-var init_hotswap = __esm({
-  "../@aws-cdk/toolkit-lib/lib/payloads/hotswap.ts"() {
-    "use strict";
-    NonHotswappableReason = /* @__PURE__ */ ((NonHotswappableReason2) => {
-      NonHotswappableReason2["TAGS"] = "tags";
-      NonHotswappableReason2["PROPERTIES"] = "properties";
-      NonHotswappableReason2["OUTPUT"] = "output";
-      NonHotswappableReason2["DEPENDENCY_UNSUPPORTED"] = "dependency-unsupported";
-      NonHotswappableReason2["RESOURCE_UNSUPPORTED"] = "resource-unsupported";
-      NonHotswappableReason2["RESOURCE_CREATION"] = "resource-creation";
-      NonHotswappableReason2["RESOURCE_DELETION"] = "resource-deletion";
-      NonHotswappableReason2["RESOURCE_TYPE_CHANGED"] = "resource-type-changed";
-      NonHotswappableReason2["NESTED_STACK_CREATION"] = "nested-stack-creation";
-      return NonHotswappableReason2;
-    })(NonHotswappableReason || {});
-  }
-});
-
-// ../@aws-cdk/toolkit-lib/lib/api/hotswap/common.ts
-function createHotswapPropertyOverrides(props) {
-  return new HotswapPropertyOverrides(new EcsHotswapProperties(
-    props.ecs?.minimumHealthyPercent,
-    props.ecs?.maximumHealthyPercent,
-    props.ecs?.stabilizationTimeoutSeconds
-  ));
-}
-function classifyChanges(xs, hotswappablePropNames) {
-  const hotswappableProps = {};
-  const nonHotswappableProps = {};
-  for (const [name, propDiff] of Object.entries(xs.propertyUpdates)) {
-    if (hotswappablePropNames.includes(name)) {
-      hotswappableProps[name] = propDiff;
-    } else {
-      nonHotswappableProps[name] = propDiff;
-    }
-  }
-  return new ClassifiedChanges(xs, hotswappableProps, nonHotswappableProps);
-}
-function nonHotswappableChange(change, reason, description, nonHotswappableProps, hotswapOnlyVisible = true) {
-  return {
-    hotswappable: false,
-    hotswapOnlyVisible,
-    change: {
-      reason,
-      description,
-      subject: {
-        type: "Resource",
-        logicalId: change.logicalId,
-        resourceType: change.newValue.Type,
-        rejectedProperties: Object.keys(nonHotswappableProps ?? change.propertyUpdates),
-        metadata: change.metadata
-      }
-    }
-  };
-}
-function nonHotswappableResource(change) {
-  return {
-    hotswappable: false,
-    change: {
-      reason: "resource-unsupported" /* RESOURCE_UNSUPPORTED */,
-      description: "This resource type is not supported for hotswap deployments",
-      subject: {
-        type: "Resource",
-        logicalId: change.logicalId,
-        resourceType: change.newValue.Type,
-        rejectedProperties: Object.keys(change.propertyUpdates),
-        metadata: change.metadata
-      }
-    }
-  };
-}
-var ICON, HotswapPropertyOverrides, EcsHotswapProperties, ClassifiedChanges;
-var init_common3 = __esm({
-  "../@aws-cdk/toolkit-lib/lib/api/hotswap/common.ts"() {
-    "use strict";
-    init_hotswap();
-    init_toolkit_error();
-    ICON = "\u2728";
-    HotswapPropertyOverrides = class {
-      static {
-        __name(this, "HotswapPropertyOverrides");
-      }
-      // Each supported resource type will have its own properties. Currently this is ECS
-      ecs;
-      constructor(ecs) {
-        this.ecs = ecs;
-      }
-    };
-    EcsHotswapProperties = class {
-      static {
-        __name(this, "EcsHotswapProperties");
-      }
-      // The lower limit on the number of your service's tasks that must remain in the RUNNING state during a deployment, as a percentage of the desiredCount
-      minimumHealthyPercent;
-      // The upper limit on the number of your service's tasks that are allowed in the RUNNING or PENDING state during a deployment, as a percentage of the desiredCount
-      maximumHealthyPercent;
-      // The number of seconds to wait for a single service to reach stable state.
-      stabilizationTimeoutSeconds;
-      constructor(minimumHealthyPercent, maximumHealthyPercent, stabilizationTimeoutSeconds) {
-        if (minimumHealthyPercent !== void 0 && minimumHealthyPercent < 0) {
-          throw new ToolkitError("InvalidEcsMinHealthyPercent", "hotswap-ecs-minimum-healthy-percent can't be a negative number");
-        }
-        if (maximumHealthyPercent !== void 0 && maximumHealthyPercent < 0) {
-          throw new ToolkitError("InvalidEcsMaxHealthyPercent", "hotswap-ecs-maximum-healthy-percent can't be a negative number");
-        }
-        if (stabilizationTimeoutSeconds !== void 0 && stabilizationTimeoutSeconds < 0) {
-          throw new ToolkitError("InvalidEcsStabilizationTimeout", "hotswap-ecs-stabilization-timeout-seconds can't be a negative number");
-        }
-        if (minimumHealthyPercent == void 0) {
-          this.minimumHealthyPercent = 0;
-        } else {
-          this.minimumHealthyPercent = minimumHealthyPercent;
-        }
-        this.maximumHealthyPercent = maximumHealthyPercent;
-        this.stabilizationTimeoutSeconds = stabilizationTimeoutSeconds;
-      }
-      /**
-       * Check if any hotswap properties are defined
-       * @returns true if all properties are undefined, false otherwise
-       */
-      isEmpty() {
-        return this.minimumHealthyPercent === 0 && this.maximumHealthyPercent === void 0;
-      }
-    };
-    __name(createHotswapPropertyOverrides, "createHotswapPropertyOverrides");
-    ClassifiedChanges = class {
-      constructor(change, hotswappableProps, nonHotswappableProps) {
-        this.change = change;
-        this.hotswappableProps = hotswappableProps;
-        this.nonHotswappableProps = nonHotswappableProps;
-      }
-      change;
-      hotswappableProps;
-      nonHotswappableProps;
-      static {
-        __name(this, "ClassifiedChanges");
-      }
-      reportNonHotswappablePropertyChanges(ret) {
-        const nonHotswappablePropNames = Object.keys(this.nonHotswappableProps);
-        if (nonHotswappablePropNames.length > 0) {
-          const tagOnlyChange = nonHotswappablePropNames.length === 1 && nonHotswappablePropNames[0] === "Tags";
-          const reason = tagOnlyChange ? "tags" /* TAGS */ : "properties" /* PROPERTIES */;
-          const description = tagOnlyChange ? "Tags are not hotswappable" : `resource properties '${nonHotswappablePropNames}' are not hotswappable on this resource type`;
-          ret.push(nonHotswappableChange(
-            this.change,
-            reason,
-            description,
-            this.nonHotswappableProps
-          ));
-        }
-      }
-      get namesOfHotswappableProps() {
-        return Object.keys(this.hotswappableProps);
-      }
-    };
-    __name(classifyChanges, "classifyChanges");
-    __name(nonHotswappableChange, "nonHotswappableChange");
-    __name(nonHotswappableResource, "nonHotswappableResource");
-  }
-});
-
 // ../../node_modules/@cdklabs/tskb/lib/sorted-map.js
 var require_sorted_map = __commonJS({
   "../../node_modules/@cdklabs/tskb/lib/sorted-map.js"(exports2) {
@@ -97518,12 +97220,12 @@ function defaultResource(resource, statements) {
   statements.forEach((s2) => s2.resources.replaceStar(resource));
   return statements;
 }
-var import_service_spec_types, import_chalk4, IamChanges;
+var import_service_spec_types, import_chalk3, IamChanges;
 var init_iam_changes = __esm({
   "../@aws-cdk/cloudformation-diff/lib/iam/iam-changes.ts"() {
     "use strict";
     import_service_spec_types = __toESM(require_lib7());
-    import_chalk4 = __toESM(require_source());
+    import_chalk3 = __toESM(require_source());
     init_iam_identity_center();
     init_managed_policy();
     init_statement();
@@ -97593,7 +97295,7 @@ var init_iam_changes = __esm({
             renderedStatement.action,
             renderedStatement.principal,
             renderedStatement.condition
-          ].map((s2) => import_chalk4.default.green(s2)));
+          ].map((s2) => import_chalk3.default.green(s2)));
         }
         for (const statement of this.statements.removals) {
           const renderedStatement = statement.render();
@@ -97604,7 +97306,7 @@ var init_iam_changes = __esm({
             renderedStatement.action,
             renderedStatement.principal,
             renderedStatement.condition
-          ].map((s2) => import_chalk4.default.red(s2)));
+          ].map((s2) => import_chalk3.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -97618,14 +97320,14 @@ var init_iam_changes = __esm({
             "+",
             att.identityArn,
             att.managedPolicyArn
-          ].map((s2) => import_chalk4.default.green(s2)));
+          ].map((s2) => import_chalk3.default.green(s2)));
         }
         for (const att of this.managedPolicies.removals) {
           ret.push([
             "-",
             att.identityArn,
             att.managedPolicyArn
-          ].map((s2) => import_chalk4.default.red(s2)));
+          ].map((s2) => import_chalk3.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -97644,7 +97346,7 @@ var init_iam_changes = __esm({
             att.principalType || "",
             att.targetId || "",
             att.targetType || ""
-          ].map((s2) => import_chalk4.default.green(s2)));
+          ].map((s2) => import_chalk3.default.green(s2)));
         }
         for (const att of this.ssoAssignments.removals) {
           ret.push([
@@ -97656,7 +97358,7 @@ var init_iam_changes = __esm({
             att.principalType || "",
             att.targetId || "",
             att.targetType || ""
-          ].map((s2) => import_chalk4.default.red(s2)));
+          ].map((s2) => import_chalk3.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -97675,7 +97377,7 @@ var init_iam_changes = __esm({
             att.cfnLogicalId || "",
             att.ssoInstanceArn || "",
             att.accessControlAttributes?.map(formatAccessControlAttribute).join("\n") || ""
-          ].map((s2) => import_chalk4.default.green(s2)));
+          ].map((s2) => import_chalk3.default.green(s2)));
         }
         for (const att of this.ssoInstanceACAConfigs.removals) {
           ret.push([
@@ -97683,7 +97385,7 @@ var init_iam_changes = __esm({
             att.cfnLogicalId || "",
             att.ssoInstanceArn || "",
             att.accessControlAttributes?.map(formatAccessControlAttribute).join("\n") || ""
-          ].map((s2) => import_chalk4.default.red(s2)));
+          ].map((s2) => import_chalk3.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -97716,7 +97418,7 @@ var init_iam_changes = __esm({
             att.name || "",
             formatSsoPermissionsBoundary(att.ssoPermissionsBoundary),
             att.ssoCustomerManagedPolicyReferences?.map(formatManagedPolicyRef).join("\n") || ""
-          ].map((s2) => import_chalk4.default.green(s2)));
+          ].map((s2) => import_chalk3.default.green(s2)));
         }
         for (const att of this.ssoPermissionSets.removals) {
           ret.push([
@@ -97726,7 +97428,7 @@ var init_iam_changes = __esm({
             att.name || "",
             formatSsoPermissionsBoundary(att.ssoPermissionsBoundary),
             att.ssoCustomerManagedPolicyReferences?.map(formatManagedPolicyRef).join("\n") || ""
-          ].map((s2) => import_chalk4.default.red(s2)));
+          ].map((s2) => import_chalk3.default.red(s2)));
         }
         ret.sort(makeComparator((row) => [row[1]]));
         ret.splice(0, 0, header);
@@ -98046,11 +97748,11 @@ var init_security_group_rule = __esm({
 });
 
 // ../@aws-cdk/cloudformation-diff/lib/network/security-group-changes.ts
-var import_chalk5, SecurityGroupChanges;
+var import_chalk4, SecurityGroupChanges;
 var init_security_group_changes = __esm({
   "../@aws-cdk/cloudformation-diff/lib/network/security-group-changes.ts"() {
     "use strict";
-    import_chalk5 = __toESM(require_source());
+    import_chalk4 = __toESM(require_source());
     init_security_group_rule();
     init_diffable();
     init_render_intrinsics();
@@ -98098,7 +97800,7 @@ var init_security_group_changes = __esm({
           inOut,
           rule.describeProtocol(),
           rule.describePeer()
-        ].map((s2) => plusMin === "+" ? import_chalk5.default.green(s2) : import_chalk5.default.red(s2)), "renderRule");
+        ].map((s2) => plusMin === "+" ? import_chalk4.default.green(s2) : import_chalk4.default.red(s2)), "renderRule");
         ret.push(...this.ingress.additions.map(renderRule("+", inWord)));
         ret.push(...this.egress.additions.map(renderRule("+", outWord)));
         ret.push(...this.ingress.removals.map(renderRule("-", inWord)));
@@ -99373,15 +99075,15 @@ __export(format_foreach_exports, {
 function isForEachKey(logicalId) {
   return logicalId.startsWith("Fn::ForEach::");
 }
-var import_chalk6, ADDITION, UPDATE, REMOVAL, ForEachDiffFormatter;
+var import_chalk5, ADDITION, UPDATE, REMOVAL, ForEachDiffFormatter;
 var init_format_foreach = __esm({
   "../@aws-cdk/cloudformation-diff/lib/format-foreach.ts"() {
     "use strict";
-    import_chalk6 = __toESM(require_source());
+    import_chalk5 = __toESM(require_source());
     init_util6();
-    ADDITION = import_chalk6.default.green("[+]");
-    UPDATE = import_chalk6.default.yellow("[~]");
-    REMOVAL = import_chalk6.default.red("[-]");
+    ADDITION = import_chalk5.default.green("[+]");
+    UPDATE = import_chalk5.default.yellow("[~]");
+    REMOVAL = import_chalk5.default.red("[-]");
     ForEachDiffFormatter = class {
       static {
         __name(this, "ForEachDiffFormatter");
@@ -99394,24 +99096,24 @@ var init_format_foreach = __esm({
         const changeType = this.getChangeType(oldValue, newValue);
         const value2 = newValue ?? oldValue;
         if (!Array.isArray(value2) || value2.length < 2) {
-          lines.push(`${this.changeSymbol(changeType)} ${import_chalk6.default.cyan(key)} (unrecognized ForEach structure)`);
+          lines.push(`${this.changeSymbol(changeType)} ${import_chalk5.default.cyan(key)} (unrecognized ForEach structure)`);
           return lines;
         }
         const loopName = key.replace("Fn::ForEach::", "");
         const [collection, templateObj] = value2;
         const entries = Object.entries(templateObj);
         if (entries.length === 0) {
-          lines.push(`${this.changeSymbol(changeType)} ${import_chalk6.default.cyan(key)} (empty ForEach template)`);
+          lines.push(`${this.changeSymbol(changeType)} ${import_chalk5.default.cyan(key)} (empty ForEach template)`);
           return lines;
         }
         const [[templateKey, templateValue]] = entries;
         const count = Array.isArray(collection) ? `${collection.length} resources` : "dynamic count";
         lines.push(
-          `${this.changeSymbol(changeType)} ${import_chalk6.default.cyan(key)} (expands to ${count} at deploy time)`
+          `${this.changeSymbol(changeType)} ${import_chalk5.default.cyan(key)} (expands to ${count} at deploy time)`
         );
-        lines.push(`    Loop variable: ${import_chalk6.default.blue(loopName)}`);
+        lines.push(`    Loop variable: ${import_chalk5.default.blue(loopName)}`);
         lines.push(`    Collection: ${this.formatCollection(collection)}`);
-        lines.push(`    \u2514\u2500\u2500 ${templateKey} ${import_chalk6.default.cyan(templateValue?.Type ?? "Unknown")}`);
+        lines.push(`    \u2514\u2500\u2500 ${templateKey} ${import_chalk5.default.cyan(templateValue?.Type ?? "Unknown")}`);
         if (changeType === "update" && oldValue && newValue) {
           const oldProps = oldValue[1]?.[Object.keys(oldValue[1])[0]]?.Properties ?? {};
           const newProps = newValue[1]?.[Object.keys(newValue[1])[0]]?.Properties ?? {};
@@ -104116,11 +103818,11 @@ function sum(xs) {
   }
   return total;
 }
-var import_chalk7, import_string_width, table, tableColor, TABLE_BORDER_CHARACTERS;
+var import_chalk6, import_string_width, table, tableColor, TABLE_BORDER_CHARACTERS;
 var init_format_table = __esm({
   "../@aws-cdk/cloudformation-diff/lib/format-table.ts"() {
     "use strict";
-    import_chalk7 = __toESM(require_source());
+    import_chalk6 = __toESM(require_source());
     import_string_width = __toESM(require_string_width());
     table = __toESM(require_src());
     __name(formatTable, "formatTable");
@@ -104128,7 +103830,7 @@ var init_format_table = __esm({
     __name(buildColumnConfig, "buildColumnConfig");
     __name(calculateColumnWidths, "calculateColumnWidths");
     __name(sum, "sum");
-    tableColor = import_chalk7.default.gray;
+    tableColor = import_chalk6.default.gray;
     TABLE_BORDER_CHARACTERS = {
       topBody: tableColor("\u2500"),
       topJoin: tableColor("\u252C"),
@@ -106215,7 +105917,7 @@ function _diffStrings(oldStr, newStr, context) {
   const patch = structuredPatch(null, null, oldStr, newStr, null, null, { context });
   const result2 = new Array();
   for (const hunk of patch.hunks) {
-    result2.push(import_chalk8.default.magenta(`@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`));
+    result2.push(import_chalk7.default.magenta(`@@ -${hunk.oldStart},${hunk.oldLines} +${hunk.newStart},${hunk.newLines} @@`));
     const baseIndent = _findIndent(hunk.lines);
     for (const line of hunk.lines) {
       if (line === "\") {
@@ -106228,10 +105930,10 @@ function _diffStrings(oldStr, newStr, context) {
           result2.push(`${CONTEXT} ${text}`);
           break;
         case "+":
-          result2.push(import_chalk8.default.bold(`${ADDITION2} ${import_chalk8.default.green(text)}`));
+          result2.push(import_chalk7.default.bold(`${ADDITION2} ${import_chalk7.default.green(text)}`));
           break;
         case "-":
-          result2.push(import_chalk8.default.bold(`${REMOVAL2} ${import_chalk8.default.red(text)}`));
+          result2.push(import_chalk7.default.bold(`${REMOVAL2} ${import_chalk7.default.red(text)}`));
           break;
         default:
           throw new Error(`Unexpected diff marker: ${marker} (full line: ${line})`);
@@ -106253,12 +105955,12 @@ function _diffStrings(oldStr, newStr, context) {
   }
   __name(_findIndent, "_findIndent");
 }
-var import_util24, import_chalk8, PATH_METADATA_KEY3, structuredPatch, ADDITION2, CONTEXT, UPDATE2, REMOVAL2, IMPORT, Formatter;
+var import_util24, import_chalk7, PATH_METADATA_KEY3, structuredPatch, ADDITION2, CONTEXT, UPDATE2, REMOVAL2, IMPORT, Formatter;
 var init_format = __esm({
   "../@aws-cdk/cloudformation-diff/lib/format.ts"() {
     "use strict";
     import_util24 = require("util");
-    import_chalk8 = __toESM(require_source());
+    import_chalk7 = __toESM(require_source());
     init_util6();
     init_diff_template();
     init_format_foreach();
@@ -106268,11 +105970,11 @@ var init_format = __esm({
     __name(formatDifferences, "formatDifferences");
     __name(formatSecurityChanges, "formatSecurityChanges");
     __name(formatSecurityChangesWithBanner, "formatSecurityChangesWithBanner");
-    ADDITION2 = import_chalk8.default.green("[+]");
-    CONTEXT = import_chalk8.default.grey("[ ]");
-    UPDATE2 = import_chalk8.default.yellow("[~]");
-    REMOVAL2 = import_chalk8.default.red("[-]");
-    IMPORT = import_chalk8.default.blue("[\u2190]");
+    ADDITION2 = import_chalk7.default.green("[+]");
+    CONTEXT = import_chalk7.default.grey("[ ]");
+    UPDATE2 = import_chalk7.default.yellow("[~]");
+    REMOVAL2 = import_chalk7.default.red("[-]");
+    IMPORT = import_chalk7.default.blue("[\u2190]");
     Formatter = class {
       constructor(stream, logicalToPathMap, diff, context = 3) {
         this.stream = stream;
@@ -106289,10 +105991,10 @@ var init_format = __esm({
         __name(this, "Formatter");
       }
       print(fmt, ...args) {
-        this.stream.write(import_chalk8.default.reset((0, import_util24.format)(fmt, ...args)) + "\n");
+        this.stream.write(import_chalk7.default.reset((0, import_util24.format)(fmt, ...args)) + "\n");
       }
       warning(fmt, ...args) {
-        this.stream.write(import_chalk8.default.yellow((0, import_util24.format)(fmt, ...args)) + "\n");
+        this.stream.write(import_chalk7.default.yellow((0, import_util24.format)(fmt, ...args)) + "\n");
       }
       formatSection(title, entryType, collection, formatter = this.formatDifference.bind(this)) {
         if (collection.differenceCount === 0) {
@@ -106303,7 +106005,7 @@ var init_format = __esm({
         this.printSectionFooter();
       }
       printSectionHeader(title) {
-        this.print(import_chalk8.default.underline(import_chalk8.default.bold(title)));
+        this.print(import_chalk7.default.underline(import_chalk7.default.bold(title)));
       }
       printSectionFooter() {
         this.print("");
@@ -106319,8 +106021,8 @@ var init_format = __esm({
           return;
         }
         let value2;
-        const oldValue = this.formatValue(diff.oldValue, import_chalk8.default.red);
-        const newValue = this.formatValue(diff.newValue, import_chalk8.default.green);
+        const oldValue = this.formatValue(diff.oldValue, import_chalk7.default.red);
+        const newValue = this.formatValue(diff.newValue, import_chalk7.default.green);
         if (diff.isAddition) {
           value2 = newValue;
         } else if (diff.isUpdate) {
@@ -106328,7 +106030,7 @@ var init_format = __esm({
         } else if (diff.isRemoval) {
           value2 = oldValue;
         }
-        this.print(`${this.formatPrefix(diff)} ${import_chalk8.default.cyan(type)} ${this.formatLogicalId(logicalId)}: ${value2}`);
+        this.print(`${this.formatPrefix(diff)} ${import_chalk7.default.cyan(type)} ${this.formatLogicalId(logicalId)}: ${value2}`);
       }
       /**
        * Print a resource difference for a given logical ID.
@@ -106351,7 +106053,7 @@ var init_format = __esm({
         const resourceType = diff.isRemoval ? diff.oldResourceType : diff.newResourceType;
         const message2 = [
           this.formatResourcePrefix(diff),
-          this.formatValue(resourceType, import_chalk8.default.cyan),
+          this.formatValue(resourceType, import_chalk7.default.cyan),
           this.formatLogicalId(logicalId),
           this.formatImpact(diff.changeImpact),
           this.formatMove(diff.move)
@@ -106382,7 +106084,7 @@ var init_format = __esm({
         if (diff.isRemoval) {
           return REMOVAL2;
         }
-        return import_chalk8.default.reset("[?]");
+        return import_chalk7.default.reset("[?]");
       }
       /**
        * @param value - the value to be formatted.
@@ -106406,15 +106108,15 @@ var init_format = __esm({
       formatImpact(impact) {
         switch (impact) {
           case "MAY_REPLACE" /* MAY_REPLACE */:
-            return import_chalk8.default.italic(import_chalk8.default.yellow("may be replaced"));
+            return import_chalk7.default.italic(import_chalk7.default.yellow("may be replaced"));
           case "WILL_REPLACE" /* WILL_REPLACE */:
-            return import_chalk8.default.italic(import_chalk8.default.bold(import_chalk8.default.red("replace")));
+            return import_chalk7.default.italic(import_chalk7.default.bold(import_chalk7.default.red("replace")));
           case "WILL_DESTROY" /* WILL_DESTROY */:
-            return import_chalk8.default.italic(import_chalk8.default.bold(import_chalk8.default.red("destroy")));
+            return import_chalk7.default.italic(import_chalk7.default.bold(import_chalk7.default.red("destroy")));
           case "WILL_ORPHAN" /* WILL_ORPHAN */:
-            return import_chalk8.default.italic(import_chalk8.default.yellow("orphan"));
+            return import_chalk7.default.italic(import_chalk7.default.yellow("orphan"));
           case "WILL_IMPORT" /* WILL_IMPORT */:
-            return import_chalk8.default.italic(import_chalk8.default.blue("import"));
+            return import_chalk7.default.italic(import_chalk7.default.blue("import"));
           case "WILL_UPDATE" /* WILL_UPDATE */:
           case "WILL_CREATE" /* WILL_CREATE */:
           case "NO_CHANGE" /* NO_CHANGE */:
@@ -106422,7 +106124,7 @@ var init_format = __esm({
         }
       }
       formatMove(move) {
-        return !move ? "" : import_chalk8.default.yellow("(OR", import_chalk8.default.italic(import_chalk8.default.bold("move")), `${move.direction} ${move.stackName}.${move.resourceLogicalId} via refactoring)`);
+        return !move ? "" : import_chalk7.default.yellow("(OR", import_chalk7.default.italic(import_chalk7.default.bold("move")), `${move.direction} ${move.stackName}.${move.resourceLogicalId} via refactoring)`);
       }
       /**
        * Renders a tree of differences under a particular name.
@@ -106461,13 +106163,13 @@ var init_format = __esm({
                 this.print("%s   %s %s", linePrefix, i6 === 0 ? "\u2514\u2500" : "  ", diff[i6]);
               }
             } else {
-              this.print("%s   \u251C\u2500 %s %s", linePrefix, REMOVAL2, this.formatValue(oldObject, import_chalk8.default.red));
-              this.print("%s   \u2514\u2500 %s %s", linePrefix, ADDITION2, this.formatValue(newObject, import_chalk8.default.green));
+              this.print("%s   \u251C\u2500 %s %s", linePrefix, REMOVAL2, this.formatValue(oldObject, import_chalk7.default.red));
+              this.print("%s   \u2514\u2500 %s %s", linePrefix, ADDITION2, this.formatValue(newObject, import_chalk7.default.green));
             }
           } else if (oldObject !== void 0) {
-            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(oldObject, import_chalk8.default.red));
+            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(oldObject, import_chalk7.default.red));
           } else {
-            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(newObject, import_chalk8.default.green));
+            this.print("%s   \u2514\u2500 %s", linePrefix, this.formatValue(newObject, import_chalk7.default.green));
           }
           return;
         }
@@ -106480,12 +106182,12 @@ var init_format = __esm({
           const newValue = newObject[key];
           const treePrefix = key === lastKey ? "\u2514" : "\u251C";
           if (oldValue !== void 0 && newValue !== void 0) {
-            this.print("%s   %s\u2500 %s %s:", linePrefix, treePrefix, this.changeTag(oldValue, newValue), import_chalk8.default.blue(`.${key}`));
+            this.print("%s   %s\u2500 %s %s:", linePrefix, treePrefix, this.changeTag(oldValue, newValue), import_chalk7.default.blue(`.${key}`));
             this.formatObjectDiff(oldValue, newValue, `${linePrefix}   ${key === lastKey ? " " : "\u2502"}`);
           } else if (oldValue !== void 0) {
-            this.print("%s   %s\u2500 %s Removed: %s", linePrefix, treePrefix, REMOVAL2, import_chalk8.default.blue(`.${key}`));
+            this.print("%s   %s\u2500 %s Removed: %s", linePrefix, treePrefix, REMOVAL2, import_chalk7.default.blue(`.${key}`));
           } else {
-            this.print("%s   %s\u2500 %s Added: %s", linePrefix, treePrefix, ADDITION2, import_chalk8.default.blue(`.${key}`));
+            this.print("%s   %s\u2500 %s Added: %s", linePrefix, treePrefix, ADDITION2, import_chalk7.default.blue(`.${key}`));
           }
         }
       }
@@ -106529,7 +106231,7 @@ var init_format = __esm({
       formatLogicalId(logicalId) {
         const normalized = this.normalizedLogicalIdPath(logicalId);
         if (normalized) {
-          return `${normalized} ${import_chalk8.default.gray(logicalId)}`;
+          return `${normalized} ${import_chalk7.default.gray(logicalId)}`;
         }
         return logicalId;
       }
@@ -106621,7 +106323,7 @@ function formatTypedMappings(stream, mappings) {
     const rows = mappings.map((m4) => [m4.type, m4.sourcePath, m4.destinationPath]);
     const formatter = new Formatter(stream, {});
     formatter.print("The following resources were moved or renamed:");
-    formatter.print(import_chalk9.default.green(formatTable(header.concat(rows), void 0)));
+    formatter.print(import_chalk8.default.green(formatTable(header.concat(rows), void 0)));
     formatter.print(" ");
   }
 }
@@ -106631,18 +106333,18 @@ function formatAmbiguousMappings(stream, pairs) {
   formatter.print("Detected ambiguities:");
   formatter.print(tables.join("\n\n"));
   formatter.print(" ");
-  formatter.print(import_chalk9.default.yellow("Please provide an override file to resolve these ambiguous mappings."));
+  formatter.print(import_chalk8.default.yellow("Please provide an override file to resolve these ambiguous mappings."));
   formatter.print(" ");
   function renderTable2([removed, added]) {
     return formatTable([["", "Resource"], renderRemoval(removed), renderAddition(added)], void 0);
   }
   __name(renderTable2, "renderTable");
   function renderRemoval(locations) {
-    return [import_chalk9.default.red("-"), import_chalk9.default.red(renderLocations(locations))];
+    return [import_chalk8.default.red("-"), import_chalk8.default.red(renderLocations(locations))];
   }
   __name(renderRemoval, "renderRemoval");
   function renderAddition(locations) {
-    return [import_chalk9.default.green("+"), import_chalk9.default.green(renderLocations(locations))];
+    return [import_chalk8.default.green("+"), import_chalk8.default.green(renderLocations(locations))];
   }
   __name(renderAddition, "renderAddition");
   function renderLocations(locs) {
@@ -106650,11 +106352,11 @@ function formatAmbiguousMappings(stream, pairs) {
   }
   __name(renderLocations, "renderLocations");
 }
-var import_chalk9;
+var import_chalk8;
 var init_mappings = __esm({
   "../@aws-cdk/cloudformation-diff/lib/mappings.ts"() {
     "use strict";
-    import_chalk9 = __toESM(require_source());
+    import_chalk8 = __toESM(require_source());
     init_format();
     init_format_table();
     __name(formatEnvironmentSectionHeader, "formatEnvironmentSectionHeader");
@@ -106700,6 +106402,306 @@ var require_lib9 = __commonJS({
   }
 });
 
+// ../@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts
+async function addMetadataAssetsToManifest(ioHelper, stack, assetManifest, envResources, reuse) {
+  reuse = reuse || [];
+  const assets = stack.assets;
+  if (assets.length === 0) {
+    return {};
+  }
+  const toolkitInfo = await envResources.lookupToolkit();
+  if (!toolkitInfo.found) {
+    throw new ToolkitError("BootstrapStackRequired", `This stack uses assets, so the toolkit stack must be deployed to the environment (Run "${import_chalk9.default.blue("cdk bootstrap " + stack.environment.name)}")`);
+  }
+  const params = {};
+  for (const asset of assets) {
+    const reuseAsset = reuse.indexOf(asset.id) > -1;
+    if (reuseAsset) {
+      await ioHelper.defaults.debug(`Reusing asset ${asset.id}: ${JSON.stringify(asset)}`);
+      continue;
+    }
+    await ioHelper.defaults.debug(`Preparing asset ${asset.id}: ${JSON.stringify(asset)}`);
+    if (!stack.assembly) {
+      throw new ToolkitError("AssemblyRequired", "Unexpected: stack assembly is required in order to find assets in assembly directory");
+    }
+    Object.assign(params, await prepareAsset(ioHelper, asset, assetManifest, envResources, toolkitInfo));
+  }
+  return params;
+}
+async function prepareAsset(ioHelper, asset, assetManifest, envResources, toolkitInfo) {
+  switch (asset.packaging) {
+    case "zip":
+    case "file":
+      return prepareFileAsset(
+        ioHelper,
+        asset,
+        assetManifest,
+        toolkitInfo,
+        asset.packaging === "zip" ? cxschema8.FileAssetPackaging.ZIP_DIRECTORY : cxschema8.FileAssetPackaging.FILE
+      );
+    case "container-image":
+      return prepareDockerImageAsset(asset, assetManifest, envResources);
+    default:
+      throw new ToolkitError("UnsupportedPackaging", `Unsupported packaging type: ${asset.packaging}. You might need to upgrade your aws-cdk toolkit to support this asset type.`);
+  }
+}
+async function prepareFileAsset(ioHelper, asset, assetManifest, toolkitInfo, packaging) {
+  const extension = packaging === cxschema8.FileAssetPackaging.ZIP_DIRECTORY ? ".zip" : path18.extname(asset.path);
+  const baseName = `${asset.sourceHash}${extension}`;
+  const s3Prefix = asset.id === asset.sourceHash ? "assets/" : `assets/${asset.id}/`;
+  const key = `${s3Prefix}${baseName}`;
+  const s3url = `s3://${toolkitInfo.bucketName}/${key}`;
+  await ioHelper.defaults.debug(`Storing asset ${asset.path} at ${s3url}`);
+  assetManifest.addFileAsset(asset.sourceHash, {
+    path: asset.path,
+    packaging
+  }, {
+    bucketName: toolkitInfo.bucketName,
+    objectKey: key
+  });
+  return {
+    [asset.s3BucketParameter]: toolkitInfo.bucketName,
+    [asset.s3KeyParameter]: `${s3Prefix}${cxapi3.ASSET_PREFIX_SEPARATOR}${baseName}`,
+    [asset.artifactHashParameter]: asset.sourceHash
+  };
+}
+async function prepareDockerImageAsset(asset, assetManifest, envResources) {
+  if (!asset.imageNameParameter && (!asset.repositoryName || !asset.imageTag)) {
+    throw new ToolkitError("InvalidDockerAssetConfig", 'Invalid Docker image asset configuration: "repositoryName" and "imageTag" are required when "imageNameParameter" is left out');
+  }
+  const repositoryName = asset.repositoryName ?? "cdk/" + asset.id.replace(/[:/]/g, "-").toLowerCase();
+  const { repositoryUri: repositoryUri2 } = await envResources.prepareEcrRepository(repositoryName);
+  const imageTag = asset.imageTag ?? asset.sourceHash;
+  assetManifest.addDockerImageAsset(asset.sourceHash, {
+    directory: asset.path,
+    dockerBuildArgs: asset.buildArgs,
+    dockerBuildSecrets: asset.buildSecrets,
+    dockerBuildSsh: asset.buildSsh,
+    dockerBuildTarget: asset.target,
+    dockerFile: asset.file,
+    networkMode: asset.networkMode,
+    platform: asset.platform,
+    dockerOutputs: asset.outputs
+  }, {
+    repositoryName,
+    imageTag
+  });
+  if (!asset.imageNameParameter) {
+    return {};
+  }
+  return { [asset.imageNameParameter]: `${repositoryUri2}:${imageTag}` };
+}
+var path18, cxapi3, cxschema8, import_chalk9;
+var init_assets3 = __esm({
+  "../@aws-cdk/toolkit-lib/lib/api/deployments/assets.ts"() {
+    "use strict";
+    path18 = __toESM(require("path"));
+    cxapi3 = __toESM(require_lib3());
+    cxschema8 = __toESM(require_lib2());
+    import_chalk9 = __toESM(require_source());
+    init_toolkit_error();
+    __name(addMetadataAssetsToManifest, "addMetadataAssetsToManifest");
+    __name(prepareAsset, "prepareAsset");
+    __name(prepareFileAsset, "prepareFileAsset");
+    __name(prepareDockerImageAsset, "prepareDockerImageAsset");
+  }
+});
+
+// ../@aws-cdk/toolkit-lib/lib/actions/deploy/private/deployment-method.ts
+function isChangeSetDeployment(method) {
+  return method?.method === "change-set";
+}
+function isExecutingChangeSetDeployment(method) {
+  return isChangeSetDeployment(method) && (method.execute ?? true);
+}
+function isNonExecutingChangeSetDeployment(method) {
+  return isChangeSetDeployment(method) && method.execute === false;
+}
+function isExecuteChangeSetDeployment(method) {
+  return method?.method === "execute-change-set";
+}
+function toExecuteChangeSetDeployment(method) {
+  return {
+    method: "execute-change-set",
+    changeSetName: method.changeSetName ?? DEFAULT_DEPLOY_CHANGE_SET_NAME
+  };
+}
+var DEFAULT_DEPLOY_CHANGE_SET_NAME;
+var init_deployment_method = __esm({
+  "../@aws-cdk/toolkit-lib/lib/actions/deploy/private/deployment-method.ts"() {
+    "use strict";
+    DEFAULT_DEPLOY_CHANGE_SET_NAME = "cdk-deploy-change-set";
+    __name(isChangeSetDeployment, "isChangeSetDeployment");
+    __name(isExecutingChangeSetDeployment, "isExecutingChangeSetDeployment");
+    __name(isNonExecutingChangeSetDeployment, "isNonExecutingChangeSetDeployment");
+    __name(isExecuteChangeSetDeployment, "isExecuteChangeSetDeployment");
+    __name(toExecuteChangeSetDeployment, "toExecuteChangeSetDeployment");
+  }
+});
+
+// ../@aws-cdk/toolkit-lib/lib/payloads/hotswap.ts
+var NonHotswappableReason;
+var init_hotswap = __esm({
+  "../@aws-cdk/toolkit-lib/lib/payloads/hotswap.ts"() {
+    "use strict";
+    NonHotswappableReason = /* @__PURE__ */ ((NonHotswappableReason2) => {
+      NonHotswappableReason2["TAGS"] = "tags";
+      NonHotswappableReason2["PROPERTIES"] = "properties";
+      NonHotswappableReason2["OUTPUT"] = "output";
+      NonHotswappableReason2["DEPENDENCY_UNSUPPORTED"] = "dependency-unsupported";
+      NonHotswappableReason2["RESOURCE_UNSUPPORTED"] = "resource-unsupported";
+      NonHotswappableReason2["RESOURCE_CREATION"] = "resource-creation";
+      NonHotswappableReason2["RESOURCE_DELETION"] = "resource-deletion";
+      NonHotswappableReason2["RESOURCE_TYPE_CHANGED"] = "resource-type-changed";
+      NonHotswappableReason2["NESTED_STACK_CREATION"] = "nested-stack-creation";
+      return NonHotswappableReason2;
+    })(NonHotswappableReason || {});
+  }
+});
+
+// ../@aws-cdk/toolkit-lib/lib/api/hotswap/common.ts
+function createHotswapPropertyOverrides(props) {
+  return new HotswapPropertyOverrides(new EcsHotswapProperties(
+    props.ecs?.minimumHealthyPercent,
+    props.ecs?.maximumHealthyPercent,
+    props.ecs?.stabilizationTimeoutSeconds
+  ));
+}
+function classifyChanges(xs, hotswappablePropNames) {
+  const hotswappableProps = {};
+  const nonHotswappableProps = {};
+  for (const [name, propDiff] of Object.entries(xs.propertyUpdates)) {
+    if (hotswappablePropNames.includes(name)) {
+      hotswappableProps[name] = propDiff;
+    } else {
+      nonHotswappableProps[name] = propDiff;
+    }
+  }
+  return new ClassifiedChanges(xs, hotswappableProps, nonHotswappableProps);
+}
+function nonHotswappableChange(change, reason, description, nonHotswappableProps, hotswapOnlyVisible = true) {
+  return {
+    hotswappable: false,
+    hotswapOnlyVisible,
+    change: {
+      reason,
+      description,
+      subject: {
+        type: "Resource",
+        logicalId: change.logicalId,
+        resourceType: change.newValue.Type,
+        rejectedProperties: Object.keys(nonHotswappableProps ?? change.propertyUpdates),
+        metadata: change.metadata
+      }
+    }
+  };
+}
+function nonHotswappableResource(change) {
+  return {
+    hotswappable: false,
+    change: {
+      reason: "resource-unsupported" /* RESOURCE_UNSUPPORTED */,
+      description: "This resource type is not supported for hotswap deployments",
+      subject: {
+        type: "Resource",
+        logicalId: change.logicalId,
+        resourceType: change.newValue.Type,
+        rejectedProperties: Object.keys(change.propertyUpdates),
+        metadata: change.metadata
+      }
+    }
+  };
+}
+var ICON, HotswapPropertyOverrides, EcsHotswapProperties, ClassifiedChanges;
+var init_common3 = __esm({
+  "../@aws-cdk/toolkit-lib/lib/api/hotswap/common.ts"() {
+    "use strict";
+    init_hotswap();
+    init_toolkit_error();
+    ICON = "\u2728";
+    HotswapPropertyOverrides = class {
+      static {
+        __name(this, "HotswapPropertyOverrides");
+      }
+      // Each supported resource type will have its own properties. Currently this is ECS
+      ecs;
+      constructor(ecs) {
+        this.ecs = ecs;
+      }
+    };
+    EcsHotswapProperties = class {
+      static {
+        __name(this, "EcsHotswapProperties");
+      }
+      // The lower limit on the number of your service's tasks that must remain in the RUNNING state during a deployment, as a percentage of the desiredCount
+      minimumHealthyPercent;
+      // The upper limit on the number of your service's tasks that are allowed in the RUNNING or PENDING state during a deployment, as a percentage of the desiredCount
+      maximumHealthyPercent;
+      // The number of seconds to wait for a single service to reach stable state.
+      stabilizationTimeoutSeconds;
+      constructor(minimumHealthyPercent, maximumHealthyPercent, stabilizationTimeoutSeconds) {
+        if (minimumHealthyPercent !== void 0 && minimumHealthyPercent < 0) {
+          throw new ToolkitError("InvalidEcsMinHealthyPercent", "hotswap-ecs-minimum-healthy-percent can't be a negative number");
+        }
+        if (maximumHealthyPercent !== void 0 && maximumHealthyPercent < 0) {
+          throw new ToolkitError("InvalidEcsMaxHealthyPercent", "hotswap-ecs-maximum-healthy-percent can't be a negative number");
+        }
+        if (stabilizationTimeoutSeconds !== void 0 && stabilizationTimeoutSeconds < 0) {
+          throw new ToolkitError("InvalidEcsStabilizationTimeout", "hotswap-ecs-stabilization-timeout-seconds can't be a negative number");
+        }
+        if (minimumHealthyPercent == void 0) {
+          this.minimumHealthyPercent = 0;
+        } else {
+          this.minimumHealthyPercent = minimumHealthyPercent;
+        }
+        this.maximumHealthyPercent = maximumHealthyPercent;
+        this.stabilizationTimeoutSeconds = stabilizationTimeoutSeconds;
+      }
+      /**
+       * Check if any hotswap properties are defined
+       * @returns true if all properties are undefined, false otherwise
+       */
+      isEmpty() {
+        return this.minimumHealthyPercent === 0 && this.maximumHealthyPercent === void 0;
+      }
+    };
+    __name(createHotswapPropertyOverrides, "createHotswapPropertyOverrides");
+    ClassifiedChanges = class {
+      constructor(change, hotswappableProps, nonHotswappableProps) {
+        this.change = change;
+        this.hotswappableProps = hotswappableProps;
+        this.nonHotswappableProps = nonHotswappableProps;
+      }
+      change;
+      hotswappableProps;
+      nonHotswappableProps;
+      static {
+        __name(this, "ClassifiedChanges");
+      }
+      reportNonHotswappablePropertyChanges(ret) {
+        const nonHotswappablePropNames = Object.keys(this.nonHotswappableProps);
+        if (nonHotswappablePropNames.length > 0) {
+          const tagOnlyChange = nonHotswappablePropNames.length === 1 && nonHotswappablePropNames[0] === "Tags";
+          const reason = tagOnlyChange ? "tags" /* TAGS */ : "properties" /* PROPERTIES */;
+          const description = tagOnlyChange ? "Tags are not hotswappable" : `resource properties '${nonHotswappablePropNames}' are not hotswappable on this resource type`;
+          ret.push(nonHotswappableChange(
+            this.change,
+            reason,
+            description,
+            this.nonHotswappableProps
+          ));
+        }
+      }
+      get namesOfHotswappableProps() {
+        return Object.keys(this.hotswappableProps);
+      }
+    };
+    __name(classifyChanges, "classifyChanges");
+    __name(nonHotswappableChange, "nonHotswappableChange");
+    __name(nonHotswappableResource, "nonHotswappableResource");
+  }
+});
+
 // ../@aws-cdk/toolkit-lib/lib/payloads/bootstrap-environment-progress.ts
 var init_bootstrap_environment_progress = __esm({
   "../@aws-cdk/toolkit-lib/lib/payloads/bootstrap-environment-progress.ts"() {
@@ -108639,6 +108641,15 @@ async function canSkipDeploy(deployStackOptions, cloudFormationStack, parameterC
     await ioHelper.defaults.debug(`${deployName}: stack is in a failure state`);
     return false;
   }
+  const hotswapCache = await readHotswapTemplateCache(
+    deployStackOptions.stack.assembly.directory,
+    deployStackOptions.stack.stackName,
+    deployStackOptions.stack.template
+  );
+  if (hotswapCache && (0, import_cloudformation_diff.diffTemplate)(hotswapCache.deployedRootTemplate, deployStackOptions.stack.template).differenceCount > 0) {
+    await ioHelper.defaults.debug(`${deployName}: template has changed in relation to last successful hotswap deployment`);
+    return false;
+  }
   return true;
 }
 function compareTags(a6, b6) {
@@ -108665,12 +108676,13 @@ function hasReplacement(report) {
     return a6 === "ReplaceAndDelete" || a6 === "ReplaceAndRetain" || a6 === "ReplaceAndSnapshot";
   });
 }
-var import_node_crypto10, import_node_util3, import_chalk11, FullCloudFormationDeployment;
+var import_node_crypto10, import_node_util3, import_cloudformation_diff, import_chalk11, FullCloudFormationDeployment;
 var init_deploy_stack = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/deployments/deploy-stack.ts"() {
     "use strict";
     import_node_crypto10 = require("node:crypto");
     import_node_util3 = require("node:util");
+    import_cloudformation_diff = __toESM(require_lib9());
     import_chalk11 = __toESM(require_source());
     init_asset_manifest_builder();
     init_asset_publishing();
@@ -108775,10 +108787,12 @@ var init_deploy_stack = __esm({
           };
         }
         if (!execute2) {
-          await this.ioHelper.defaults.info((0, import_node_util3.format)(
-            "Changeset %s created and waiting in review for manual execution (--no-execute)",
-            changeSetDescription.ChangeSetId
-          ));
+          if (!this.options.willExecuteChangeSet) {
+            await this.ioHelper.defaults.info((0, import_node_util3.format)(
+              "Changeset %s created and waiting in review for manual execution (--no-execute)",
+              changeSetDescription.ChangeSetId
+            ));
+          }
           return {
             type: "did-deploy-stack",
             noOp: false,
@@ -110388,6 +110402,7 @@ var init_deployments = __esm({
           envResources: env3.resources,
           tags: options.tags,
           deploymentMethod: options.deploymentMethod,
+          willExecuteChangeSet: options.willExecuteChangeSet,
           forceDeployment: options.forceDeployment,
           parameters: options.parameters,
           usePreviousParameters: options.usePreviousParameters,
@@ -110422,7 +110437,7 @@ var init_deployments = __esm({
         if (result2.type !== "did-deploy-stack") {
           return void 0;
         }
-        if (result2.noOp && options.cleanupOnNoOp) {
+        if (result2.noOp && options.willExecuteChangeSet) {
           const changeSetName = options.deploymentMethod.changeSetName ?? DEFAULT_DEPLOY_CHANGE_SET_NAME;
           await this.cleanupChangeSet(options.stack, changeSetName, options.stackEventPollingInterval);
         }
@@ -291011,12 +291026,12 @@ function obscureDiff(diff) {
     });
   }
 }
-var import_node_util6, import_cloudformation_diff, import_chalk15, DiffFormatter;
+var import_node_util6, import_cloudformation_diff2, import_chalk15, DiffFormatter;
 var init_diff_formatter = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/diff/diff-formatter.ts"() {
     "use strict";
     import_node_util6 = require("node:util");
-    import_cloudformation_diff = __toESM(require_lib9());
+    import_cloudformation_diff2 = __toESM(require_lib9());
     import_chalk15 = __toESM(require_source());
     init_payloads();
     init_logical_id_map();
@@ -291053,7 +291068,7 @@ var init_diff_formatter = __esm({
        */
       computeDiff(stackName, oldTemplate, newTemplate, changeSet, mappings) {
         if (!this.cache.has(stackName)) {
-          const templateDiff = (0, import_cloudformation_diff.fullDiff)(oldTemplate, newTemplate, changeSet, this.isImport);
+          const templateDiff = (0, import_cloudformation_diff2.fullDiff)(oldTemplate, newTemplate, changeSet, this.isImport);
           const setMove = /* @__PURE__ */ __name((change, direction, location) => {
             if (location != null) {
               const [sourceStackName, sourceLogicalId] = location.split(".");
@@ -291107,8 +291122,8 @@ var init_diff_formatter = __esm({
           }
           let activeDiff = diff;
           if (diff.differenceCount && !options.strict) {
-            const mangledNewTemplate = JSON.parse((0, import_cloudformation_diff.mangleLikeCloudFormation)(JSON.stringify(newTemplate)));
-            const mangledDiff = (0, import_cloudformation_diff.fullDiff)(oldTemplate, mangledNewTemplate, changeSet);
+            const mangledNewTemplate = JSON.parse((0, import_cloudformation_diff2.mangleLikeCloudFormation)(JSON.stringify(newTemplate)));
+            const mangledDiff = (0, import_cloudformation_diff2.fullDiff)(oldTemplate, mangledNewTemplate, changeSet);
             filteredChangesCount = Math.max(0, diff.differenceCount - mangledDiff.differenceCount);
             if (filteredChangesCount > 0) {
               activeDiff = mangledDiff;
@@ -291121,7 +291136,7 @@ var init_diff_formatter = __esm({
           const metadataWasFiltered = diffWasNonEmpty && activeDiff.isEmpty;
           if (!activeDiff.isEmpty) {
             numStacksWithChanges++;
-            (0, import_cloudformation_diff.formatDifferences)(stream, activeDiff, {
+            (0, import_cloudformation_diff2.formatDifferences)(stream, activeDiff, {
               ...logicalIdMapFromTemplate(oldTemplate),
               ...logicalIdMapFromTemplate(newTemplate),
               ...logicalIdMap
@@ -291178,7 +291193,7 @@ var init_diff_formatter = __esm({
 `));
         }
         try {
-          (0, import_cloudformation_diff.formatSecurityChanges)(stream, diff, {
+          (0, import_cloudformation_diff2.formatSecurityChanges)(stream, diff, {
             ...logicalIdMapFromTemplate(newTemplate),
             ...logicalIdMap
           });
@@ -297452,13 +297467,13 @@ async function listStacks(sdkProvider, environment) {
 }
 function formatEnvironmentSectionHeader2(environment) {
   const env3 = `aws://${environment.account}/${environment.region}`;
-  return formatToStream((stream) => (0, import_cloudformation_diff2.formatEnvironmentSectionHeader)(stream, env3));
+  return formatToStream((stream) => (0, import_cloudformation_diff3.formatEnvironmentSectionHeader)(stream, env3));
 }
 function formatTypedMappings2(mappings) {
-  return formatToStream((stream) => (0, import_cloudformation_diff2.formatTypedMappings)(stream, mappings));
+  return formatToStream((stream) => (0, import_cloudformation_diff3.formatTypedMappings)(stream, mappings));
 }
 function formatAmbiguousMappings2(paths) {
-  return formatToStream((stream) => (0, import_cloudformation_diff2.formatAmbiguousMappings)(stream, paths));
+  return formatToStream((stream) => (0, import_cloudformation_diff3.formatAmbiguousMappings)(stream, paths));
 }
 function formatToStream(cb) {
   const stream = new StringWriteStream();
@@ -297493,11 +297508,11 @@ async function groupStacks(sdkProvider, localStacks, additionalStackNames) {
   }
   return groups;
 }
-var import_cloudformation_diff2;
+var import_cloudformation_diff3;
 var init_refactoring = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/refactoring/index.ts"() {
     "use strict";
-    import_cloudformation_diff2 = __toESM(require_lib9());
+    import_cloudformation_diff3 = __toESM(require_lib9());
     init_util4();
     init_plugin2();
     init_streams();
@@ -297813,12 +297828,12 @@ var init_tags2 = __esm({
 });
 
 // ../@aws-cdk/toolkit-lib/lib/api/drift/drift-formatter.ts
-var import_node_util7, import_cloudformation_diff3, import_client_cloudformation7, import_chalk24, DriftFormatter, ADDITION3, CONTEXT2, UPDATE3, REMOVAL3;
+var import_node_util7, import_cloudformation_diff4, import_client_cloudformation7, import_chalk24, DriftFormatter, ADDITION3, CONTEXT2, UPDATE3, REMOVAL3;
 var init_drift_formatter = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/drift/drift-formatter.ts"() {
     "use strict";
     import_node_util7 = require("node:util");
-    import_cloudformation_diff3 = __toESM(require_lib9());
+    import_cloudformation_diff4 = __toESM(require_lib9());
     import_client_cloudformation7 = __toESM(require_dist_cjs25());
     import_chalk24 = __toESM(require_source());
     init_logical_id_map();
@@ -297924,7 +297939,7 @@ ${actualDrifts.length} resource${actualDrifts.length === 1 ? "" : "s"} ${actualD
               for (let i6 = 0; i6 < propDiffs.length; i6++) {
                 const diff = propDiffs[i6];
                 if (!diff.PropertyPath) continue;
-                const difference2 = new import_cloudformation_diff3.Difference(diff.ExpectedValue, diff.ActualValue);
+                const difference2 = new import_cloudformation_diff4.Difference(diff.ExpectedValue, diff.ActualValue);
                 modified += this.formatTreeDiff(diff.PropertyPath, difference2, i6 === propDiffs.length - 1);
               }
             }
@@ -299329,7 +299344,7 @@ var init_toolkit = __esm({
           const prepareResult = isChangeSetDeployment(options.deploymentMethod) ? await deployments.prepareStack({
             ...sharedDeployOptions,
             deploymentMethod: options.deploymentMethod,
-            cleanupOnNoOp: isExecutingChangeSetDeployment(options.deploymentMethod)
+            willExecuteChangeSet: isExecutingChangeSetDeployment(options.deploymentMethod)
           }) : void 0;
           if (!prepareResult?.noOp) {
             const diffChangeSet = isExecuteChangeSetDeployment(options.deploymentMethod) ? (await deployments.describeChangeSet(stack, options.deploymentMethod.changeSetName, prepareResult?.stackArn)).changeSet : prepareResult?.changeSet;
@@ -308985,13 +309000,13 @@ function effectiveValue(flag) {
 function defaultValue(flag) {
   return flag.unconfiguredBehavesLike?.v2 ?? false;
 }
-var os13, path45, import_cloudformation_diff4, import_toolkit_lib17, import_chalk32, fs48, import_p_queue, FlagOperations;
+var os13, path45, import_cloudformation_diff5, import_toolkit_lib17, import_chalk32, fs48, import_p_queue, FlagOperations;
 var init_operations = __esm({
   "lib/commands/flags/operations.ts"() {
     "use strict";
     os13 = __toESM(require("os"));
     path45 = __toESM(require("path"));
-    import_cloudformation_diff4 = __toESM(require_lib9());
+    import_cloudformation_diff5 = __toESM(require_lib9());
     import_toolkit_lib17 = __toESM(require_lib12());
     import_chalk32 = __toESM(require_source());
     fs48 = __toESM(require_lib4());
@@ -309391,7 +309406,7 @@ var init_operations = __esm({
             String(effectiveValue(flag))
           ]);
         });
-        const formattedTable = (0, import_cloudformation_diff4.formatTable)(rows, void 0, true);
+        const formattedTable = (0, import_cloudformation_diff5.formatTable)(rows, void 0, true);
         await this.ioHelper.defaults.info(formattedTable);
       }
       /** Checks if a flag has a boolean recommended value */
@@ -310650,7 +310665,7 @@ Do you wish to deploy these changes?`;
         const prepareResult = isChangeSetDeployment(this.options.deploymentMethod) ? await this.deployments.prepareStack({
           ...sharedDeployOptions,
           deploymentMethod: this.options.deploymentMethod,
-          cleanupOnNoOp: isExecutingChangeSetDeployment(this.options.deploymentMethod)
+          willExecuteChangeSet: isExecutingChangeSetDeployment(this.options.deploymentMethod)
         }) : void 0;
         if (this.options.requireApproval !== import_cloud_assembly_schema9.RequireApproval.NEVER && !prepareResult?.noOp) {
           const currentTemplate = await this.deployments.readCurrentTemplate(stack);