@envsync-cloud/deploy-cli 0.6.5 → 0.6.7

package/README.md

@@ -40,7 +40,7 @@ bunx @envsync-cloud/deploy-cli <command>
 ```text
 envsync-deploy preinstall
 envsync-deploy setup
-envsync-deploy bootstrap [--dry-run]
+envsync-deploy bootstrap [--dry-run] [--force]
 envsync-deploy deploy [--dry-run]
 envsync-deploy health [--json]
 envsync-deploy upgrade [--dry-run]
@@ -71,7 +71,7 @@ Bootstrap infra, migrations, RustFS, and OpenFGA:
 npx @envsync-cloud/deploy-cli bootstrap
 ```
 
-`bootstrap` is destructive. It removes the existing EnvSync stack, matching containers, network, and managed volumes before rebuilding, and requires typing `ARE YOU SURE?` to continue.
+`bootstrap` is destructive. It removes the existing EnvSync stack, matching containers, network, and managed volumes before rebuilding, and requires typing `yes` to continue. Use `--force` to bypass the prompt in automation or other non-interactive environments.
 
 Deploy the pending API and frontend services:
 
@@ -106,6 +106,7 @@ Preview mutating commands without changing the host:
 
 ```bash
 npx @envsync-cloud/deploy-cli bootstrap --dry-run
+npx @envsync-cloud/deploy-cli bootstrap --force
 npx @envsync-cloud/deploy-cli deploy --dry-run
 ```
 

package/dist/index.js

@@ -48,7 +48,7 @@ var REQUIRED_BOOTSTRAP_ENV_KEYS = [
   "OPENFGA_MODEL_ID"
 ];
 var SEMVER_VERSION_RE = /^\d+\.\d+\.\d+$/;
-var currentOptions = { dryRun: false };
+var currentOptions = { dryRun: false, force: false };
 function formatShellArg(arg) {
   if (/^[A-Za-z0-9_./:@%+=,-]+$/.test(arg)) return arg;
   return JSON.stringify(arg);
@@ -221,7 +221,7 @@ async function ask(question, fallback = "") {
 }
 async function askRequired(question) {
   if (!process.stdin.isTTY) {
-    throw new Error(`${question} confirmation requires an interactive terminal.`);
+    throw new Error("Bootstrap confirmation requires an interactive terminal. Re-run with --force to bypass the prompt.");
   }
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   return await new Promise((resolve) => {
@@ -635,6 +635,10 @@ function renderTraefikDynamicConfig(config) {
     "      loadBalancer:",
     "        servers:",
     "          - url: http://web_nginx:8080",
+    "    browser-otlp:",
+    "      loadBalancer:",
+    "        servers:",
+    `          - url: http://clickstack:${config.services.clickstack_otlp_http_port}`,
     "  routers:",
     "    landing-router:",
     `      rule: Host(\`${hosts.landing}\`)`,
@@ -646,6 +650,18 @@ function renderTraefikDynamicConfig(config) {
     "      service: web",
     "      entryPoints: [websecure]",
     "      tls: {}",
+    "    landing-otlp-router:",
+    `      rule: Host(\`${hosts.landing}\`) && (PathPrefix(\`/v1/traces\`) || PathPrefix(\`/v1/logs\`) || PathPrefix(\`/v1/metrics\`))`,
+    "      service: browser-otlp",
+    "      priority: 100",
+    "      entryPoints: [websecure]",
+    "      tls: {}",
+    "    web-otlp-router:",
+    `      rule: Host(\`${hosts.app}\`) && (PathPrefix(\`/v1/traces\`) || PathPrefix(\`/v1/logs\`) || PathPrefix(\`/v1/metrics\`))`,
+    "      service: browser-otlp",
+    "      priority: 100",
+    "      entryPoints: [websecure]",
+    "      tls: {}",
     "    api-router:",
     `      rule: Host(\`${hosts.api}\`)`,
     "      service: envsync-api",
@@ -666,15 +682,17 @@ function renderNginxConf(kind) {
     "}"
   ].join("\n") + "\n";
 }
-function renderFrontendRuntimeConfig(config) {
+function renderFrontendRuntimeConfig(config, kind) {
   const hosts = domainMap(config.domain.root_domain);
+  const otelEndpoint = kind === "web" ? `https://${hosts.app}` : `https://${hosts.landing}`;
   return `window.__ENVSYNC_RUNTIME_CONFIG__ = ${JSON.stringify({
     apiBaseUrl: `https://${hosts.api}`,
     appBaseUrl: `https://${hosts.app}`,
     authBaseUrl: `https://${hosts.auth}`,
     keycloakRealm: config.auth.keycloak_realm,
     webClientId: config.auth.web_client_id,
-    apiDocsUrl: `https://${hosts.api}/docs`
+    apiDocsUrl: `https://${hosts.api}/docs`,
+    otelEndpoint
   }, null, 2)};
 `;
 }
@@ -1090,7 +1108,29 @@ function waitForTcpService(config, label, host, port, timeoutSeconds = 120) {
   throw new Error(`Timed out waiting for ${label} at ${host}:${port}`);
 }
 function waitForHttpService(config, label, url, timeoutSeconds = 120) {
-  waitForCommand(config, `${label} HTTP readiness`, "alpine:3.20", `wget -q -O /dev/null ${JSON.stringify(url)}`, timeoutSeconds);
+  if (currentOptions.dryRun) {
+    logDryRun(`Would wait for ${label} at ${url}`);
+    return;
+  }
+  logStep(`Waiting for ${label} on ${url}`);
+  const deadline = Date.now() + timeoutSeconds * 1e3;
+  while (Date.now() < deadline) {
+    if (commandSucceeds("docker", [
+      "run",
+      "--rm",
+      "--network",
+      stackNetworkName(config),
+      "alpine:3.20",
+      "sh",
+      "-lc",
+      `wget -q -O /dev/null ${JSON.stringify(url)}`
+    ])) {
+      logSuccess(`${label} is ready`);
+      return;
+    }
+    sleepSeconds(2);
+  }
+  throw new Error(`Timed out waiting for ${label} at ${url}`);
 }
 function runOpenFgaMigrate(config, runtimeEnv) {
   logStep("Running OpenFGA datastore migrations");
@@ -1307,9 +1347,14 @@ async function confirmBootstrapReset(config) {
     logWarn("Containers: none currently matched");
   }
   logWarn("This removes existing deployment data for the managed EnvSync services.");
-  const response = await askRequired(chalk.bold.red('Type "ARE YOU SURE?" to continue:'));
-  if (response !== "ARE YOU SURE?") {
-    throw new Error("Bootstrap aborted. Confirmation did not match 'ARE YOU SURE?'.");
+  if (currentOptions.force) {
+    logWarn("Skipping confirmation because --force was provided.");
+    logSuccess("Destructive bootstrap reset confirmed");
+    return;
+  }
+  const response = await askRequired(chalk.bold.red('Type "yes" to continue:'));
+  if (response !== "yes") {
+    throw new Error("Bootstrap aborted. Confirmation did not match 'yes'.");
   }
   logSuccess("Destructive bootstrap reset confirmed");
 }
@@ -1480,9 +1525,8 @@ async function cmdBootstrap() {
   assertSwarmManager();
   if (currentOptions.dryRun) {
     logWarn("Dry-run mode: bootstrap reset will be previewed but not executed.");
-  } else {
-    await confirmBootstrapReset(config);
   }
+  await confirmBootstrapReset(config);
   cleanupBootstrapState(config);
   ensureRepoCheckout(config);
   writeDeployArtifacts(config, nextGenerated);
@@ -1513,7 +1557,7 @@ async function cmdBootstrap() {
     run("docker", ["stack", "deploy", "-c", BOOTSTRAP_STACK_FILE, config.services.stack_name]);
     logSuccess("Runtime bootstrap stack deployed");
   }
-  waitForHttpService(config, "keycloak", "http://keycloak:8080/health/ready", 180);
+  waitForHttpService(config, "keycloak management readiness", "http://keycloak:9000/health/ready", 180);
   waitForHttpService(config, "openfga", "http://openfga:8090/stores");
   waitForTcpService(config, "minikms", "minikms", 50051);
   const initResult = runBootstrapInit(config);
@@ -1561,8 +1605,8 @@ async function cmdDeploy() {
   }
   extractStaticBundle(config.images.web, `${RELEASES_ROOT}/web/current`);
   extractStaticBundle(config.images.landing, `${RELEASES_ROOT}/landing/current`);
-  writeFileMaybe(`${RELEASES_ROOT}/web/current/runtime-config.js`, renderFrontendRuntimeConfig(config));
-  writeFileMaybe(`${RELEASES_ROOT}/landing/current/runtime-config.js`, renderFrontendRuntimeConfig(config));
+  writeFileMaybe(`${RELEASES_ROOT}/web/current/runtime-config.js`, renderFrontendRuntimeConfig(config, "web"));
+  writeFileMaybe(`${RELEASES_ROOT}/landing/current/runtime-config.js`, renderFrontendRuntimeConfig(config, "landing"));
   if (currentOptions.dryRun) {
     logDryRun(`Would deploy full stack for ${config.services.stack_name}`);
     logCommand("docker", ["stack", "deploy", "-c", STACK_FILE, config.services.stack_name]);
@@ -1770,9 +1814,10 @@ async function main() {
   const command = argv[0];
   const args = argv.slice(1);
   currentOptions = {
-    dryRun: args.includes("--dry-run")
+    dryRun: args.includes("--dry-run"),
+    force: args.includes("--force")
   };
-  const positionals = args.filter((arg) => arg !== "--dry-run");
+  const positionals = args.filter((arg) => arg !== "--dry-run" && arg !== "--force");
   switch (command) {
     case "preinstall":
       await cmdPreinstall();
@@ -1803,7 +1848,7 @@ async function main() {
       break;
     default:
       console.log(
-        "Usage: envsync-deploy <preinstall|setup|bootstrap|deploy|health|upgrade|upgrade-deps|backup|restore> [--dry-run]"
+        "Usage: envsync-deploy <preinstall|setup|bootstrap|deploy|health|upgrade|upgrade-deps|backup|restore> [--dry-run] [--force]"
       );
       process.exit(command ? 1 : 0);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envsync-cloud/deploy-cli",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "CLI for self-hosted EnvSync deployment on Docker Swarm",
   "type": "module",
   "bin": {