aws-cdk 2.1118.3 → 2.1119.0

package/lib/index.js

@@ -3601,7 +3601,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.1118.3" };
+    module2.exports = { version: "2.1119.0" };
   }
 });
 
@@ -4032,14 +4032,14 @@ have a unique display name. (Default - no display name)`,
                 {
                   type: "array",
                   items: {
-                    $ref: "#/definitions/Tag"
-                  }
-                },
-                {
-                  description: "Type of creation stack data",
-                  type: "array",
-                  items: {
-                    type: "string"
+                    anyOf: [
+                      {
+                        $ref: "#/definitions/Tag"
+                      },
+                      {
+                        type: "string"
+                      }
+                    ]
                   }
                 },
                 {
@@ -5638,7 +5638,7 @@ var require_integ_schema = __commonJS({
 var require_version = __commonJS({
   "../@aws-cdk/cloud-assembly-schema/schema/version.json"(exports2, module2) {
     module2.exports = {
-      schemaHash: "794dc834654646b4a60c6d8ea46ed0245a71de33e598289f6922082951768d04",
+      schemaHash: "cf2452236640f556f1b81778515335af1c6bbdb54c7ef12dad43f8cf6a56ddee",
       $comment: "Do not hold back the version on additions: jsonschema validation of the manifest by the consumer will trigger errors on unexpected fields.",
       revision: 53
     };
@@ -128243,6 +128243,7 @@ __export(cfn_api_exports, {
   stabilizeStack: () => stabilizeStack,
   uploadStackTemplateAssets: () => uploadStackTemplateAssets,
   waitForChangeSet: () => waitForChangeSet,
+  waitForChangeSetGone: () => waitForChangeSetGone,
   waitForStackDelete: () => waitForStackDelete,
   waitForStackDeploy: () => waitForStackDeploy
 });
@@ -128305,6 +128306,26 @@ async function waitForChangeSet(cfn, ioHelper, stackName, changeSetName, { fetch
   }
   return ret;
 }
+async function waitForChangeSetGone(cfn, ioHelper, stackName, changeSetName) {
+  await ioHelper.defaults.debug((0, import_util10.format)("Waiting for changeset %s on stack %s to finish deleting...", changeSetName, stackName));
+  await waitFor(async () => {
+    try {
+      const description = await cfn.describeChangeSet({
+        StackName: stackName,
+        ChangeSetName: changeSetName
+      });
+      if (description.Status === import_client_cloudformation2.ChangeSetStatus.DELETE_COMPLETE || description.Status === import_client_cloudformation2.ChangeSetStatus.DELETE_FAILED) {
+        return true;
+      }
+      return void 0;
+    } catch (e6) {
+      if (e6.name === "ChangeSetNotFoundException") {
+        return true;
+      }
+      throw e6;
+    }
+  });
+}
 async function createDiffChangeSet(ioHelper, options) {
   return uploadBodyParameterAndCreateChangeSet(ioHelper, {
     ...options,
@@ -128501,6 +128522,7 @@ var init_cfn_api = __esm({
     __name(describeChangeSet, "describeChangeSet");
     __name(waitFor, "waitFor");
     __name(waitForChangeSet, "waitForChangeSet");
+    __name(waitForChangeSetGone, "waitForChangeSetGone");
     __name(createDiffChangeSet, "createDiffChangeSet");
     __name(templatesFromAssetManifestArtifact, "templatesFromAssetManifestArtifact");
     __name(uploadBodyParameterAndCreateChangeSet, "uploadBodyParameterAndCreateChangeSet");
@@ -129004,7 +129026,7 @@ var init_filter = __esm({
             const matched = ands.map((affected) => actualComponents.filter((actual) => this.componentNameMatches(affected, actual) && semver3.satisfies(actual.version, affected.version, { includePrerelease: true })));
             if (matched.every((xs) => xs.length > 0)) {
               const ret = new FilteredNotice(notice);
-              this.addDynamicValues(matched.flatMap((x6) => x6), ret);
+              this.addDynamicValues(matched.flatMap((x6) => x6), ret, notice.dynamicValues);
               return [ret];
             }
           }
@@ -129024,9 +129046,9 @@ var init_filter = __esm({
        * Adds dynamic values from the given ActualComponents
        *
        * If there are multiple components with the same dynamic name, they are joined
-       * by a comma.
+       * by the separator declared in `specs[name].separator`, defaulting to `','`.
        */
-      addDynamicValues(comps, notice) {
+      addDynamicValues(comps, notice, specs) {
         const dynamicValues = {};
         for (const comp of comps) {
           if (comp.dynamicName) {
@@ -129035,7 +129057,7 @@ var init_filter = __esm({
           }
         }
         for (const [key, values] of Object.entries(dynamicValues)) {
-          notice.addDynamicValue(key, values.join(","));
+          notice.addDynamicValue(key, values.join(specs?.[key]?.separator ?? ","));
         }
       }
       /**
@@ -142392,16 +142414,19 @@ var init_early_validation = __esm({
   "../@aws-cdk/toolkit-lib/lib/api/deployments/early-validation.ts"() {
     "use strict";
     EarlyValidationReporter = class {
-      constructor(sdk, envResources) {
+      constructor(sdk, envResources, ioHelper) {
         this.sdk = sdk;
         this.envResources = envResources;
+        this.ioHelper = ioHelper;
       }
       sdk;
       envResources;
+      ioHelper;
       static {
         __name(this, "EarlyValidationReporter");
       }
       async fetchDetails(changeSetName, stackName) {
+        const summary = `Early validation failed for stack '${stackName}' (ChangeSet '${changeSetName}')`;
         let operationEvents = [];
         try {
           operationEvents = await this.getFailedEvents(stackName, changeSetName);
@@ -142411,12 +142436,12 @@ var init_early_validation = __esm({
             currentVersion = (await this.envResources.lookupToolkit()).version;
           } catch (e6) {
           }
-          return `The template cannot be deployed because of early validation errors, but retrieving more details about those
-errors failed (${error4}). Make sure you have permissions to call the DescribeEvents API, or re-bootstrap
-your environment by running 'cdk bootstrap' to update the Bootstrap CDK Toolkit stack.
-Bootstrap toolkit stack version 30 or later is needed; current version: ${currentVersion ?? "unknown"}.`;
+          await this.ioHelper.defaults.warn(
+            `Could not retrieve additional details about early validation errors (${error4}). Make sure you have permissions to call the DescribeEvents API, or re-bootstrap your environment by running 'cdk bootstrap' to update the Bootstrap CDK Toolkit stack. Bootstrap toolkit stack version 30 or later is needed; current version: ${currentVersion ?? "unknown"}.`
+          );
+          return summary;
         }
-        let message2 = `ChangeSet '${changeSetName}' on stack '${stackName}' failed early validation`;
+        let message2 = summary;
         if (operationEvents.length > 0) {
           const failures = operationEvents.map((event) => `  - ${event.ValidationStatusReason} (at ${event.ValidationPath})`).join("\n");
           message2 += `:
