aws-cdk 2.1132.1 → 2.1133.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.1132.1" };
+    module2.exports = { version: "2.1133.0" };
   }
 });
 
@@ -10808,11 +10808,11 @@ async function shell(command6, options) {
       child.stdin.write(options.input);
       child.stdin.end();
     }
-    const stdout = new Array();
+    const stdout2 = new Array();
     const stderr = new Array();
     child.stdout.on("data", (chunk) => {
       handleShellOutput(chunk, options, "data_stdout");
-      stdout.push(chunk);
+      stdout2.push(chunk);
     });
     child.stderr.on("data", (chunk) => {
       handleShellOutput(chunk, options, "data_stderr");
@@ -10822,7 +10822,7 @@ async function shell(command6, options) {
     child.once("close", (code, signal) => {
       handleShellOutput(renderCommandLine(command6), options, "close");
       if (code === 0) {
-        resolve16(Buffer.concat(stdout).toString("utf-8"));
+        resolve16(Buffer.concat(stdout2).toString("utf-8"));
       } else {
         const out = Buffer.concat(stderr).toString("utf-8").trim();
         reject(
@@ -44135,10 +44135,10 @@ var require_dist_cjs12 = __commonJS({
         if (credentialProcess !== void 0) {
           const execPromise = promisify4(externalDataInterceptor2?.getTokenRecord?.().exec ?? exec5);
           try {
-            const { stdout } = await execPromise(credentialProcess);
+            const { stdout: stdout2 } = await execPromise(credentialProcess);
             let data2;
             try {
-              data2 = JSON.parse(stdout.trim());
+              data2 = JSON.parse(stdout2.trim());
             } catch {
               throw Error(`Profile ${profileName} credential_process returned invalid JSON.`);
             }
@@ -70236,13 +70236,42 @@ function formatErrorMessage(error3) {
     return `${error3.message}
 ${formatErrorMessage(error3.cause)}`;
   }
-  return error3?.message || error3?.toString() || "Unknown error";
+  if (error3?.message) {
+    return error3.message;
+  }
+  const fromSdk = formatSdkError(error3);
+  if (fromSdk) {
+    return fromSdk;
+  }
+  return error3?.toString() || "Unknown error";
+}
+function formatSdkError(error3) {
+  const name = error3?.name ?? error3?.code;
+  const metadata = error3?.$metadata ?? {};
+  const details = [];
+  if (typeof metadata.httpStatusCode === "number") {
+    details.push(`HTTP ${metadata.httpStatusCode}`);
+  }
+  if (metadata.requestId) {
+    details.push(`request id: ${metadata.requestId}`);
+  }
+  if (name && details.length > 0) {
+    return `${name} (${details.join(", ")})`;
+  }
+  if (name) {
+    return name;
+  }
+  if (details.length > 0) {
+    return details.join(", ");
+  }
+  return void 0;
 }
 var init_format_error = __esm({
   "../@aws-cdk/toolkit-lib/lib/util/format-error.ts"() {
     "use strict";
     init_toolkit_error();
     __name(formatErrorMessage, "formatErrorMessage");
+    __name(formatSdkError, "formatSdkError");
   }
 });
 
@@ -106564,14 +106593,16 @@ var init_deploy_stack = __esm({
         const replacement = hasReplacement(changeSetDescription);
         const isPausedFailState = this.cloudFormationStack.stackStatus.isRollbackable;
         const rollback = this.options.rollback ?? true;
-        const expressNoRollback = this.options.express && this.options.rollback !== true;
+        if (this.options.express) {
+          return this.executeChangeSet(changeSetDescription);
+        }
         if (isPausedFailState && replacement) {
           return { type: "failpaused-need-rollback-first", reason: "replacement", status: this.cloudFormationStack.stackStatus.name };
         }
         if (isPausedFailState && rollback) {
           return { type: "failpaused-need-rollback-first", reason: "not-norollback", status: this.cloudFormationStack.stackStatus.name };
         }
-        if ((!rollback || expressNoRollback) && replacement) {
+        if (!rollback && replacement) {
           return { type: "replacement-requires-rollback" };
         }
         return this.executeChangeSet(changeSetDescription);
@@ -281273,7 +281304,13 @@ function synthParametersFromSettings(settings) {
   return {
     context: contextFromSettings(settings),
     env: {
-      ...settings.get(["debugApp"]) ? debugEnvVars : {}
+      ...settings.get(["debugApp"]) ? debugEnvVars : {},
+      // When validation is disabled (e.g. via the CLI's `--no-validation`), forward
+      // it to the app process as an environment variable so framework-side validation
+      // layers can honor it. This is read in framework code that has no access to a
+      // construct tree, which is why it is an environment variable rather than context.
+      // Only an explicit `false` disables it, so a missing setting fails safe (validation on).
+      ...settings.get(["validation"]) === false ? { CDK_VALIDATION: "false" } : {}
     }
   };
 }
@@ -281426,6 +281463,7 @@ function settingsFromSynthOptions(synthOpts = {}) {
     versionReporting: true,
     assetMetadata: true,
     assetStaging: true,
+    validation: true,
     ...synthOpts
   }, true);
 }
@@ -292587,12 +292625,12 @@ var init_installation_id = __esm({
 async function getLibraryVersion(ioHelper) {
   try {
     const command6 = `node -e 'process.stdout.write(require.resolve("aws-cdk-lib"))'`;
-    const { stdout } = await (0, import_util69.promisify)(import_child_process.exec)(command6);
-    if (!fs38.existsSync(stdout)) {
+    const { stdout: stdout2 } = await (0, import_util69.promisify)(import_child_process.exec)(command6);
+    if (!fs38.existsSync(stdout2)) {
       await ioHelper.defaults.trace('Could not get CDK Library Version: require.resolve("aws-cdk-lib") did not return a file path');
       return;
     }
-    const pathToPackageJson = path37.join(path37.dirname(stdout), "package.json");
+    const pathToPackageJson = path37.join(path37.dirname(stdout2), "package.json");
     const packageJson = fs38.readJSONSync(pathToPackageJson);
     if (!packageJson.version) {
       await ioHelper.defaults.trace("Could not get CDK Library Version: package.json does not have version field");
@@ -293885,7 +293923,14 @@ var require_cli_type_registry = __commonJS({
           description: "Check your set-up for potential problems"
         },
         lsp: {
-          description: "Start the CDK Language Server (LSP) over stdio for editor and AI-agent integration"
+          description: "Start the CDK Language Server (LSP) over stdio for editor and AI-agent integration",
+          options: {
+            features: {
+              type: "boolean",
+              default: false,
+              desc: "Print the LSP feature manifest as JSON and exit instead of starting the server. Lets a client probe LSP presence and capabilities without opening a session."
+            }
+          }
         },
         orphan: {
           arg: {
@@ -295471,6 +295516,7 @@ async function commandLineArgumentsToSettings(ioHelper, argv) {
     language: argv.language,
     pathMetadata: argv.pathMetadata,
     assetMetadata: argv.assetMetadata,
+    validation: argv.validation,
     profile: argv.profile,
     region: argv.region,
     plugin: argv.plugin,
@@ -295954,15 +296000,15 @@ async function shell2(ioHelper, command6) {
     stdio: ["ignore", "pipe", "inherit"]
   });
   return new Promise((resolve16, reject) => {
-    const stdout = new Array();
+    const stdout2 = new Array();
     child.stdout.on("data", (chunk) => {
       process.stdout.write(chunk);
-      stdout.push(chunk);
+      stdout2.push(chunk);
     });
     child.once("error", reject);
     child.once("exit", (code) => {
       if (code === 0) {
-        resolve16(Buffer.from(stdout).toString("utf-8"));
+        resolve16(Buffer.from(stdout2).toString("utf-8"));
       } else {
         reject(new import_toolkit_lib9.ToolkitError("CommandFailed", `${commandLine} exited with error code ${code}`));
       }
@@ -296652,19 +296698,19 @@ async function execute(ioHelper, cmd, args, { cwd }) {
     shell: true,
     stdio: ["ignore", "pipe", "inherit"]
   });
-  let stdout = "";
-  child.stdout.on("data", (chunk) => stdout += chunk.toString());
+  let stdout2 = "";
+  child.stdout.on("data", (chunk) => stdout2 += chunk.toString());
   return new Promise((ok, fail) => {
     child.once("error", (err) => fail(err));
     child.once("exit", (status) => {
       if (status === 0) {
-        return ok(stdout);
+        return ok(stdout2);
       } else {
         return fail(new import_toolkit_lib11.ToolkitError("CommandFailed", `${cmd} exited with status ${status}`));
       }
     });
   }).catch(async (err) => {
-    await ioHelper.defaults.error(stdout);
+    await ioHelper.defaults.error(stdout2);
     throw err;
   });
 }
@@ -306272,7 +306318,15 @@ function parseCommandLineArguments(args) {
       desc: "the command to use to open the browser, using %u as a placeholder for the path of the file to open",
       type: "string"
     })
-  ).command("doctor", "Check your set-up for potential problems").command("lsp", "Start the CDK Language Server (LSP) over stdio for editor and AI-agent integration").command("orphan [PATHS..]", "Detach resources from a CloudFormation stack without deleting them", (yargs2) => yargs2).command(
+  ).command("doctor", "Check your set-up for potential problems").command(
+    "lsp",
+    "Start the CDK Language Server (LSP) over stdio for editor and AI-agent integration",
+    (yargs2) => yargs2.option("features", {
+      default: false,
+      type: "boolean",
+      desc: "Print the LSP feature manifest as JSON and exit instead of starting the server. Lets a client probe LSP presence and capabilities without opening a session."
+    })
+  ).command("orphan [PATHS..]", "Detach resources from a CloudFormation stack without deleting them", (yargs2) => yargs2).command(
     "refactor [STACKS..]",
     "Moves resources between stacks or within the same stack",
     (yargs2) => yargs2.option("additional-stack-name", {
@@ -335667,9 +335721,9 @@ async function docs(options) {
   await ioHelper.defaults.debug(`Opening documentation ${import_chalk37.default.green(browserCommand)}`);
   const exec5 = (0, import_node_util9.promisify)(childProcess2.exec);
   try {
-    const { stdout, stderr } = await exec5(browserCommand);
-    if (stdout) {
-      await ioHelper.defaults.debug(stdout);
+    const { stdout: stdout2, stderr } = await exec5(browserCommand);
+    if (stdout2) {
+      await ioHelper.defaults.debug(stdout2);
     }
     if (stderr) {
       await ioHelper.defaults.warn(stderr);
@@ -354065,14 +354119,14 @@ var require_files = __commonJS({
       }, "handler");
       try {
         process.on("SIGPIPE", handler);
-        let stdout = (0, child_process_1.spawnSync)(npmCommand, ["config", "get", "prefix"], options).stdout;
-        if (!stdout) {
+        let stdout2 = (0, child_process_1.spawnSync)(npmCommand, ["config", "get", "prefix"], options).stdout;
+        if (!stdout2) {
           if (tracer) {
             tracer(`'npm config get prefix' didn't return a value.`);
           }
           return void 0;
         }
-        let prefix = stdout.trim();
+        let prefix = stdout2.trim();
         if (tracer) {
           tracer(`'npm config get prefix' value is: ${prefix}`);
         }
@@ -354106,8 +354160,8 @@ var require_files = __commonJS({
       try {
         process.on("SIGPIPE", handler);
         let results = (0, child_process_1.spawnSync)(yarnCommand, ["global", "dir", "--json"], options);
-        let stdout = results.stdout;
-        if (!stdout) {
+        let stdout2 = results.stdout;
+        if (!stdout2) {
           if (tracer) {
             tracer(`'yarn global dir' didn't return a value.`);
             if (results.stderr) {
@@ -354116,7 +354170,7 @@ var require_files = __commonJS({
           }
           return void 0;
         }
-        let lines = stdout.trim().split(/\r?\n/);
+        let lines = stdout2.trim().split(/\r?\n/);
         for (let line of lines) {
           try {
             let yarn = JSON.parse(line);
@@ -355096,6 +355150,34 @@ var init_diagnostics = __esm({
   }
 });
 
+// ../@aws-cdk/cdk-explorer/lib/lsp/features.ts
+var features_exports = {};
+__export(features_exports, {
+  CDK_LSP_FEATURES: () => CDK_LSP_FEATURES,
+  CDK_LSP_PROTOCOL: () => CDK_LSP_PROTOCOL,
+  cdkLspManifest: () => cdkLspManifest
+});
+function cdkLspManifest(version) {
+  return {
+    protocol: CDK_LSP_PROTOCOL,
+    version,
+    features: [...CDK_LSP_FEATURES],
+    // Deliberately mirrors executeCommandProvider.commands on the wire so the
+    // `cdk lsp --features` probe (which has no LSP session) can see them too.
+    commands: [...SUPPORTED_COMMANDS]
+  };
+}
+var CDK_LSP_PROTOCOL, CDK_LSP_FEATURES;
+var init_features = __esm({
+  "../@aws-cdk/cdk-explorer/lib/lsp/features.ts"() {
+    "use strict";
+    init_commands7();
+    CDK_LSP_PROTOCOL = 1;
+    CDK_LSP_FEATURES = ["hover", "codeLens", "definition", "synth", "autoSynth"];
+    __name(cdkLspManifest, "cdkLspManifest");
+  }
+});
+
 // ../@aws-cdk/cdk-explorer/lib/lsp/hover.ts
 function resourceNodesOnLine(index, uri, position) {
   const line = position.line + 1;
@@ -355608,7 +355690,9 @@ function createLspHandlers(options) {
     onInitialize(params) {
       applicationDir = params.initializationOptions?.applicationDir;
       codeLensRefreshSupported = params.capabilities.workspace?.codeLens?.refreshSupport ?? false;
+      const manifest = cdkLspManifest(options.version);
       return {
+        serverInfo: { name: "cdk-lsp", version: manifest.version },
         capabilities: {
           textDocumentSync: {
             openClose: false,
@@ -355623,7 +355707,10 @@ function createLspHandlers(options) {
           definitionProvider: true,
           executeCommandProvider: { commands: [...SUPPORTED_COMMANDS] },
           // Hover a construct's creation line to see its resolved CFN properties.
-          hoverProvider: true
+          hoverProvider: true,
+          // Non-standard: lets a client discover CDK-specific features and the
+          // wire protocol version ahead of use; also backs `cdk lsp --features`.
+          experimental: { cdk: manifest }
         }
       };
     },
@@ -355755,6 +355842,7 @@ function startServer(options) {
         void connection.sendRequest(import_node5.CodeLensRefreshRequest.type);
       }
     }, "onRefreshCodeLenses"),
+    version: options.version,
     synthRunner,
     acquireAssemblyLock,
     notify: {
@@ -355813,6 +355901,7 @@ var init_server = __esm({
     init_commands7();
     init_construct_tree_request();
     init_diagnostics();
+    init_features();
     init_hover();
     init_positions();
     init_synth_diagnostics();
@@ -355932,10 +356021,11 @@ var main_exports = {};
 __export(main_exports, {
   startLspServer: () => startLspServer
 });
-function startLspServer() {
+function startLspServer(version) {
   startServer({
     readable: process.stdin,
     writable: process.stdout,
+    version,
     // Build the Toolkit once connection.console exists (so output reaches the
     // editor Output panel), then bind the two ops the handlers need. The read
     // lock comes from fromAssemblyDirectory().produce(), so we never touch RWLock.
@@ -355966,7 +356056,7 @@ var require_lib13 = __commonJS({
   "../@aws-cdk/cdk-explorer/lib/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createLspHandlers = exports2.startServer = exports2.startLspServer = exports2.readAssembly = exports2.VERSION = void 0;
+    exports2.createLspHandlers = exports2.startServer = exports2.cdkLspManifest = exports2.startLspServer = exports2.readAssembly = exports2.VERSION = void 0;
     exports2.VERSION = "0.0.0";
     var assembly_reader_1 = (init_assembly_reader(), __toCommonJS(assembly_reader_exports));
     Object.defineProperty(exports2, "readAssembly", { enumerable: true, get: /* @__PURE__ */ __name(function() {
@@ -355976,6 +356066,10 @@ var require_lib13 = __commonJS({
     Object.defineProperty(exports2, "startLspServer", { enumerable: true, get: /* @__PURE__ */ __name(function() {
       return main_1.startLspServer;
     }, "get") });
+    var features_1 = (init_features(), __toCommonJS(features_exports));
+    Object.defineProperty(exports2, "cdkLspManifest", { enumerable: true, get: /* @__PURE__ */ __name(function() {
+      return features_1.cdkLspManifest;
+    }, "get") });
     var server_1 = (init_server(), __toCommonJS(server_exports));
     Object.defineProperty(exports2, "startServer", { enumerable: true, get: /* @__PURE__ */ __name(function() {
       return server_1.startServer;
@@ -355987,8 +356081,12 @@ var require_lib13 = __commonJS({
 });
 
 // lib/commands/lsp.ts
-async function lsp() {
-  (0, import_cdk_explorer.startLspServer)();
+async function lsp(options = {}) {
+  if (options.features) {
+    process3.stdout.write(JSON.stringify((0, import_cdk_explorer.cdkLspManifest)(versionNumber2())) + "\n");
+    return 0;
+  }
+  (0, import_cdk_explorer.startLspServer)(versionNumber2());
   await new Promise((resolve16) => {
     const done = /* @__PURE__ */ __name(() => resolve16(), "done");
     process3.stdin.once("end", done);
@@ -356002,6 +356100,7 @@ var init_lsp = __esm({
     "use strict";
     process3 = __toESM(require("process"));
     import_cdk_explorer = __toESM(require_lib13());
+    init_version();
     __name(lsp, "lsp");
   }
 });
@@ -356328,7 +356427,7 @@ async function exec4(args, synthesizer) {
         });
       case "lsp":
         ioHost.currentAction = "lsp";
-        return lsp();
+        return lsp({ features: argv.features });
       case "ls":
       case "list":
         ioHost.currentAction = "list";

package/lib/init-templates/.init-version.json

@@ -1 +1 @@
-{"aws-cdk-lib": "^2.261.0", "constructs": "^10.5.0"}
+{"aws-cdk-lib": "^2.262.0", "constructs": "^10.5.0"}

package/lib/init-templates/.recommended-feature-flags.json

@@ -86,5 +86,6 @@
   "@aws-cdk/aws-batch:defaultToAL2023": true,
   "@aws-cdk/aws-eks:defaultToAL2023": true,
   "@aws-cdk/core:annotationsInValidationReport": true,
-  "@aws-cdk/core:defaultCrossStackReferences": "weak"
+  "@aws-cdk/core:defaultCrossStackReferences": "weak",
+  "@aws-cdk/core:validateAgainstDefaultRules": true
 }

package/package.json

@@ -52,7 +52,7 @@
     "@types/yazl": "^3.3.1",
     "@typescript-eslint/eslint-plugin": "^8",
     "@typescript-eslint/parser": "^8",
-    "aws-cdk-lib": "2.261.0",
+    "aws-cdk-lib": "2.262.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "commit-and-tag-version": "^12",
@@ -84,11 +84,11 @@
     "@aws-cdk/cdk-assets-lib": "^1.4.15",
     "@aws-cdk/cdk-explorer": "^0.0.0",
     "@aws-cdk/cloud-assembly-api": "2.3.0",
-    "@aws-cdk/cloud-assembly-schema": ">=54.13.0",
+    "@aws-cdk/cloud-assembly-schema": ">=54.14.0",
     "@aws-cdk/cloudformation-diff": "2.187.2",
     "@aws-cdk/cx-api": "^2",
     "@aws-cdk/private-tools": "^0.0.0",
-    "@aws-cdk/toolkit-lib": "^1.36.0",
+    "@aws-cdk/toolkit-lib": "^1.36.1",
     "@aws-sdk/client-appsync": "^3",
     "@aws-sdk/client-bedrock-agentcore-control": "^3",
     "@aws-sdk/client-cloudcontrol": "^3",
@@ -159,7 +159,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1132.1",
+  "version": "2.1133.0",
   "packageManager": "yarn@4.13.0",
   "types": "lib/index.d.ts",
   "exports": {