@aws-cdk/integ-runner 2.197.9 → 2.197.10

package/lib/workers/extract/index.js

@@ -4670,7 +4670,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.1115.0" };
+    module2.exports = { version: "2.1115.1" };
   }
 });
 
@@ -296734,9 +296734,10 @@ var require_split2 = __commonJS({
 
 // ../toolkit-lib/lib/api/cloud-assembly/private/exec.ts
 async function execInChildProcess(commandAndArgs, options = {}) {
+  const captureOutput = options.captureOutput ?? true;
   return new Promise((ok, fail) => {
     const proc = child_process2.spawn(commandAndArgs, {
-      stdio: ["ignore", "pipe", "pipe"],
+      stdio: captureOutput ? ["ignore", "pipe", "pipe"] : ["ignore", "inherit", "inherit"],
       detached: false,
       cwd: options.cwd,
       env: {
@@ -296766,11 +296767,13 @@ async function execInChildProcess(commandAndArgs, options = {}) {
       }
     });
     const stderr2 = new Array();
-    proc.stdout.pipe(split()).on("data", (line) => eventPublisher("data_stdout", line));
-    proc.stderr.pipe(split()).on("data", (line) => {
-      stderr2.push(line);
-      return eventPublisher("data_stderr", line);
-    });
+    if (captureOutput) {
+      proc.stdout.pipe(split()).on("data", (line) => eventPublisher("data_stdout", line));
+      proc.stderr.pipe(split()).on("data", (line) => {
+        stderr2.push(line);
+        return eventPublisher("data_stderr", line);
+      });
+    }
     proc.on("error", (e6) => {
       fail(AssemblyError.withCause(`Failed to execute CDK app: ${commandAndArgs}`, e6));
     });
@@ -296788,7 +296791,7 @@ async function execInChildProcess(commandAndArgs, options = {}) {
         if (options.errorCodeFile) {
           const contents = tryReadFile(options.errorCodeFile);
           if (contents) {
-            const errorInStdErr = contents.split("\n").find((c6) => stdErrString.includes(`${SYNTH_ERROR_CODE_MARKERS[0]}${c6}${SYNTH_ERROR_CODE_MARKERS[1]}`));
+            const errorInStdErr = contents.split("\n")[0];
             if (errorInStdErr) {
               error4.attachSynthesisErrorCode(errorInStdErr);
             }
@@ -296809,7 +296812,7 @@ function tryReadFile(name) {
     throw e6;
   }
 }
-var child_process2, import_fs7, split, SYNTH_ERROR_CODE_MARKERS;
+var child_process2, import_fs7, split;
 var init_exec = __esm({
   "../toolkit-lib/lib/api/cloud-assembly/private/exec.ts"() {
     "use strict";
@@ -296818,7 +296821,6 @@ var init_exec = __esm({
     init_toolkit_error();
     split = require_split2();
     __name(execInChildProcess, "execInChildProcess");
-    SYNTH_ERROR_CODE_MARKERS = ["\xAB", "\xBB"];
     __name(tryReadFile, "tryReadFile");
   }
 });
@@ -315220,6 +315222,36 @@ var init_promises = __esm({
   }
 });
 
+// ../toolkit-lib/lib/toolkit/private/count-assembly-results.ts
+function countAssemblyResults(span, assembly) {
+  const stacksRecursively = assembly.stacksRecursively;
+  span.incCounter("stacks", stacksRecursively.length);
+  span.incCounter("assemblies", asmCount(assembly));
+  span.incCounter("errorAnns", sum3(stacksRecursively.map((s6) => s6.messages.filter((m6) => m6.level === import_cloud_assembly_api14.SynthesisMessageLevel.ERROR).length)));
+  span.incCounter("warnings", sum3(stacksRecursively.map((s6) => s6.messages.filter((m6) => m6.level === import_cloud_assembly_api14.SynthesisMessageLevel.WARNING).length)));
+  const annotationErrorCodes = stacksRecursively.flatMap((s6) => Object.values(s6.metadata).flatMap((ms) => ms.filter((m6) => m6.type === ANNOTATION_ERROR_CODE_TYPE)));
+  for (const annotationErrorCode of annotationErrorCodes) {
+    span.incCounter(`errorAnn:${annotationErrorCode.data}`);
+  }
+  function asmCount(x6) {
+    return 1 + x6.nestedAssemblies.reduce((acc, asm) => acc + asmCount(asm.nestedAssembly), 0);
+  }
+  __name(asmCount, "asmCount");
+}
+function sum3(xs) {
+  return xs.reduce((a6, b6) => a6 + b6, 0);
+}
+var import_cloud_assembly_api14, ANNOTATION_ERROR_CODE_TYPE;
+var init_count_assembly_results = __esm({
+  "../toolkit-lib/lib/toolkit/private/count-assembly-results.ts"() {
+    "use strict";
+    import_cloud_assembly_api14 = __toESM(require_lib3());
+    __name(countAssemblyResults, "countAssemblyResults");
+    __name(sum3, "sum");
+    ANNOTATION_ERROR_CODE_TYPE = "aws:cdk:error-code";
+  }
+});
+
 // ../toolkit-lib/lib/toolkit/toolkit.ts
 function isFileEvent(event) {
   return FILE_EVENTS.includes(event);
@@ -315242,28 +315274,13 @@ async function synthAndMeasure(ioHelper, cx, selectStacks) {
 function zeroTime() {
   return { asMs: 0, asSec: 0 };
 }
-function countAssemblyResults(span, assembly) {
-  const stacksRecursively = assembly.stacksRecursively;
-  span.incCounter("stacks", stacksRecursively.length);
-  span.incCounter("assemblies", asmCount(assembly));
-  span.incCounter("errorAnns", sum3(stacksRecursively.map((s6) => s6.messages.filter((m6) => m6.level === import_cloud_assembly_api14.SynthesisMessageLevel.ERROR).length)));
-  span.incCounter("warnings", sum3(stacksRecursively.map((s6) => s6.messages.filter((m6) => m6.level === import_cloud_assembly_api14.SynthesisMessageLevel.WARNING).length)));
-  function asmCount(x6) {
-    return 1 + x6.nestedAssemblies.reduce((acc, asm) => acc + asmCount(asm.nestedAssembly), 0);
-  }
-  __name(asmCount, "asmCount");
-}
-function sum3(xs) {
-  return xs.reduce((a6, b6) => a6 + b6, 0);
-}
-var import_dispose_polyfill5, path31, cxapi8, import_cloud_assembly_api14, import_cloud_assembly_schema7, chalk23, fs35, FILE_EVENTS, Toolkit;
+var import_dispose_polyfill5, path31, cxapi8, import_cloud_assembly_schema7, chalk23, fs35, FILE_EVENTS, Toolkit;
 var init_toolkit = __esm({
   "../toolkit-lib/lib/toolkit/toolkit.ts"() {
     "use strict";
     import_dispose_polyfill5 = __toESM(require_dispose_polyfill());
     path31 = __toESM(require("node:path"));
     cxapi8 = __toESM(require_lib3());
-    import_cloud_assembly_api14 = __toESM(require_lib3());
     import_cloud_assembly_schema7 = __toESM(require_lib2());
     chalk23 = __toESM(require_source());
     init_esm2();
@@ -315305,6 +315322,7 @@ var init_toolkit = __esm({
     init_concurrency();
     init_glob_matcher();
     init_promises();
+    init_count_assembly_results();
     FILE_EVENTS = [EVENTS.ADD, EVENTS.ADD_DIR, EVENTS.CHANGE, EVENTS.UNLINK, EVENTS.UNLINK_DIR];
     __name(isFileEvent, "isFileEvent");
     Toolkit = class extends CloudAssemblySourceBuilder {
@@ -316383,8 +316401,6 @@ ${deployResult.stackArn}`));
     __name(stacksOpt, "stacksOpt");
     __name(synthAndMeasure, "synthAndMeasure");
     __name(zeroTime, "zeroTime");
-    __name(countAssemblyResults, "countAssemblyResults");
-    __name(sum3, "sum");
   }
 });
 

package/package.json

@@ -66,12 +66,12 @@
     "@aws-cdk/aws-service-spec": "^0.1.167",
     "@aws-cdk/cdk-assets-lib": "1.4.2",
     "@aws-cdk/cloud-assembly-api": "2.2.1",
-    "@aws-cdk/cloud-assembly-schema": ">=53.10.0",
+    "@aws-cdk/cloud-assembly-schema": ">=53.11.0",
     "@aws-cdk/cloudformation-diff": "2.186.0",
     "@aws-cdk/cx-api": "^2",
-    "@aws-cdk/toolkit-lib": "1.20.0",
+    "@aws-cdk/toolkit-lib": "1.20.1",
     "@aws-sdk/client-cloudformation": "^3",
-    "aws-cdk": "2.1115.0",
+    "aws-cdk": "2.1115.1",
     "chalk": "^4",
     "chokidar": "^4",
     "fs-extra": "^9",
@@ -80,7 +80,7 @@
   },
   "dependencies": {
     "@aws-cdk/aws-service-spec": "0.1.167",
-    "aws-cdk": "2.1115.0"
+    "aws-cdk": "2.1115.1"
   },
   "keywords": [
     "aws",
@@ -95,7 +95,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.197.9",
+  "version": "2.197.10",
   "types": "lib/index.d.ts",
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }