aws-cdk 2.1118.2 → 2.1118.4

package/lib/index.js

@@ -216,6 +216,8 @@ var init_metadata_schema = __esm({
       ArtifactMetadataEntryType7["LOGICAL_ID"] = "aws:cdk:logicalId";
       ArtifactMetadataEntryType7["STACK_TAGS"] = "aws:cdk:stack-tags";
       ArtifactMetadataEntryType7["DO_NOT_REFACTOR"] = "aws:cdk:do-not-refactor";
+      ArtifactMetadataEntryType7["CREATION_STACK"] = "aws:cdk:creationStack";
+      ArtifactMetadataEntryType7["PROPERTY_ASSIGNMENT"] = "aws:cdk:propertyAssignment";
       return ArtifactMetadataEntryType7;
     })(ArtifactMetadataEntryType || {});
   }
@@ -3599,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.2" };
+    module2.exports = { version: "2.1118.4" };
   }
 });
 
@@ -4024,10 +4026,20 @@ have a unique display name. (Default - no display name)`,
                 {
                   $ref: "#/definitions/ContainerImageAssetMetadataEntry"
                 },
+                {
+                  $ref: "#/definitions/PropertyMutationMetadataEntry"
+                },
                 {
                   type: "array",
                   items: {
-                    $ref: "#/definitions/Tag"
+                    anyOf: [
+                      {
+                        $ref: "#/definitions/Tag"
+                      },
+                      {
+                        type: "string"
+                      }
+                    ]
                   }
                 },
                 {
@@ -4225,6 +4237,27 @@ have a unique display name. (Default - no display name)`,
             "type"
           ]
         },
+        PropertyMutationMetadataEntry: {
+          description: "Metadata type of a PropertyMutation",
+          type: "object",
+          properties: {
+            propertyName: {
+              description: "Name of the property",
+              type: "string"
+            },
+            stackTrace: {
+              description: "Stack trace of the mutation",
+              type: "array",
+              items: {
+                type: "string"
+              }
+            }
+          },
+          required: [
+            "propertyName",
+            "stackTrace"
+          ]
+        },
         Tag: {
           description: "Metadata Entry spec for stack tag.",
           type: "object",
@@ -5605,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: "25d8ad154190878ec8a9e970fa21a0e182fa834304913d43be86f9b0613271f5",
+      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
     };
@@ -128971,7 +129004,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];
             }
           }
@@ -128991,9 +129024,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) {
@@ -129002,7 +129035,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 ?? ","));
         }
       }
       /**
@@ -311422,6 +311455,7 @@ var init_stack_refresh = __esm({
       timeout;
       lastRefreshTime;
       queuedPromises = [];
+      stopped = false;
       start() {
         this.timeout = setTimeout(() => this.refresh(), 3e5);
       }
@@ -311434,6 +311468,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() {
@@ -311458,6 +311495,7 @@ var init_stack_refresh = __esm({
         ]);
       }
       stop() {
+        this.stopped = true;
         clearTimeout(this.timeout);
       }
     };
@@ -315350,12 +315388,19 @@ function resourceMoves(before, after, direction = "direct", ignoreModifications
   const digestsAfter = resourceDigests(after, direction);
   if (!(ignoreModifications || isomorphic(digestsBefore, digestsAfter))) {
     const message2 = ["A refactor operation cannot add, remove or update resources. Only resource moves and renames are allowed."];
-    const difference2 = /* @__PURE__ */ __name((a6, b6) => {
-      return Array.from(setDiff(new Set(Object.keys(a6)), new Set(Object.keys(b6)))).flatMap((k6) => a6[k6]).map((x6) => `  - ${x6.toPath()}`).sort().join("\n");
-    }, "difference");
+    const locationsForDigests = /* @__PURE__ */ __name((a6, b6) => {
+      return Array.from(setDiff(new Set(Object.keys(a6)), new Set(Object.keys(b6)))).flatMap((k6) => a6[k6]);
+    }, "locationsForDigests");
+    const formatList = /* @__PURE__ */ __name((locs, icon) => locs.map((x6) => `  [${icon}] ${x6.toPath()}`).sort().join("\n"), "formatList");
     const stackNames = /* @__PURE__ */ __name((stacks) => stacks.length === 0 ? "NONE" : stacks.map((s6) => s6.stackName).sort().join(", "), "stackNames");
