thinkwork-cli 0.12.11 → 0.12.12

package/dist/cli.js

@@ -2082,28 +2082,26 @@ async function runDeployCommand(opts, deps = {}) {
 }
 async function runLocalTerraformDeploy(opts) {
   const startTime = Date.now();
-  const stage = await resolveStage({ flag: opts.stage });
+  const initialStage = await resolveStage({ flag: opts.stage });
   const compCheck = validateComponent(opts.component);
   if (!compCheck.valid) {
     printError(compCheck.error);
     process.exit(1);
   }
   const identity = getAwsIdentity();
-  printHeader("deploy", stage, identity);
+  printHeader("deploy", initialStage, identity);
   if (!identity) {
     printWarning("Could not resolve AWS identity. Is the AWS CLI configured?");
   }
-  if (isProdLike(stage) && !opts.yes) {
-    const ok = await confirm(`  Stage "${stage}" is production-like. Deploy?`);
-    if (!ok) {
-      console.log("  Aborted.");
-      process.exit(0);
-    }
-  } else if (!opts.yes) {
-    const ok = await confirm(`  Deploy to stage "${stage}"?`);
-    if (!ok) {
-      console.log("  Aborted.");
-      process.exit(0);
+  const stage = await confirmLocalDeployStage(initialStage, opts);
+  if (!stage) {
+    console.log("  Aborted.");
+    process.exit(0);
+  }
+  if (stage !== initialStage) {
+    printHeader("deploy", stage, identity);
+    if (!identity) {
+      printWarning("Could not resolve AWS identity. Is the AWS CLI configured?");
     }
   }
   const terraformDir = process.env.THINKWORK_TERRAFORM_DIR || process.cwd();
@@ -2128,6 +2126,32 @@ async function runLocalTerraformDeploy(opts) {
   await runPostDeployProbe(stage);
   printSummary("deploy", stage, tiers, startTime);
 }
+async function confirmLocalDeployStage(initialStage, opts, deps = {}) {
+  if (opts.yes) return initialStage;
+  let stage = initialStage;
+  while (true) {
+    const ok = await (deps.confirm ?? confirm)(deployConfirmMessage(stage));
+    if (ok) return stage;
+    const canPromptForAnotherStage = deps.stdoutIsTty ?? Boolean(process.stdout.isTTY);
+    if (!canPromptForAnotherStage) return null;
+    const nextStage = (await promptAlternativeDeployStage(stage, deps.promptInput)).trim();
+    if (!nextStage) return null;
+    const check = validateStage(nextStage);
+    if (!check.valid) {
+      throw new Error(check.error);
+    }
+    stage = nextStage;
+  }
+}
+function deployConfirmMessage(stage) {
+  return isProdLike(stage) ? `  Stage "${stage}" is production-like. Deploy?` : `  Deploy to stage "${stage}"?`;
+}
+async function promptAlternativeDeployStage(currentStage, promptInput) {
+  const message = `Deployment stage to deploy instead of "${currentStage}" (blank to abort):`;
+  if (promptInput) return promptInput(message);
+  const { input: input21 } = await import("@inquirer/prompts");
+  return input21({ message });
+}
 function printEnterpriseDeploySummary(result) {
   const workflow = result.workflow;
   if (result.kind === "bootstrap") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkwork-cli",
-  "version": "0.12.11",
+  "version": "0.12.12",
   "description": "Thinkwork CLI — deploy, manage, and interact with your Thinkwork stack",
   "license": "Apache-2.0",
   "type": "module",