@varde-flyt/vfac 0.1.0 → 0.2.0-rc.1

package/dist/vfac.mjs

@@ -7384,7 +7384,7 @@ var VALUED = /* @__PURE__ */ new Set([
   "region",
   "profile"
 ]);
-var BOOLEAN = /* @__PURE__ */ new Set(["help", "version", "yes"]);
+var BOOLEAN = /* @__PURE__ */ new Set(["help", "version", "yes", "wait"]);
 var REPEATABLE = /* @__PURE__ */ new Set(["secret"]);
 function parseArgs(argv) {
   const command = [];
@@ -7471,6 +7471,10 @@ function sessionUsable(session, endpoint, now, keyId) {
 }
 
 // src/client.ts
+var REQUEST_TIMEOUT_MS = 6e4;
+function requestSignal() {
+  return typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function" ? AbortSignal.timeout(REQUEST_TIMEOUT_MS) : void 0;
+}
 async function call(args) {
   const url = new URL(args.path, args.endpoint);
   if (url.origin !== new URL(args.endpoint).origin) {
@@ -7488,7 +7492,8 @@ async function call(args) {
         authorization: `Bearer ${args.token}`,
         ...args.body === void 0 ? {} : { "content-type": "application/json" }
       },
-      ...args.body === void 0 ? {} : { body: JSON.stringify(args.body) }
+      ...args.body === void 0 ? {} : { body: JSON.stringify(args.body) },
+      signal: requestSignal()
     });
   } catch (error) {
     return {
@@ -7549,7 +7554,8 @@ async function signIn(args) {
       method: "POST",
       headers: { "content-type": "application/json" },
       body: JSON.stringify(credential),
-      redirect: "manual"
+      redirect: "manual",
+      signal: requestSignal()
     });
   } catch (error) {
     return {
@@ -7634,7 +7640,8 @@ async function probeMachineApi(args) {
   try {
     response = await doFetch(new URL("/api/v1", args.endpoint), {
       method: "GET",
-      redirect: "manual"
+      redirect: "manual",
+      signal: requestSignal()
     });
   } catch (error) {
     return {
@@ -7759,7 +7766,7 @@ async function ensureSession(args) {
   if (!checked.ok) return { ok: false, message: checked.message };
   const endpoint = checked.endpoint;
   const credential = credentialFromEnvironment();
-  if (sessionUsable(stored.session, endpoint, args.now ?? /* @__PURE__ */ new Date(), credential?.keyId)) {
+  if (args.forceExchange !== true && sessionUsable(stored.session, endpoint, args.now ?? /* @__PURE__ */ new Date(), credential?.keyId)) {
     return { ok: true, ready: { endpoint, token: stored.session.token, stored } };
   }
   const signedIn = await signIn({
@@ -7775,6 +7782,133 @@ function resolveProject(flag, stored) {
   return flag ?? stored.context?.projectId ?? null;
 }
 
+// src/operations.ts
+var OPERATION_STATUSES = [
+  "PENDING",
+  "RUNNING",
+  "SUCCEEDED",
+  "FAILED",
+  "CANCELLED"
+];
+var TERMINAL_STATUSES = ["SUCCEEDED", "FAILED", "CANCELLED"];
+var POLL_INTERVAL_MS = 5e3;
+var MAX_WAIT_MS = 60 * 60 * 1e3;
+function withProject(path, projectId) {
+  return projectId === null ? path : `${path}?project=${encodeURIComponent(projectId)}`;
+}
+function operationPath(operationId, projectId) {
+  return withProject(`/api/v1/operations/${encodeURIComponent(operationId)}`, projectId);
+}
+function classify(data) {
+  const status = data["status"];
+  if (typeof status !== "string") return "unknown";
+  if (TERMINAL_STATUSES.includes(status)) return "terminal";
+  if (OPERATION_STATUSES.includes(status)) return "working";
+  return "unknown";
+}
+async function readOperation(args) {
+  const result = await call({
+    endpoint: args.endpoint,
+    path: operationPath(args.operationId, args.projectId),
+    token: args.token,
+    ...args.fetchImpl ? { fetchImpl: args.fetchImpl } : {}
+  });
+  return result.ok ? { ok: true, data: result.data } : { ok: false, error: result.error };
+}
+async function waitForOperation(args) {
+  const deps = args.deps ?? {};
+  const sleep = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+  const now = deps.now ?? (() => Date.now());
+  const deadline = now() + MAX_WAIT_MS;
+  let token = args.token;
+  let refreshed = false;
+  let last = null;
+  for (; ; ) {
+    const read = await readOperation({
+      endpoint: args.endpoint,
+      token,
+      operationId: args.operationId,
+      projectId: args.projectId,
+      ...deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}
+    });
+    if (!read.ok) {
+      if (read.error.status === 401 && !refreshed && deps.refreshToken) {
+        refreshed = true;
+        const next = await deps.refreshToken();
+        if (next !== null) {
+          token = next;
+          continue;
+        }
+      }
+      return { kind: "read-failed", error: read.error };
+    }
+    last = read.data;
+    const verdict = classify(read.data);
+    if (verdict === "terminal") {
+      return { kind: "settled", status: String(read.data["status"]), data: read.data };
+    }
+    if (verdict === "unknown") {
+      return { kind: "unknown-status", status: String(read.data["status"]), data: read.data };
+    }
+    args.onProgress?.(read.data);
+    if (now() + POLL_INTERVAL_MS >= deadline) return { kind: "timed-out", data: last };
+    await sleep(POLL_INTERVAL_MS);
+  }
+}
+function renderOperation(operationId, data) {
+  const status = String(data["status"] ?? "UNKNOWN");
+  const phase = data["phase"];
+  const lines = [
+    typeof phase === "string" && phase !== "" ? `${operationId}  ${status}  (${phase})` : `${operationId}  ${status}`
+  ];
+  const type = data["type"];
+  if (typeof type === "string") lines[0] += `  ${type}`;
+  const steps = Array.isArray(data["steps"]) ? data["steps"] : [];
+  if (steps.length > 0) {
+    lines.push("");
+    for (const step of steps) {
+      const state = String(step["state"] ?? "");
+      lines.push(`  ${markerFor(state)} ${String(step["label"] ?? step["key"] ?? "")}`);
+    }
+  }
+  const failure = asRecord(data["failure"]);
+  if (failure) {
+    lines.push("");
+    const stage = failure["stage"];
+    lines.push(`  Failed${typeof stage === "string" ? ` at ${stage}` : ""}`);
+    const summary = failure["summary"];
+    if (typeof summary === "string") lines.push(`    ${summary}`);
+    const detail = failure["detail"];
+    if (typeof detail === "string" && detail !== "") lines.push(`    ${detail}`);
+    const cause = failure["cause"];
+    if (typeof cause === "string") lines.push(`    cause: ${cause}`);
+    const retryable = failure["retryable"];
+    if (typeof retryable === "boolean") {
+      lines.push(
+        retryable ? "    Another attempt can succeed: `vfac lifecycle reconcile <pri_\u2026>`." : "    Another attempt will fail the same way. Change something first."
+      );
+    }
+  }
+  return lines.join("\n");
+}
+function markerFor(state) {
+  switch (state) {
+    case "completed":
+      return "\u2713";
+    case "failed":
+      return "\u2717";
+    case "active":
+      return "\u203A";
+    case "pending":
+      return "\xB7";
+    default:
+      return "-";
+  }
+}
+function asRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+}
+
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/external.js
 var external_exports = {};
 __export(external_exports, {
@@ -15407,7 +15541,7 @@ function printError(error, json) {
 }
 
 // src/commands/apply.ts
-async function runApply(verb, parsed) {
+async function runApply(verb, parsed, deps = {}) {
   const file = parsed.flags["file"];
   if (!file) {
     process.stderr.write("Which manifest? Use -f <file>.\n");
@@ -15526,19 +15660,105 @@ Read the operation that failed: \`vfac get operation <id>\`, or \`vfac get produ
     body: { verb: "apply", action, payload: envelope }
   });
   if (!applied.ok) return printError(applied.error, json);
-  if (json) {
-    process.stdout.write(`${JSON.stringify({ action, ...applied.data })}
+  const key = manifestKeyOf(manifest.document) ?? planned.data.manifestKey ?? "(unnamed)";
+  const rawOperationId = applied.data["operationId"];
+  const operationId = typeof rawOperationId === "string" && rawOperationId !== "" ? rawOperationId : null;
+  if (!parsed.booleans.has("wait")) {
+    if (json) {
+      process.stdout.write(`${JSON.stringify({ action, ...applied.data })}
 `);
+      return 0;
+    }
+    process.stdout.write(
+      `${action} ${key}
+` + (operationId !== null ? `Operation ${operationId} \u2014 follow it with: vfac get operation ${operationId}
+` : "")
+    );
     return 0;
   }
-  const key = manifestKeyOf(manifest.document) ?? planned.data.manifestKey ?? "(unnamed)";
-  const operationId = applied.data["operationId"];
-  process.stdout.write(
-    `${action} ${key}
-` + (typeof operationId === "string" ? `Operation ${operationId} \u2014 follow it with: vfac get operation ${operationId}
-` : "")
-  );
-  return 0;
+  const finish = (operation, code) => {
+    if (json) {
+      process.stdout.write(`${JSON.stringify({ action, ...applied.data, operation })}
+`);
+    }
+    return code;
+  };
+  if (operationId === null) {
+    if (!json) {
+      process.stderr.write(
+        `${action} ${key} was accepted, but the platform named no operation to follow, so --wait cannot confirm it. Check the resource: \`vfac get product-instance <pri_\u2026>\`.
+`
+      );
+    }
+    return finish(null, 1);
+  }
+  if (!json) {
+    process.stdout.write(`${action} ${key}
+`);
+    process.stderr.write(`Operation ${operationId} \u2014 waiting for it to settle\u2026
+`);
+  }
+  const outcome = await waitForOperation({
+    endpoint: session.ready.endpoint,
+    token: session.ready.token,
+    operationId,
+    projectId,
+    ...json ? {} : {
+      onProgress: (data) => {
+        const phase = data["phase"];
+        process.stderr.write(
+          `  ${String(data["status"] ?? "UNKNOWN")}` + (typeof phase === "string" && phase !== "" ? ` (${phase})` : "") + "\n"
+        );
+      }
+    },
+    // THE SESSION CAN EXPIRE UNDER A LONG WAIT. It is exchanged once per command
+    // and lasts eight hours while this loop may run for one, so the two do not
+    // overlap today — but a wait that died because its own token aged out would
+    // report "unauthenticated" for a deploy that was fine, which is the worst
+    // sentence to print at the end of an hour.
+    deps: {
+      ...deps,
+      refreshToken: deps.refreshToken ?? (async () => {
+        const again = await ensureSession({
+          endpointFlag: parsed.flags["endpoint"],
+          forceExchange: true
+        });
+        return again.ok ? again.ready.token : null;
+      })
+    }
+  });
+  switch (outcome.kind) {
+    case "settled": {
+      if (!json) process.stdout.write(`${renderOperation(operationId, outcome.data)}
+`);
+      return finish(outcome.data, outcome.status === "SUCCEEDED" ? 0 : 1);
+    }
+    case "unknown-status": {
+      if (!json) {
+        process.stderr.write(
+          `The platform answered status "${outcome.status}", which this version of vfac does not understand. Upgrade vfac, and read the operation: \`vfac get operation ${operationId}\`.
+`
+        );
+      }
+      return finish(outcome.data, 1);
+    }
+    case "read-failed": {
+      if (!json) process.stderr.write(`${outcome.error.message}
+`);
+      return finish(null, 1);
+    }
+    case "timed-out": {
+      if (!json) {
+        const status = outcome.data?.["status"];
+        const phase = outcome.data?.["phase"];
+        process.stderr.write(
+          `Gave up waiting for ${operationId} after an hour. It was last ${typeof status === "string" ? status : "UNKNOWN"}${typeof phase === "string" && phase !== "" ? ` (${phase})` : ""}. It is still running in the platform \u2014 this command stopped waiting, it did not cancel anything. Follow it with: vfac get operation ${operationId}
+`
+        );
+      }
+      return finish(outcome.data, 1);
+    }
+  }
 }
 
 // src/commands/context.ts
@@ -15710,6 +15930,47 @@ function report(checks, json) {
 
 // src/commands/export.ts
 var import_yaml2 = __toESM(require_dist(), 1);
+async function runExport(parsed) {
+  if (parsed.command[1] !== "product-instance" && parsed.command[1] !== "resource") {
+    process.stderr.write("Usage: vfac export product-instance pri_\u2026\n");
+    return 2;
+  }
+  const instanceId = parsed.command[2];
+  if (!instanceId) {
+    process.stderr.write("Which resource? vfac export product-instance pri_\u2026\n");
+    return 2;
+  }
+  const session = await ensureSession({ endpointFlag: parsed.flags["endpoint"] });
+  if (!session.ok) {
+    process.stderr.write(`${session.message}
+`);
+    return 1;
+  }
+  const result = await call({
+    endpoint: session.ready.endpoint,
+    path: withProject(
+      `/api/v1/resources/${encodeURIComponent(instanceId)}/manifest`,
+      resolveProject(parsed.flags["project"], session.ready.stored)
+    ),
+    token: session.ready.token
+  });
+  if (!result.ok) return printError(result.error, parsed.flags["output"] === "json");
+  process.stdout.write(
+    parsed.flags["output"] === "json" ? `${JSON.stringify(result.data, null, 2)}
+` : (0, import_yaml2.stringify)(result.data)
+  );
+  const metadata = result.data["metadata"];
+  const hasKey = typeof metadata === "object" && metadata !== null && "key" in metadata;
+  if (!hasKey) {
+    process.stderr.write(
+      `
+This resource is not managed by a manifest yet, so the document has no "metadata.key". Applying it as-is would create a SECOND resource. Add a key and run:
+  vfac apply -f <file> --adopt ${instanceId}
+`
+    );
+  }
+  return 0;
+}
 
 // src/paging.ts
 var MAX_PAGES = 50;
@@ -15892,62 +16153,6 @@ This is one page. Continue with --cursor ${result.nextCursor ?? ""}
   process.stderr.write("Usage: vfac get product-instances | vfac get operation op_\u2026\n");
   return 2;
 }
-function withProject(path, projectId) {
-  return projectId === null ? path : `${path}?project=${encodeURIComponent(projectId)}`;
-}
-function renderOperation(operationId, data) {
-  const status = String(data["status"] ?? "UNKNOWN");
-  const phase = data["phase"];
-  const lines = [
-    typeof phase === "string" && phase !== "" ? `${operationId}  ${status}  (${phase})` : `${operationId}  ${status}`
-  ];
-  const type = data["type"];
-  if (typeof type === "string") lines[0] += `  ${type}`;
-  const steps = Array.isArray(data["steps"]) ? data["steps"] : [];
-  if (steps.length > 0) {
-    lines.push("");
-    for (const step of steps) {
-      const state = String(step["state"] ?? "");
-      lines.push(`  ${markerFor(state)} ${String(step["label"] ?? step["key"] ?? "")}`);
-    }
-  }
-  const failure = asRecord(data["failure"]);
-  if (failure) {
-    lines.push("");
-    const stage = failure["stage"];
-    lines.push(`  Failed${typeof stage === "string" ? ` at ${stage}` : ""}`);
-    const summary = failure["summary"];
-    if (typeof summary === "string") lines.push(`    ${summary}`);
-    const detail = failure["detail"];
-    if (typeof detail === "string" && detail !== "") lines.push(`    ${detail}`);
-    const cause = failure["cause"];
-    if (typeof cause === "string") lines.push(`    cause: ${cause}`);
-    const retryable = failure["retryable"];
-    if (typeof retryable === "boolean") {
-      lines.push(
-        retryable ? "    Another attempt can succeed: `vfac lifecycle reconcile <pri_\u2026>`." : "    Another attempt will fail the same way. Change something first."
-      );
-    }
-  }
-  return lines.join("\n");
-}
-function markerFor(state) {
-  switch (state) {
-    case "completed":
-      return "\u2713";
-    case "failed":
-      return "\u2717";
-    case "active":
-      return "\u203A";
-    case "pending":
-      return "\xB7";
-    default:
-      return "-";
-  }
-}
-function asRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
-}
 function wrapOutput(text, width) {
   const out = [];
   let current = "";
@@ -15963,49 +16168,6 @@ function wrapOutput(text, width) {
   return out;
 }
 
-// src/commands/export.ts
-async function runExport(parsed) {
-  if (parsed.command[1] !== "product-instance" && parsed.command[1] !== "resource") {
-    process.stderr.write("Usage: vfac export product-instance pri_\u2026\n");
-    return 2;
-  }
-  const instanceId = parsed.command[2];
-  if (!instanceId) {
-    process.stderr.write("Which resource? vfac export product-instance pri_\u2026\n");
-    return 2;
-  }
-  const session = await ensureSession({ endpointFlag: parsed.flags["endpoint"] });
-  if (!session.ok) {
-    process.stderr.write(`${session.message}
-`);
-    return 1;
-  }
-  const result = await call({
-    endpoint: session.ready.endpoint,
-    path: withProject(
-      `/api/v1/resources/${encodeURIComponent(instanceId)}/manifest`,
-      resolveProject(parsed.flags["project"], session.ready.stored)
-    ),
-    token: session.ready.token
-  });
-  if (!result.ok) return printError(result.error, parsed.flags["output"] === "json");
-  process.stdout.write(
-    parsed.flags["output"] === "json" ? `${JSON.stringify(result.data, null, 2)}
-` : (0, import_yaml2.stringify)(result.data)
-  );
-  const metadata = result.data["metadata"];
-  const hasKey = typeof metadata === "object" && metadata !== null && "key" in metadata;
-  if (!hasKey) {
-    process.stderr.write(
-      `
-This resource is not managed by a manifest yet, so the document has no "metadata.key". Applying it as-is would create a SECOND resource. Add a key and run:
-  vfac apply -f <file> --adopt ${instanceId}
-`
-    );
-  }
-  return 0;
-}
-
 // src/commands/product.ts
 async function runProduct(parsed) {
   const json = parsed.flags["output"] === "json";
@@ -16622,7 +16784,7 @@ var USAGE = `vfac \u2014 deploy Varde Flyt resources from a manifest
                      [--region <region>] [--profile <profile>]
   vfac validate -f resource.yaml
   vfac plan     -f resource.yaml
-  vfac apply    -f resource.yaml [--secret NAME=env:VAR] [--adopt pri_\u2026]
+  vfac apply    -f resource.yaml [--secret NAME=env:VAR] [--adopt pri_\u2026] [--wait]
   vfac get product-instances
   vfac get product-instance pri_\u2026        what it is, and its outputs
   vfac get operation op_\u2026
@@ -16632,6 +16794,9 @@ var USAGE = `vfac \u2014 deploy Varde Flyt resources from a manifest
 
 Options
   -f, --file      the manifest to read. YAML or JSON
+      --wait      apply: wait for the operation to settle, and exit non-zero if it
+                  fails. Without it, apply exits once the change is ACCEPTED \u2014
+                  which a pipeline reads as success before the deploy has happened
       --project   the Project to act in. Defaults to the stored context
       --endpoint  your organization's portal. Defaults to VFAC_ENDPOINT, then the
                   stored context

package/package.json

@@ -1,7 +1,12 @@
 {
   "name": "@varde-flyt/vfac",
-  "version": "0.1.0",
+  "version": "0.2.0-rc.1",
   "description": "Deploy and manage Varde Flyt Products from a manifest.",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/digital-verdi/Varde-flyt-ai-cloud.git",
+    "directory": "packages/cli"
+  },
   "type": "module",
   "bin": {
     "vfac": "./dist/vfac.mjs"