directus-deploy-cli 0.18.0 → 0.20.0

package/dist/vm.js

@@ -0,0 +1,109 @@
+import { loadTargets } from "./targets.js";
+import { mintIdToken } from "./gcloud.js";
+// Re-export for existing importers/tests.
+export { buildIdTokenAssertion } from "./gcloud.js";
+// Pure resolver for the invoker SA key — also used by `push --publish` for
+// GCS uploads when gsutil isn't available. Exported for tests.
+export function resolveInvokerKey(name, target, env) {
+    const invokerEnv = target.control_invoker_key_env ?? `DIRECTUS_${name.toUpperCase()}_INVOKER_KEY_B64`;
+    const rawKey = env[invokerEnv];
+    if (!rawKey)
+        return undefined;
+    try {
+        const parsed = JSON.parse(Buffer.from(rawKey, "base64").toString("utf8"));
+        if (!parsed.client_email || !parsed.private_key)
+            throw new Error("missing fields");
+        return { client_email: parsed.client_email, private_key: parsed.private_key };
+    }
+    catch {
+        throw new Error(`target '${name}': $${invokerEnv} is not a base64-encoded service-account JSON key`);
+    }
+}
+// Pure resolver — exported for tests.
+export function resolveVmControl(name, target, env) {
+    if (!target.control_url) {
+        throw new Error(`target '${name}' has no control_url in the targets file — deploy cloudfunctions/vm-control for it first`);
+    }
+    const tokenEnv = target.control_token_env ?? `DIRECTUS_${name.toUpperCase()}_CONTROL_TOKEN`;
+    const token = env[tokenEnv]; // optional — IAM-gated functions need no shared token
+    const invokerKey = resolveInvokerKey(name, target, env);
+    if (!token && !invokerKey) {
+        throw new Error(`target '${name}': no control credentials — set $${tokenEnv} (shared token) and/or $${target.control_invoker_key_env ?? `DIRECTUS_${name.toUpperCase()}_INVOKER_KEY_B64`} (invoker SA key)`);
+    }
+    return {
+        controlUrl: target.control_url.replace(/\/+$/, ""),
+        token,
+        healthUrl: `${target.base_url.replace(/\/+$/, "")}/server/health`,
+        invokerKey,
+    };
+}
+export async function callControl(ctl, action, params = {}) {
+    const headers = {};
+    if (ctl.token)
+        headers["X-Control-Token"] = ctl.token;
+    if (ctl.invokerKey) {
+        headers.Authorization = `Bearer ${await mintIdToken(ctl.invokerKey, ctl.controlUrl)}`;
+    }
+    const qs = new URLSearchParams({ action, ...params });
+    const r = await fetch(`${ctl.controlUrl}?${qs.toString()}`, { method: "POST", headers });
+    const body = (await r.json().catch(() => ({})));
+    if (!r.ok) {
+        const hint = r.status === 401 || r.status === 403
+            ? ctl.invokerKey
+                ? " (invoker SA lacks run.invoker on the service, or the shared token mismatches)"
+                : " (service not publicly invokable? set DIRECTUS_<TARGET>_INVOKER_KEY_B64 with an invoker SA key)"
+            : "";
+        throw new Error(`vm-control ${action} failed: HTTP ${r.status}${hint} ${JSON.stringify(body)}`);
+    }
+    return body;
+}
+export async function isHealthy(healthUrl) {
+    try {
+        const r = await fetch(healthUrl, { signal: AbortSignal.timeout(8000) });
+        return r.ok;
+    }
+    catch {
+        return false;
+    }
+}
+export async function waitHealthy(healthUrl, timeoutMs, intervalMs = 10_000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        await new Promise((res) => setTimeout(res, intervalMs));
+        if (await isHealthy(healthUrl))
+            return true;
+    }
+    return false;
+}
+export async function runVm(input) {
+    const cfg = await loadTargets(input.targetsFile);
+    const t = cfg.targets[input.target];
+    if (!t) {
+        throw new Error(`unknown target '${input.target}' — known: ${Object.keys(cfg.targets).join(", ") || "(none)"}`);
+    }
+    const ctl = resolveVmControl(input.target, t, process.env);
+    const out = (o, human) => {
+        process.stdout.write(input.json ? JSON.stringify(o, null, 2) + "\n" : human + "\n");
+    };
+    if (input.action === "start") {
+        if (await isHealthy(ctl.healthUrl)) {
+            out({ target: input.target, healthy: true, operation: "no-op" }, `${input.target}: already up`);
+            return 0;
+        }
+        const r = await callControl(ctl, "start");
+        out(r, `${input.target}: ${String(r.operation ?? "start dispatched")} (was ${String(r.statusBefore)}) — waiting for health…`);
+        const ok = await waitHealthy(ctl.healthUrl, input.waitTimeoutMs);
+        out({ target: input.target, healthy: ok }, ok ? `${input.target}: up` : `${input.target}: still not healthy after ${Math.round(input.waitTimeoutMs / 1000)}s`);
+        return ok ? 0 : 1;
+    }
+    if (input.action === "stop") {
+        const r = await callControl(ctl, "stop");
+        out(r, `${input.target}: ${String(r.operation ?? "stop dispatched")} (was ${String(r.statusBefore)})`);
+        return 0;
+    }
+    const r = await callControl(ctl, "status");
+    const healthy = await isHealthy(ctl.healthUrl);
+    out({ ...r, healthy }, `${input.target}: instance ${String(r.statusBefore)}, directus ${healthy ? "responding" : "NOT responding"}`);
+    return 0;
+}
+//# sourceMappingURL=vm.js.map

package/dist/vm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vm.js","sourceRoot":"","sources":["../src/vm.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-deploy-cli",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "description": "Per-entity, non-atomic Directus deployment tool. Reconciles collections/fields/relations/roles/policies/permissions/flows/operations/migrations/seeds from git to any environment.",
   "type": "module",
   "bin": {