@@ -142837,7 +142862,7 @@ var init_deploy_stack = __esm({
         await this.ioHelper.defaults.debug((0, import_util32.format)("Initiated creation of changeset: %s; waiting for it to finish creating...", changeSet.Id));
         const environmentResourcesRegistry = new EnvironmentResourcesRegistry();
         const envResources = environmentResourcesRegistry.for(this.options.resolvedEnvironment, this.options.sdk, this.ioHelper);
-        const validationReporter = new EarlyValidationReporter(this.options.sdk, envResources);
+        const validationReporter = new EarlyValidationReporter(this.options.sdk, envResources, this.ioHelper);
         try {
           return await waitForChangeSet(this.cfn, this.ioHelper, this.stackName, changeSetName, {
             fetchAll: willExecute,
@@ -142904,6 +142929,7 @@ var init_deploy_stack = __esm({
             StackName: this.stackName,
             ChangeSetName: changeSetName
           });
+          await waitForChangeSetGone(this.cfn, this.ioHelper, this.stackName, changeSetName);
         }
       }
       async updateTerminationProtection() {
@@ -310324,8 +310350,8 @@ var init_importer = __esm({
     cfnDiff = __toESM(require_lib10());
     chalk16 = __toESM(require_source());
     fs31 = __toESM(require_lib4());
-    init_toolkit_error();
     init_deployments2();
+    init_diff3();
     init_private();
     ResourceImporter = class {
       static {
@@ -310433,13 +310459,9 @@ var init_importer = __esm({
         const resourceChanges = Object.entries(diff.resources.changes).filter(([logicalId, _2]) => logicalId !== "CDKMetadata");
         const nonAdditions = resourceChanges.filter(([_2, dif]) => !dif.isAddition);
         const additions = resourceChanges.filter(([_2, dif]) => dif.isAddition);
-        if (nonAdditions.length) {
+        if (nonAdditions.length && allowNonAdditions) {
           const offendingResources = nonAdditions.map(([logId, _2]) => this.describeResource(logId));
-          if (allowNonAdditions) {
-            await this.ioHelper.defaults.warn(`Ignoring updated/deleted resources (--force): ${offendingResources.join(", ")}`);
-          } else {
-            throw new ToolkitError("ImportNonAdditionChanges", `No resource updates or deletes are allowed on import operation. Make sure to resolve pending changes to existing resources, before attempting an import. Updated/deleted resources: ${offendingResources.join(", ")} (--force to override)`);
-          }
+          await this.ioHelper.defaults.warn(`Ignoring updated/deleted resources (--force): ${offendingResources.join(", ")}`);
         }
         return {
           additions: additions.map(([logicalId, resourceDiff]) => ({
@@ -310447,7 +310469,14 @@ var init_importer = __esm({
             resourceDiff,
             resourceDefinition: addDefaultDeletionPolicy(this.stack.template?.Resources?.[logicalId] ?? {})
           })),
-          hasNonAdditions: nonAdditions.length > 0
+          hasNonAdditions: nonAdditions.length > 0,
+          nonAdditionNames: nonAdditions.map(([logId, _2]) => this.describeResource(logId)),
+          diffFormatter: new DiffFormatter({
+            templateInfo: {
+              oldTemplate: currentTemplate,
+              newTemplate: this.stack
+            }
+          })
         };
       }
       /**
@@ -311455,6 +311484,7 @@ var init_stack_refresh = __esm({
       timeout;
       lastRefreshTime;
       queuedPromises = [];
+      stopped = false;
       start() {
         this.timeout = setTimeout(() => this.refresh(), 3e5);
       }
@@ -311467,6 +311497,9 @@ var init_stack_refresh = __esm({
           qualifier: this.props.qualifier
         });
         this.justRefreshedStacks();
+        if (this.stopped) {
+          return;
+        }
         this.timeout = setTimeout(() => this.refresh(), Math.max(startTime + 3e5 - Date.now(), 0));
       }
       justRefreshedStacks() {
@@ -311491,6 +311524,7 @@ var init_stack_refresh = __esm({
         ]);
       }
       stop() {
+        this.stopped = true;
         clearTimeout(this.timeout);
       }
     };
@@ -316997,33 +317031,35 @@ var init_toolkit = __esm({
             deploymentMethod: options.deploymentMethod,
             cleanupOnNoOp: isExecutingChangeSetDeployment(options.deploymentMethod)
           }) : void 0;
-          const formatter = new DiffFormatter({
-            templateInfo: {
-              oldTemplate: currentTemplate,
-              newTemplate: stack,
-              changeSet: prepareResult?.changeSet
-            }
-          });
-          const securityDiff = formatter.formatSecurityDiff();
-          const stackDiff = formatter.formatStackDiff();
-          const hasSecurityChanges = securityDiff.permissionChangeType !== "none" /* NONE */;
-          const deployMotivation = hasSecurityChanges ? '"--require-approval" is enabled and stack includes security-sensitive updates.' : '"--require-approval" is enabled and stack includes updates.';
-          const diffOutput2 = hasSecurityChanges ? securityDiff.formattedDiff : stackDiff.formattedDiff;
-          const deployQuestion = `${diffOutput2}
+          if (!prepareResult?.noOp) {
+            const formatter = new DiffFormatter({
+              templateInfo: {
+                oldTemplate: currentTemplate,
+                newTemplate: stack,
+                changeSet: prepareResult?.changeSet
+              }
+            });
+            const securityDiff = formatter.formatSecurityDiff();
+            const stackDiff = formatter.formatStackDiff();
+            const hasSecurityChanges = securityDiff.permissionChangeType !== "none" /* NONE */;
+            const deployMotivation = hasSecurityChanges ? '"--require-approval" is enabled and stack includes security-sensitive updates.' : '"--require-approval" is enabled and stack includes updates.';
+            const diffOutput2 = hasSecurityChanges ? securityDiff.formattedDiff : stackDiff.formattedDiff;
+            const deployQuestion = `${diffOutput2}
 
 ${deployMotivation}
 Do you wish to deploy these changes`;
-          const deployConfirmed = await ioHelper.requestResponse(IO.CDK_TOOLKIT_I5060.req(deployQuestion, {
-            motivation: deployMotivation,
-            concurrency,
-            permissionChangeType: securityDiff.permissionChangeType,
-            templateDiffs: formatter.diffs
-          }));
-          if (!deployConfirmed) {
-            if (prepareResult?.changeSet?.ChangeSetName) {
-              await deployments.cleanupChangeSet(stack, prepareResult.changeSet.ChangeSetName);
+            const deployConfirmed = await ioHelper.requestResponse(IO.CDK_TOOLKIT_I5060.req(deployQuestion, {
+              motivation: deployMotivation,
+              concurrency,
+              permissionChangeType: securityDiff.permissionChangeType,
+              templateDiffs: formatter.diffs
+            }));
+            if (!deployConfirmed) {
+              if (prepareResult?.changeSet?.ChangeSetName) {
+                await deployments.cleanupChangeSet(stack, prepareResult.changeSet.ChangeSetName);
+              }
+              throw new ToolkitError("DeployAborted", "Aborted by user");
             }
-            throw new ToolkitError("DeployAborted", "Aborted by user");
           }
           const stackIndex = stacks.indexOf(stack) + 1;
           const deploySpan = await ioHelper.span(SPAN.DEPLOY_STACK).begin(`${chalk25.bold(stack.displayName)}: deploying... [${stackIndex}/${stackCollection.stackCount}]`, {
@@ -324642,7 +324678,7 @@ var init_cdk_toolkit = __esm({
             deploymentMethod: options.deploymentMethod,
             cleanupOnNoOp: isExecutingChangeSetDeployment(options.deploymentMethod)
           }) : void 0;
-          if (requireApproval !== import_cloud_assembly_schema7.RequireApproval.NEVER) {
+          if (requireApproval !== import_cloud_assembly_schema7.RequireApproval.NEVER && !prepareResult?.noOp) {
             const currentTemplate = await this.props.deployments.readCurrentTemplate(stack);
             const formatter = new DiffFormatter({
               templateInfo: {
@@ -324971,7 +325007,20 @@ var init_cdk_toolkit = __esm({
           deployments: this.props.deployments,
           ioHelper: asIoHelper(this.ioHost, "import")
         });
-        const { additions, hasNonAdditions } = await resourceImporter.discoverImportableResources(options.force);
+        const { additions, hasNonAdditions, diffFormatter } = await resourceImporter.discoverImportableResources(options.force);
+        if (hasNonAdditions && !options.force) {
+          const ioHelper = this.ioHost.asIoHelper();
+          await ioHelper.defaults.info(
+            `The following resources have pending updates that will be reconciled with a ${chalk31.blueBright("cdk deploy")} after import:`
+          );
+          const { formattedDiff } = diffFormatter.formatStackDiff();
+          await ioHelper.defaults.info(formattedDiff);
+          const confirmed = await ioHelper.requestResponse(IO.CDK_TOOLKIT_I7010.req("Perform import?", { motivation: "Confirm import with pending drift" }));
+          if (!confirmed) {
+            await ioHelper.defaults.info("Import cancelled.");
+            return;
+          }
+        }
         if (additions.length === 0) {
           await this.ioHost.asIoHelper().defaults.warn(
             "%s: no new resources compared to the currently deployed stack, skipping import.",
@@ -325003,20 +325052,37 @@ var init_cdk_toolkit = __esm({
           usePreviousParameters: true,
           rollback: options.rollback
         });
-        await this.ioHost.asIoHelper().defaults.info(
-          `Import operation complete. We recommend you run a ${chalk31.blueBright("drift detection")} operation to confirm your CDK app resource definitions are up-to-date. Read more here: ` + chalk31.underline.blueBright(
-            "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/detect-drift-stack.html"
-          )
-        );
         if (actualImport.importResources.length < additions.length) {
-          await this.ioHost.asIoHelper().defaults.info("");
           await this.ioHost.asIoHelper().defaults.warn(
             `Some resources were skipped. Run another ${chalk31.blueBright("cdk import")} or a ${chalk31.blueBright("cdk deploy")} to bring the stack up-to-date with your CDK app definition.`
           );
         } else if (hasNonAdditions) {
-          await this.ioHost.asIoHelper().defaults.info("");
-          await this.ioHost.asIoHelper().defaults.warn(
-            `Your app has pending updates or deletes excluded from this import operation. Run a ${chalk31.blueBright("cdk deploy")} to bring the stack up-to-date with your CDK app definition.`
+          if (options.force) {
+            await this.ioHost.asIoHelper().defaults.info(
+              `Import complete. Run ${chalk31.blueBright("cdk deploy")} to update the stack to match your CDK app.`
+            );
+          } else {
+            const deployNow = await this.ioHost.asIoHelper().requestResponse(
+              IO.CDK_TOOLKIT_I7010.req(`Finish with a ${chalk31.blueBright("cdk deploy")} now?`, { motivation: "Update stack to match CDK app after import" })
+            );
+            if (deployNow) {
+              await this.deploy({
+                selector: options.selector,
+                toolkitStackName: options.toolkitStackName,
+                roleArn: options.roleArn,
+                deploymentMethod: options.deploymentMethod
+              });
+            } else {
+              await this.ioHost.asIoHelper().defaults.info(
+                `Import complete. Remember to run ${chalk31.blueBright("cdk deploy")} to update the stack to match your CDK app.`
+              );
+            }
+          }
+        } else {
+          await this.ioHost.asIoHelper().defaults.info(
+            `Import operation complete. We recommend you run a ${chalk31.blueBright("drift detection")} operation to confirm your CDK app resource definitions are up-to-date. Read more here: ` + chalk31.underline.blueBright(
+              "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/detect-drift-stack.html"
+            )
           );
         }
       }
@@ -325108,7 +325174,9 @@ var init_cdk_toolkit = __esm({
           if (!quiet) {
             await printSerializedObject(this.ioHost.asIoHelper(), obscureTemplate(stacks.firstStack.template), json ?? false);
           }
-          await displayFlagsMessage(this.ioHost.asIoHelper(), this.toolkit, this.props.cloudExecutable);
+          if (quiet || !this.ioHost.isCI) {
+            await displayFlagsMessage(this.ioHost.asIoHelper(), this.toolkit, this.props.cloudExecutable);
+          }
           return void 0;
         }
         await this.ioHost.asIoHelper().defaults.info(chalk31.green(`Successfully synthesized to ${chalk31.blue(path42.resolve(stacks.assembly.directory))}`));

package/package.json

@@ -80,12 +80,12 @@
     "ts-mock-imports": "^1.3.19",
     "tsx": "^4.21.0",
     "typescript": "5.9",
-    "@aws-cdk/cdk-assets-lib": "^1.4.4",
+    "@aws-cdk/cdk-assets-lib": "^1.4.5",
     "@aws-cdk/cloud-assembly-api": "2.2.2",
-    "@aws-cdk/cloud-assembly-schema": ">=53.17.0",
+    "@aws-cdk/cloud-assembly-schema": ">=53.18.0",
     "@aws-cdk/cloudformation-diff": "2.187.1",
     "@aws-cdk/cx-api": "^2",
-    "@aws-cdk/toolkit-lib": "^1.22.1",
+    "@aws-cdk/toolkit-lib": "^1.24.0",
     "@aws-sdk/client-appsync": "^3",
     "@aws-sdk/client-bedrock-agentcore-control": "^3",
     "@aws-sdk/client-cloudcontrol": "^3",
@@ -157,7 +157,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1118.3",
+  "version": "2.1119.0",
   "packageManager": "yarn@4.13.0",
   "types": "lib/index.d.ts",
   "exports": {