@aws-cdk/integ-runner 2.204.3 → 2.204.4

package/lib/workers/extract/index.js

@@ -4766,7 +4766,7 @@ var require_semver2 = __commonJS({
 // ../cloud-assembly-schema/cli-version.json
 var require_cli_version = __commonJS({
   "../cloud-assembly-schema/cli-version.json"(exports2, module2) {
-    module2.exports = { version: "2.1136.0" };
+    module2.exports = { version: "2.1137.0" };
   }
 });
 
@@ -274641,28 +274641,30 @@ async function createChangeSetAndCleanup(ioHelper, options) {
     Capabilities: ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
   });
   await ioHelper.defaults.debug((0, import_node_util3.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_util3.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_util3.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_util3.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);
@@ -293854,6 +293856,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) {
@@ -293880,12 +293891,13 @@ function hasReplacement(report) {
     return a6 === "ReplaceAndDelete" || a6 === "ReplaceAndRetain" || a6 === "ReplaceAndSnapshot";
   });
 }
-var import_node_crypto10, import_node_util5, import_chalk17, FullCloudFormationDeployment;
+var import_node_crypto10, import_node_util5, import_cloudformation_diff, import_chalk17, FullCloudFormationDeployment;
 var init_deploy_stack = __esm({
   "../toolkit-lib/lib/api/deployments/deploy-stack.ts"() {
     "use strict";
     import_node_crypto10 = require("node:crypto");
     import_node_util5 = require("node:util");
+    import_cloudformation_diff = __toESM(require_lib10());
     import_chalk17 = __toESM(require_source());
     init_asset_manifest_builder();
     init_asset_publishing();
@@ -293990,10 +294002,12 @@ var init_deploy_stack = __esm({
           };
         }
         if (!execute) {
-          await this.ioHelper.defaults.info((0, import_node_util5.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_util5.format)(
+              "Changeset %s created and waiting in review for manual execution (--no-execute)",
+              changeSetDescription.ChangeSetId
+            ));
+          }
           return {
             type: "did-deploy-stack",
             noOp: false,
@@ -294367,6 +294381,7 @@ var init_deployments = __esm({
           envResources: env2.resources,
           tags: options.tags,
           deploymentMethod: options.deploymentMethod,
+          willExecuteChangeSet: options.willExecuteChangeSet,
           forceDeployment: options.forceDeployment,
           parameters: options.parameters,
           usePreviousParameters: options.usePreviousParameters,
@@ -294401,7 +294416,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);
         }
@@ -294785,12 +294800,12 @@ function obscureDiff(diff) {
     });
   }
 }
-var import_node_util6, import_cloudformation_diff, import_chalk19, DiffFormatter;
+var import_node_util6, import_cloudformation_diff2, import_chalk19, DiffFormatter;
 var init_diff_formatter = __esm({
   "../toolkit-lib/lib/api/diff/diff-formatter.ts"() {
     "use strict";
     import_node_util6 = require("node:util");
-    import_cloudformation_diff = __toESM(require_lib10());
+    import_cloudformation_diff2 = __toESM(require_lib10());
     import_chalk19 = __toESM(require_source());
     init_payloads();
     init_logical_id_map();
@@ -294827,7 +294842,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(".");
@@ -294881,8 +294896,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;
@@ -294895,7 +294910,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
@@ -294952,7 +294967,7 @@ var init_diff_formatter = __esm({
 `));
         }
         try {
-          (0, import_cloudformation_diff.formatSecurityChanges)(stream, diff, {
+          (0, import_cloudformation_diff2.formatSecurityChanges)(stream, diff, {
             ...logicalIdMapFromTemplate(newTemplate),
             ...logicalIdMap
           });
@@ -296055,13 +296070,13 @@ async function listStacks(sdkProvider, environment) {
 }
 function formatEnvironmentSectionHeader2(environment) {
   const env2 = `aws://${environment.account}/${environment.region}`;
-  return formatToStream((stream) => (0, import_cloudformation_diff2.formatEnvironmentSectionHeader)(stream, env2));
+  return formatToStream((stream) => (0, import_cloudformation_diff3.formatEnvironmentSectionHeader)(stream, env2));
 }
 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();
@@ -296096,11 +296111,11 @@ async function groupStacks(sdkProvider, localStacks, additionalStackNames) {
   }
   return groups;
 }
-var import_cloudformation_diff2;
+var import_cloudformation_diff3;
 var init_refactoring = __esm({
   "../toolkit-lib/lib/api/refactoring/index.ts"() {
     "use strict";
-    import_cloudformation_diff2 = __toESM(require_lib10());
+    import_cloudformation_diff3 = __toESM(require_lib10());
     init_util4();
     init_plugin2();
     init_streams();
@@ -298053,12 +298068,12 @@ var init_tags2 = __esm({
 });
 
 // ../toolkit-lib/lib/api/drift/drift-formatter.ts
-var import_node_util7, import_cloudformation_diff3, import_client_cloudformation7, import_chalk25, DriftFormatter, ADDITION3, CONTEXT2, UPDATE3, REMOVAL3;
+var import_node_util7, import_cloudformation_diff4, import_client_cloudformation7, import_chalk25, DriftFormatter, ADDITION3, CONTEXT2, UPDATE3, REMOVAL3;
 var init_drift_formatter = __esm({
   "../toolkit-lib/lib/api/drift/drift-formatter.ts"() {
     "use strict";
     import_node_util7 = require("node:util");
-    import_cloudformation_diff3 = __toESM(require_lib10());
+    import_cloudformation_diff4 = __toESM(require_lib10());
     import_client_cloudformation7 = __toESM(require_dist_cjs28());
     import_chalk25 = __toESM(require_source());
     init_logical_id_map();
@@ -298164,7 +298179,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);
               }
             }
@@ -299933,7 +299948,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;
@@ -331783,14 +331798,14 @@ These resources are no longer managed by CloudFormation but still exist and may
 });
 
 // lib/runner/snapshot-test-runner.ts
-var path42, import_stream, import_string_decoder, import_cloudformation_diff4, IntegSnapshotRunner, StringWritable;
+var path42, import_stream, import_string_decoder, import_cloudformation_diff5, IntegSnapshotRunner, StringWritable;
 var init_snapshot_test_runner = __esm({
   "lib/runner/snapshot-test-runner.ts"() {
     "use strict";
     path42 = __toESM(require("path"));
     import_stream = require("stream");
     import_string_decoder = require("string_decoder");
-    import_cloudformation_diff4 = __toESM(require_lib10());
+    import_cloudformation_diff5 = __toESM(require_lib10());
     init_cdk_test_app();
     init_common4();
     IntegSnapshotRunner = class {
@@ -331915,7 +331930,7 @@ var init_snapshot_test_runner = __esm({
                 actualTemplate = this.canonicalizeTemplate(actualTemplate, actual[stackId].assets);
                 expectedTemplate = this.canonicalizeTemplate(expectedTemplate, expected[stackId].assets);
               }
-              const templateDiff = (0, import_cloudformation_diff4.fullDiff)(expectedTemplate, actualTemplate);
+              const templateDiff = (0, import_cloudformation_diff5.fullDiff)(expectedTemplate, actualTemplate);
               if (!templateDiff.isEmpty) {
                 const allowedDestroyTypes = await this.getAllowedDestroyTypesForStack(actualApp, stackId) ?? [];
                 templateDiff.resources.forEachDifference((logicalId, change) => {
@@ -331925,16 +331940,16 @@ var init_snapshot_test_runner = __esm({
                   }
                   if (change.isRemoval) {
                     destructiveChanges.push({
-                      impact: import_cloudformation_diff4.ResourceImpact.WILL_DESTROY,
+                      impact: import_cloudformation_diff5.ResourceImpact.WILL_DESTROY,
                       logicalId,
                       stackName: templateId
                     });
                   } else {
                     switch (change.changeImpact) {
-                      case import_cloudformation_diff4.ResourceImpact.MAY_REPLACE:
-                      case import_cloudformation_diff4.ResourceImpact.WILL_ORPHAN:
-                      case import_cloudformation_diff4.ResourceImpact.WILL_DESTROY:
-                      case import_cloudformation_diff4.ResourceImpact.WILL_REPLACE:
+                      case import_cloudformation_diff5.ResourceImpact.MAY_REPLACE:
+                      case import_cloudformation_diff5.ResourceImpact.WILL_ORPHAN:
+                      case import_cloudformation_diff5.ResourceImpact.WILL_DESTROY:
+                      case import_cloudformation_diff5.ResourceImpact.WILL_REPLACE:
                         destructiveChanges.push({
                           impact: change.changeImpact,
                           logicalId,
@@ -331945,7 +331960,7 @@ var init_snapshot_test_runner = __esm({
                   }
                 });
                 const writable = new StringWritable({});
-                (0, import_cloudformation_diff4.formatDifferences)(writable, templateDiff);
+                (0, import_cloudformation_diff5.formatDifferences)(writable, templateDiff);
                 failures.push({
                   reason: "SNAPSHOT_FAILED" /* SNAPSHOT_FAILED */,
                   message: writable.data,

package/package.json

@@ -68,9 +68,9 @@
     "@aws-cdk/aws-service-spec": "^0.1.200",
     "@aws-cdk/cdk-assets-lib": "1.4.15",
     "@aws-cdk/cloud-assembly-api": "2.3.0",
-    "@aws-cdk/cloud-assembly-schema": ">=54.18.0",
+    "@aws-cdk/cloud-assembly-schema": ">=54.19.0",
     "@aws-cdk/cloudformation-diff": "2.187.2",
-    "@aws-cdk/toolkit-lib": "1.38.2",
+    "@aws-cdk/toolkit-lib": "1.38.3",
     "@aws-sdk/client-cloudformation": "^3",
     "chalk": "^4",
     "chokidar": "^4",
@@ -102,7 +102,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.204.3",
+  "version": "2.204.4",
   "packageManager": "yarn@4.17.1",
   "types": "lib/index.d.ts",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"yarn projen\"."