-    const onlyDeployed = difference2(digestsBefore, digestsAfter);
-    const onlyLocal = difference2(digestsAfter, digestsBefore);
+    const onlyDeployedLocs = locationsForDigests(digestsBefore, digestsAfter);
+    const onlyLocalLocs = locationsForDigests(digestsAfter, digestsBefore);
+    const onlyDeployedPaths = new Set(onlyDeployedLocs.map((l6) => l6.toPath()));
+    const onlyLocalPaths = new Set(onlyLocalLocs.map((l6) => l6.toPath()));
+    const differentPaths = new Set(Array.from(onlyDeployedPaths).filter((p6) => onlyLocalPaths.has(p6)));
+    const onlyDeployed = formatList(onlyDeployedLocs.filter((l6) => !differentPaths.has(l6.toPath())), "-");
+    const onlyLocal = formatList(onlyLocalLocs.filter((l6) => !differentPaths.has(l6.toPath())), "+");
+    const different = formatList([...onlyDeployedLocs, ...onlyLocalLocs].filter((l6) => differentPaths.has(l6.toPath())), "~");
     if (onlyDeployed.length > 0) {
       message2.push(`The following resources are present only in the AWS environment:
 ${onlyDeployed}`);
@@ -315364,6 +315409,11 @@ ${onlyDeployed}`);
       message2.push(`
 The following resources are present only in your CDK application:
 ${onlyLocal}`);
+    }
+    if (different.length > 0) {
+      message2.push(`
+The following resources are different in your CDK application and the AWS environment:
+${different}`);
     }
     message2.push("");
     message2.push("The following stacks were used in the comparison:");
@@ -316952,11 +317002,6 @@ var init_toolkit = __esm({
             deploymentMethod: options.deploymentMethod,
             cleanupOnNoOp: isExecutingChangeSetDeployment(options.deploymentMethod)
           }) : void 0;
-          if (prepareResult?.noOp === true) {
-            await ioHelper.notify(IO.CDK_TOOLKIT_I5900.msg(chalk25.green(`
- \u2705  ${stack.displayName} (no changes)`), prepareResult));
-            return;
-          }
           const formatter = new DiffFormatter({
             templateInfo: {
               oldTemplate: currentTemplate,
@@ -316994,7 +317039,7 @@ Do you wish to deploy these changes`;
           deploySpan.incCounter("resources", resourceCount);
           let deployDuration;
           try {
-            const prepareIsFinal = isNonExecutingChangeSetDeployment(options.deploymentMethod);
+            const prepareIsFinal = prepareResult && (prepareResult.noOp || isNonExecutingChangeSetDeployment(options.deploymentMethod));
             let deployResult = prepareIsFinal ? prepareResult : void 0;
             let rollback = options.rollback;
             let iteration = 0;
@@ -317075,10 +317120,9 @@ ${deployResult.stackArn}`));
               hierarchicalId: stack.hierarchicalId
             });
           } catch (e6) {
-            throw new ToolkitError(
-              "DeployStackFailed",
-              [`\u274C  ${chalk25.bold(stack.stackName)} failed:`, ...e6.name ? [`${e6.name}:`] : [], e6.message].join(" ")
-            );
+            const code = ToolkitError.isToolkitError(e6) ? e6.name : "DeployStackFailed";
+            const newMessage = [`\u274C  ${chalk25.bold(stack.stackName)} failed:`, ...e6.name ? [`${e6.name}:`] : [], e6.message].join(" ");
+            throw new ToolkitError(code, newMessage);
           } finally {
             if (options.traceLogs) {
               const cloudWatchLogMonitor = options.cloudWatchLogMonitor ?? new CloudWatchLogEventMonitor({ ioHelper });
@@ -324603,10 +324647,6 @@ var init_cdk_toolkit = __esm({
             deploymentMethod: options.deploymentMethod,
             cleanupOnNoOp: isExecutingChangeSetDeployment(options.deploymentMethod)
           }) : void 0;
-          if (prepareResult?.noOp === true) {
-            await this.ioHost.asIoHelper().defaults.info(" \u2705  %s (no changes)", chalk31.bold(stack.displayName));
-            return;
-          }
           if (requireApproval !== import_cloud_assembly_schema7.RequireApproval.NEVER) {
             const currentTemplate = await this.props.deployments.readCurrentTemplate(stack);
             const formatter = new DiffFormatter({
@@ -324648,7 +324688,7 @@ var init_cdk_toolkit = __esm({
           let error4;
           let elapsedDeployTime = 0;
           try {
-            const prepareIsFinal = prepareResult && isNonExecutingChangeSetDeployment(options.deploymentMethod);
+            const prepareIsFinal = prepareResult && (prepareResult.noOp || isNonExecutingChangeSetDeployment(options.deploymentMethod));
             let deployResult = prepareIsFinal ? prepareResult : void 0;
             let rollback = options.rollback;
             let iteration = 0;
@@ -324725,10 +324765,9 @@ var init_cdk_toolkit = __esm({
             await this.ioHost.asIoHelper().defaults.info("Stack ARN:");
             await this.ioHost.asIoHelper().defaults.result(deployResult.stackArn);
           } catch (e6) {
-            const wrappedError = new import_toolkit_lib18.ToolkitError(
-              "DeployFailed",
-              [`\u274C  ${chalk31.bold(stack.stackName)} failed:`, ...e6.name ? [`${e6.name}:`] : [], formatErrorMessage(e6)].join(" ")
-            );
+            const code = import_toolkit_lib18.ToolkitError.isToolkitError(e6) ? e6.name : "DeployStackFailed";
+            const newMessage = [`\u274C  ${chalk31.bold(stack.stackName)} failed:`, ...e6.name ? [`${e6.name}:`] : [], e6.message].join(" ");
+            const wrappedError = new import_toolkit_lib18.ToolkitError(code, newMessage);
             error4 = {
               name: cdkCliErrorName(wrappedError)
             };
@@ -338418,6 +338457,61 @@ Closing reason: ${this._closingError.stack}`;
   }
 });
 
