@continuous-excellence/ze-great-dashboard-aws 0.14.4 → 0.14.5

package/dist/cli.js

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 
 // packages/aws/src/cli.ts
+import { execFile as execFile3 } from "node:child_process";
 import { readFile as readFile5, writeFile as writeFile3 } from "node:fs/promises";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { promisify as promisify3 } from "node:util";
 import { parse as parse3 } from "yaml";
 
 // packages/aws/src/doctor.ts
@@ -1538,7 +1540,7 @@ function changeSetCommands(input) {
 }
 var githubOidcProvider = {
   name: "github-oidc",
-  async prerequisite(config, runner) {
+  async prerequisite(config, runner2) {
     const repository = config.githubOidc?.repository;
     if (!repository)
       return {
@@ -1546,7 +1548,7 @@ var githubOidcProvider = {
         blocking: false,
         detail: "GitHub repository is absent from the manifest."
       };
-    if (!runner)
+    if (!runner2)
       return {
         status: "unverified",
         blocking: false,
@@ -1554,7 +1556,7 @@ var githubOidcProvider = {
       };
     try {
       const response = JSON.parse(
-        await runner.execute("gh", ["api", `repos/${repository}/actions/oidc/customization/sub`])
+        await runner2.execute("gh", ["api", `repos/${repository}/actions/oidc/customization/sub`])
       );
       const keys = response.include_claim_keys;
       if (response.use_default === false && Array.isArray(keys) && githubSubjectKeys.every((key) => keys.includes(key)))
@@ -1850,10 +1852,10 @@ function repositoryParts(repository) {
 function accountFromArn(arn) {
   return arn.match(/^arn:[^:]+:iam::(\d+):oidc-provider\//)?.[1];
 }
-async function optional(runner, command, args2) {
-  if (!runner) return void 0;
+async function optional(runner2, command, args2) {
+  if (!runner2) return void 0;
   try {
-    return await runner.execute(command, args2);
+    return await runner2.execute(command, args2);
   } catch {
     return void 0;
   }
@@ -1961,8 +1963,8 @@ async function bootstrapPreflight(input) {
         nextOperation: "Complete the missing manifest fields, then rerun bootstrap preflight."
       })
     };
-  const runner = input.runner;
-  const identityRaw = await optional(runner, "aws", [
+  const runner2 = input.runner;
+  const identityRaw = await optional(runner2, "aws", [
     "sts",
     "get-caller-identity",
     "--output",
@@ -1988,7 +1990,7 @@ async function bootstrapPreflight(input) {
         detail: `AWS account ${identity.Account} does not match provider account ${providerAccount}.`
       }
     );
-  const regionRaw = await optional(runner, "aws", ["configure", "get", "region"]);
+  const regionRaw = await optional(runner2, "aws", ["configure", "get", "region"]);
   if (!regionRaw?.trim())
     checks.push({
       name: "aws-region",
@@ -2003,7 +2005,7 @@ async function bootstrapPreflight(input) {
         detail: `AWS Region ${regionRaw.trim()} does not match manifest ${input.config.region}.`
       }
     );
-  const providerRaw = await optional(runner, "aws", [
+  const providerRaw = await optional(runner2, "aws", [
     "iam",
     "get-open-id-connect-provider",
     "--open-id-connect-provider-arn",
@@ -2017,7 +2019,7 @@ async function bootstrapPreflight(input) {
     } : absent(providerRaw) ? { name: "oidc-provider", status: "missing", detail: "OIDC provider does not exist." } : { name: "oidc-provider", status: "ready", detail: "OIDC provider exists." }
   );
   const repository = input.config.githubOidc?.repository ?? "";
-  const repoRaw = await optional(runner, "gh", ["api", `repos/${repository}`]);
+  const repoRaw = await optional(runner2, "gh", ["api", `repos/${repository}`]);
   const repo = parseOrUnavailable(repoRaw);
   if (!repoRaw)
     checks.push({
@@ -2043,7 +2045,7 @@ async function bootstrapPreflight(input) {
       status: "ready",
       detail: "GitHub repository identity matches the manifest."
     });
-  const environmentRaw = await optional(runner, "gh", [
+  const environmentRaw = await optional(runner2, "gh", [
     "api",
     `repos/${repository}/environments/${input.config.githubOidc?.environment}`
   ]);
@@ -2062,7 +2064,7 @@ async function bootstrapPreflight(input) {
       detail: "GitHub Environment exists; its policy is administrator-owned context."
     }
   );
-  const subject = await (input.provider ?? githubOidcProvider).prerequisite(input.config, runner);
+  const subject = await (input.provider ?? githubOidcProvider).prerequisite(input.config, runner2);
   checks.push({
     name: "immutable-subject",
     status: subject.status === "immutable-subject-required" ? "mismatch" : subject.status,
@@ -2082,9 +2084,8 @@ async function bootstrapPreflight(input) {
 function quote(args2) {
   return args2.map((arg) => `'${arg.replaceAll("'", `'\\"'\\"'`)}'`).join(" ");
 }
-async function bootstrapGuide(input) {
-  const handoff = await bootstrapHandoff(input);
-  const plan = await bootstrapPlan(input.config);
+async function bootstrapGuideReport(input) {
+  const [handoff, plan] = await Promise.all([bootstrapHandoff(input), bootstrapPlan(input.config)]);
   const lines = [
     `Phase: ${handoff.phase}`,
     `Package version: ${plan.packageVersion}`,
@@ -2122,8 +2123,8 @@ async function bootstrapGuide(input) {
     for (const command of verified.githubEnvironmentInstructions) lines.push(quote(command));
   }
   lines.push("", ...formatBootstrapRemediationText(plan.remediation));
-  return `${lines.join("\n")}
-`;
+  return { handoff, plan, guide: `${lines.join("\n")}
+` };
 }
 
 // packages/aws/src/index.ts
@@ -2468,6 +2469,7 @@ async function runDoctor(options, dependencies = actualDependencies) {
 
 // packages/aws/src/cli.ts
 var args = process.argv.slice(2);
+var runCommand = promisify3(execFile3);
 var option = (name, fallback) => {
   const i2 = args.indexOf(name);
   return i2 >= 0 ? args[i2 + 1] : fallback;
@@ -2571,6 +2573,24 @@ function printBootstrap(value2, text, shell, defaultFormat = "json") {
   } else if (format === "text") console.log(text);
   else console.log(JSON.stringify(value2));
 }
+var runner = {
+  async execute(command, commandArgs) {
+    return (await runCommand(command, commandArgs)).stdout.trim();
+  }
+};
+var preflightRunner = {
+  async execute(command, commandArgs) {
+    try {
+      return await runner.execute(command, commandArgs);
+    } catch (error) {
+      if (error && typeof error === "object" && "stderr" in error) {
+        const stderr = error.stderr;
+        if (typeof stderr === "string" && /not found|404|nosuchentity/i.test(stderr)) return stderr;
+      }
+      throw error;
+    }
+  }
+};
 async function templateParameters(mode = "lambda") {
   const template = await cloudFormationTemplate(mode);
   const block = template.match(/^Parameters:\n[\s\S]*?(?=^[A-Za-z][A-Za-z0-9]*:\s*$)/m)?.[0];
@@ -2694,11 +2714,7 @@ try {
         githubOidcStackPath: option("--github-oidc-stack-json")
       },
       {
-        async execute(command, commandArgs) {
-          const { execFile: execFile3 } = await import("node:child_process");
-          const { promisify: promisify3 } = await import("node:util");
-          return (await promisify3(execFile3)(command, commandArgs)).stdout.trim();
-        },
+        execute: runner.execute,
         async fetch(url) {
           return fetch(url);
         },
@@ -2772,13 +2788,6 @@ try {
         if (!(error && typeof error === "object" && "code" in error && error.code === "ENOENT"))
           throw error;
       }
-      const runner = {
-        async execute(command, commandArgs) {
-          const { execFile: execFile3 } = await import("node:child_process");
-          const { promisify: promisify3 } = await import("node:util");
-          return (await promisify3(execFile3)(command, commandArgs)).stdout.trim();
-        }
-      };
       const manifest = await scaffoldBootstrapManifest({
         slug: requiredOption("--slug"),
         repository: requiredOption("--repository"),
@@ -2802,23 +2811,7 @@ try {
       const config = await bootstrapConfig();
       if (action === "preflight") {
         requiredOption("--config");
-        const runner = {
-          async execute(command, commandArgs) {
-            const { execFile: execFile3 } = await import("node:child_process");
-            const { promisify: promisify3 } = await import("node:util");
-            try {
-              return (await promisify3(execFile3)(command, commandArgs)).stdout.trim();
-            } catch (error) {
-              if (error && typeof error === "object" && "stderr" in error) {
-                const stderr = error.stderr;
-                if (typeof stderr === "string" && /not found|404|nosuchentity/i.test(stderr))
-                  return stderr;
-              }
-              throw error;
-            }
-          }
-        };
-        const result = await bootstrapPreflight({ config, runner });
+        const result = await bootstrapPreflight({ config, runner: preflightRunner });
         printBootstrap(
           result,
           [
@@ -2834,24 +2827,7 @@ try {
         const configPath = requiredOption("--config");
         const coreStackPath = option("--core-stack-json");
         const githubStackPath = option("--github-oidc-stack-json");
-        const runner = {
-          async execute(command, commandArgs) {
-            const { execFile: execFile3 } = await import("node:child_process");
-            const { promisify: promisify3 } = await import("node:util");
-            return (await promisify3(execFile3)(command, commandArgs)).stdout.trim();
-          }
-        };
-        const handoff = await bootstrapHandoff({
-          config,
-          configPath,
-          workDir: option("--work-dir"),
-          coreStack: coreStackPath ? JSON.parse(await readFile5(coreStackPath, "utf8")) : void 0,
-          coreStackPath,
-          githubOidcStack: githubStackPath ? JSON.parse(await readFile5(githubStackPath, "utf8")) : void 0,
-          githubOidcStackPath: githubStackPath,
-          runner
-        });
-        const guide = await bootstrapGuide({
+        const report = await bootstrapGuideReport({
           config,
           configPath,
           workDir: option("--work-dir"),
@@ -2862,8 +2838,12 @@ try {
           runner
         });
         printBootstrap(
-          { handoff, guide, remediation: handoff.remediation },
-          guide,
+          {
+            handoff: report.handoff,
+            guide: report.guide,
+            remediation: report.handoff.remediation
+          },
+          report.guide,
           void 0,
           "text"
         );
@@ -2871,13 +2851,6 @@ try {
         const configPath = requiredOption("--config");
         const coreStackPath = option("--core-stack-json");
         const githubStackPath = option("--github-oidc-stack-json");
-        const runner = {
-          async execute(command, commandArgs) {
-            const { execFile: execFile3 } = await import("node:child_process");
-            const { promisify: promisify3 } = await import("node:util");
-            return (await promisify3(execFile3)(command, commandArgs)).stdout.trim();
-          }
-        };
         const handoff = await bootstrapHandoff({
           config,
           configPath,
@@ -2948,15 +2921,11 @@ ${plan.notes.join("\n")}`);
         } else console.log(JSON.stringify(plan));
       } else if (action === "check") {
         requiredOption("--config");
-        const { execFile: execFile3 } = await import("node:child_process");
-        const { promisify: promisify3 } = await import("node:util");
         const result = await checkBootstrap(
           config,
           { resourceDrift: args.includes("--resource-drift") },
           {
-            async execute(command, commandArgs) {
-              return (await promisify3(execFile3)(command, commandArgs)).stdout.trim();
-            }
+            execute: runner.execute
           }
         );
         if (outputFormat() === "text") process.stdout.write(formatBootstrapCheckText(result));
@@ -2997,15 +2966,16 @@ ${plan.notes.join("\n")}`);
         }
         await writeFile3(output, `${JSON.stringify(parameters, null, 2)}
 `);
+        const remediation = (await bootstrapPlan(config)).remediation;
         printBootstrap(
           {
             output,
             kind,
             preservedDeployedValues: Boolean(deployedStackPath),
-            remediation: (await bootstrapPlan(config)).remediation
+            remediation
           },
           `Wrote ${output}. Next: review and execute the generated ${kind} change set.
-${formatBootstrapRemediationText((await bootstrapPlan(config)).remediation).join("\n")}`
+${formatBootstrapRemediationText(remediation).join("\n")}`
         );
       } else if (action === "change-set") {
         const kind = bootstrapKind();
@@ -3044,7 +3014,7 @@ ${formatBootstrapRemediationText((await bootstrapPlan(config)).remediation).join
           reviewRequired: true,
           awsCommand,
           shellCommand: args.includes("--format-shell") ? shellCommand(awsCommand) : void 0,
-          remediation: (await bootstrapPlan(config)).remediation
+          remediation: plan.remediation
         };
         printBootstrap(
           handoff,

package/dist/guided.d.ts

@@ -1,4 +1,4 @@
-import { type BootstrapConfig, type ComputeMode } from './bootstrap.js';
+import { type BootstrapConfig, bootstrapPlan, type ComputeMode } from './bootstrap.js';
 import { type BootstrapProvider, bootstrapHandoff, type CommandRunner } from './handoff.js';
 import { type BootstrapRemediation } from './remediation.js';
 export type BootstrapCheckStatus = 'ready' | 'missing' | 'mismatch' | 'unverified';
@@ -12,6 +12,11 @@ export type BootstrapPreflight = {
     checks: BootstrapPreflightCheck[];
     remediation: BootstrapRemediation;
 };
+export type BootstrapGuideReport = {
+    handoff: Awaited<ReturnType<typeof bootstrapHandoff>>;
+    plan: Awaited<ReturnType<typeof bootstrapPlan>>;
+    guide: string;
+};
 export type BootstrapInitInput = {
     mode?: ComputeMode;
     slug: string;
@@ -33,4 +38,5 @@ export declare function bootstrapPreflight(input: {
     runner?: CommandRunner;
     provider?: BootstrapProvider;
 }): Promise<BootstrapPreflight>;
+export declare function bootstrapGuideReport(input: Parameters<typeof bootstrapHandoff>[0]): Promise<BootstrapGuideReport>;
 export declare function bootstrapGuide(input: Parameters<typeof bootstrapHandoff>[0]): Promise<string>;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { ComputeMode } from './bootstrap.js';
 export { type BootstrapConfig, type BootstrapConsistency, type BootstrapKind, type BootstrapPlan, type BootstrapTemplateInspection, bootstrapConsistency, bootstrapContractVersion, bootstrapPlan, bootstrapTemplate, bootstrapTemplatePath, bootstrapTemplateRevision, type CloudFormationParameterValue, type ComputeMode, computeMode, coreBootstrapOutputs, type DeployedBootstrapStack, deployedBootstrapStack, mergeBootstrapParameters, requireComputeMode, requiredBootstrapParameters, resolveComputeMode, } from './bootstrap.js';
 export { type BootstrapCheck, type BootstrapCheckDependencies, type BootstrapResourceDifference, type BootstrapResourceDrift, type BootstrapResourceDriftResult, type BootstrapStackCheck, checkBootstrap, formatBootstrapCheckText, } from './bootstrap-check.js';
-export { type BootstrapCheckStatus, type BootstrapInitInput, type BootstrapPreflight, type BootstrapPreflightCheck, bootstrapGuide, bootstrapPreflight, scaffoldBootstrapManifest, } from './guided.js';
+export { type BootstrapCheckStatus, type BootstrapGuideReport, type BootstrapInitInput, type BootstrapPreflight, type BootstrapPreflightCheck, bootstrapGuide, bootstrapGuideReport, bootstrapPreflight, scaffoldBootstrapManifest, } from './guided.js';
 export { type BootstrapHandoff, type BootstrapPhase, type BootstrapProvider, type BootstrapVerification, bootstrapHandoff, type CommandRunner, githubOidcProvider, verifyBootstrap, } from './handoff.js';
 export { type BootstrapAffectedStack, type BootstrapRemediation, type BootstrapRemediationInput, bootstrapRemediation, formatBootstrapRemediationText, } from './remediation.js';
 export type ReleaseMetadata = {

package/dist/index.js

@@ -2069,9 +2069,8 @@ async function bootstrapPreflight(input) {
 function quote(args) {
   return args.map((arg) => `'${arg.replaceAll("'", `'\\"'\\"'`)}'`).join(" ");
 }
-async function bootstrapGuide(input) {
-  const handoff = await bootstrapHandoff(input);
-  const plan = await bootstrapPlan(input.config);
+async function bootstrapGuideReport(input) {
+  const [handoff, plan] = await Promise.all([bootstrapHandoff(input), bootstrapPlan(input.config)]);
   const lines = [
     `Phase: ${handoff.phase}`,
     `Package version: ${plan.packageVersion}`,
@@ -2109,8 +2108,11 @@ async function bootstrapGuide(input) {
     for (const command of verified.githubEnvironmentInstructions) lines.push(quote(command));
   }
   lines.push("", ...formatBootstrapRemediationText(plan.remediation));
-  return `${lines.join("\n")}
-`;
+  return { handoff, plan, guide: `${lines.join("\n")}
+` };
+}
+async function bootstrapGuide(input) {
+  return (await bootstrapGuideReport(input)).guide;
 }
 
 // packages/aws/src/index.ts
@@ -2288,6 +2290,7 @@ export {
   bootstrapConsistency,
   bootstrapContractVersion,
   bootstrapGuide,
+  bootstrapGuideReport,
   bootstrapHandoff,
   bootstrapPlan,
   bootstrapPreflight,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuous-excellence/ze-great-dashboard-aws",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "type": "module",
   "description": "AWS Lambda and CloudFormation adapter for Ze Great Dashboard.",
   "keywords": [