+// ../../node_modules/basic-ftp/dist/netUtils.js
+var require_netUtils = __commonJS({
+  "../../node_modules/basic-ftp/dist/netUtils.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.describeTLS = describeTLS;
+    exports2.describeAddress = describeAddress;
+    exports2.upgradeSocket = upgradeSocket;
+    exports2.ipIsPrivateV4Address = ipIsPrivateV4Address;
+    var tls_1 = require("tls");
+    function describeTLS(socket) {
+      if (socket instanceof tls_1.TLSSocket) {
+        const protocol = socket.getProtocol();
+        return protocol ? protocol : "Server socket or disconnected client socket";
+      }
+      return "No encryption";
+    }
+    __name(describeTLS, "describeTLS");
+    function describeAddress(socket) {
+      if (socket.remoteFamily === "IPv6") {
+        return `[${socket.remoteAddress}]:${socket.remotePort}`;
+      }
+      return `${socket.remoteAddress}:${socket.remotePort}`;
+    }
+    __name(describeAddress, "describeAddress");
+    function upgradeSocket(socket, options) {
+      return new Promise((resolve15, reject) => {
+        const tlsOptions = Object.assign({}, options, {
+          socket
+        });
+        const tlsSocket = (0, tls_1.connect)(tlsOptions, () => {
+          const expectCertificate = tlsOptions.rejectUnauthorized !== false;
+          if (expectCertificate && !tlsSocket.authorized) {
+            reject(tlsSocket.authorizationError);
+          } else {
+            tlsSocket.removeAllListeners("error");
+            resolve15(tlsSocket);
+          }
+        }).once("error", (error4) => {
+          reject(error4);
+        });
+      });
+    }
+    __name(upgradeSocket, "upgradeSocket");
+    function ipIsPrivateV4Address(ip = "") {
+      if (ip.startsWith("::ffff:")) {
+        ip = ip.substr(7);
+      }
+      const octets = ip.split(".").map((o6) => parseInt(o6, 10));
+      return octets[0] === 10 || octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31 || octets[0] === 192 && octets[1] === 168 || ip === "127.0.0.1";
+    }
+    __name(ipIsPrivateV4Address, "ipIsPrivateV4Address");
+  }
+});
+
 // ../../node_modules/basic-ftp/dist/FileInfo.js
 var require_FileInfo = __commonJS({
   "../../node_modules/basic-ftp/dist/FileInfo.js"(exports2) {
@@ -338954,81 +339048,33 @@ var require_StringWriter = __commonJS({
       static {
         __name(this, "StringWriter");
       }
-      constructor() {
-        super(...arguments);
-        this.buf = Buffer.alloc(0);
+      constructor(maxByteLength = 1 * 1024 * 1024) {
+        super();
+        this.maxByteLength = maxByteLength;
+        this.byteLength = 0;
+        this.bufs = [];
       }
       _write(chunk, _2, callback) {
-        if (chunk instanceof Buffer) {
-          this.buf = Buffer.concat([this.buf, chunk]);
-          callback(null);
-        } else {
-          callback(new Error("StringWriter expects chunks of type 'Buffer'."));
+        if (!(chunk instanceof Buffer)) {
+          callback(new Error("StringWriter: expects chunks of type 'Buffer'."));
+          return;
+        }
+        if (this.byteLength + chunk.byteLength > this.maxByteLength) {
+          callback(new Error(`StringWriter: Maximum bytes exceeded, maxByteLength=${this.maxByteLength}.`));
+          return;
         }
+        this.byteLength += chunk.byteLength;
+        this.bufs.push(chunk);
+        callback(null);
       }
       getText(encoding) {
-        return this.buf.toString(encoding);
+        return Buffer.concat(this.bufs).toString(encoding);
       }
     };
     exports2.StringWriter = StringWriter;
   }
 });
 
-// ../../node_modules/basic-ftp/dist/netUtils.js
-var require_netUtils = __commonJS({
-  "../../node_modules/basic-ftp/dist/netUtils.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.describeTLS = describeTLS;
-    exports2.describeAddress = describeAddress;
-    exports2.upgradeSocket = upgradeSocket;
-    exports2.ipIsPrivateV4Address = ipIsPrivateV4Address;
-    var tls_1 = require("tls");
-    function describeTLS(socket) {
-      if (socket instanceof tls_1.TLSSocket) {
-        const protocol = socket.getProtocol();
-        return protocol ? protocol : "Server socket or disconnected client socket";
-      }
-      return "No encryption";
-    }
-    __name(describeTLS, "describeTLS");
-    function describeAddress(socket) {
-      if (socket.remoteFamily === "IPv6") {
-        return `[${socket.remoteAddress}]:${socket.remotePort}`;
-      }
-      return `${socket.remoteAddress}:${socket.remotePort}`;
-    }
-    __name(describeAddress, "describeAddress");
-    function upgradeSocket(socket, options) {
-      return new Promise((resolve15, reject) => {
-        const tlsOptions = Object.assign({}, options, {
-          socket
-        });
-        const tlsSocket = (0, tls_1.connect)(tlsOptions, () => {
-          const expectCertificate = tlsOptions.rejectUnauthorized !== false;
-          if (expectCertificate && !tlsSocket.authorized) {
-            reject(tlsSocket.authorizationError);
-          } else {
-            tlsSocket.removeAllListeners("error");
-            resolve15(tlsSocket);
-          }
-        }).once("error", (error4) => {
-          reject(error4);
-        });
-      });
-    }
-    __name(upgradeSocket, "upgradeSocket");
-    function ipIsPrivateV4Address(ip = "") {
-      if (ip.startsWith("::ffff:")) {
-        ip = ip.substr(7);
-      }
-      const octets = ip.split(".").map((o6) => parseInt(o6, 10));
-      return octets[0] === 10 || octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31 || octets[0] === 192 && octets[1] === 168 || ip === "127.0.0.1";
-    }
-    __name(ipIsPrivateV4Address, "ipIsPrivateV4Address");
-  }
-});
-
 // ../../node_modules/basic-ftp/dist/transfer.js
 var require_transfer = __commonJS({
   "../../node_modules/basic-ftp/dist/transfer.js"(exports2) {
@@ -339304,13 +339350,13 @@ var require_Client = __commonJS({
     var tls_1 = require("tls");
     var util_1 = require("util");
     var FtpContext_1 = require_FtpContext();
+    var netUtils_1 = require_netUtils();
+    var parseControlResponse_1 = require_parseControlResponse();
     var parseList_1 = require_parseList();
+    var parseListMLSD_1 = require_parseListMLSD();
     var ProgressTracker_1 = require_ProgressTracker();
     var StringWriter_1 = require_StringWriter();
-    var parseListMLSD_1 = require_parseListMLSD();
-    var netUtils_1 = require_netUtils();
     var transfer_1 = require_transfer();
-    var parseControlResponse_1 = require_parseControlResponse();
     var fsReadDir = (0, util_1.promisify)(fs_1.readdir);
     var fsMkDir = (0, util_1.promisify)(fs_1.mkdir);
     var fsStat = (0, util_1.promisify)(fs_1.stat);
@@ -339318,7 +339364,8 @@ var require_Client = __commonJS({
     var fsClose = (0, util_1.promisify)(fs_1.close);
     var fsUnlink = (0, util_1.promisify)(fs_1.unlink);
     var defaultClientOptions = {
-      allowSeparateTransferHost: true
+      allowSeparateTransferHost: true,
+      maxListingBytes: 40 * 1024 * 1024
     };
     var LIST_COMMANDS_DEFAULT = /* @__PURE__ */ __name(() => ["LIST -a", "LIST"], "LIST_COMMANDS_DEFAULT");
     var LIST_COMMANDS_MLSD = /* @__PURE__ */ __name(() => ["MLSD", "LIST -a", "LIST"], "LIST_COMMANDS_MLSD");
@@ -339331,13 +339378,15 @@ var require_Client = __commonJS({
        *
        * @param timeout  Timeout in milliseconds, use 0 for no timeout. Optional, default is 30 seconds.
        */
-      constructor(timeout = 3e4, options = defaultClientOptions) {
+      constructor(timeout = 3e4, userOptions = defaultClientOptions) {
         this.availableListCommands = LIST_COMMANDS_DEFAULT();
+        const options = { ...defaultClientOptions, ...userOptions };
         this.ftp = new FtpContext_1.FTPContext(timeout);
         this.prepareTransfer = this._enterFirstCompatibleMode([
           transfer_1.enterPassiveModeIPv6,
           options.allowSeparateTransferHost ? transfer_1.enterPassiveModeIPv4 : transfer_1.enterPassiveModeIPv4_forceControlHostIP
         ]);
+        this.options = options;
         this.parseList = parseList_1.parseList;
         this._progressTracker = new ProgressTracker_1.ProgressTracker();
       }
@@ -339774,7 +339823,7 @@ var require_Client = __commonJS({
        * @protected
        */
       async _requestListWithCommand(command) {
-        const buffer = new StringWriter_1.StringWriter();
+        const buffer = new StringWriter_1.StringWriter(this.options.maxListingBytes);
         await (0, transfer_1.downloadTo)(buffer, {
           ftp: this.ftp,
           tracker: this._progressTracker,

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.3",
+    "@aws-cdk/cdk-assets-lib": "^1.4.5",
     "@aws-cdk/cloud-assembly-api": "2.2.2",
-    "@aws-cdk/cloud-assembly-schema": ">=53.16.0",
+    "@aws-cdk/cloud-assembly-schema": ">=53.17.0",
     "@aws-cdk/cloudformation-diff": "2.187.1",
     "@aws-cdk/cx-api": "^2",
-    "@aws-cdk/toolkit-lib": "^1.22.0",
+    "@aws-cdk/toolkit-lib": "^1.23.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.2",
+  "version": "2.1118.4",
   "packageManager": "yarn@4.13.0",
   "types": "lib/index.d.ts",
   "exports": {