@yadurajfleetos/cli 0.2.0 → 0.3.0

package/dist/archive.js

@@ -21,6 +21,25 @@ import { CliError, EXIT } from './api.js';
  * later rather than a slow upload for everybody now.
  */
 const ALWAYS_EXCLUDE = ['.git', 'node_modules', '.DS_Store'];
+/**
+ * Patterns that must never be honoured, however the .dockerignore is written.
+ *
+ * `Dockerfile` in a .dockerignore is standard, recommended practice: a local
+ * `docker build` reads it from the host rather than from the context, so
+ * excluding it avoids shipping it twice. Here the context is built somewhere
+ * else, and the Dockerfile has to travel with it — honouring that line
+ * produces "failed to read dockerfile" on a context that is otherwise perfect.
+ *
+ * A bare `*` is the other one. It is the whitelist idiom, always paired with
+ * `!keep-this` lines, and since negations are not supported it would otherwise
+ * mean "exclude the entire project".
+ */
+function mustNotExclude(pattern) {
+    const p = pattern.replace(/^\.?\//, '').replace(/^\*\*\//, '');
+    if (p === '*' || p === '**' || p === '.')
+        return true;
+    return /^\*?dockerfile/i.test(p);
+}
 /**
  * Read .dockerignore into tar exclusion patterns.
  *
@@ -43,7 +62,8 @@ export async function ignorePatterns(dir) {
         .map((line) => line.trim())
         .filter((line) => line && !line.startsWith('#') && !line.startsWith('!'))
         .map((line) => line.replace(/^\/+/, '').replace(/\/+$/, ''))
-        .filter(Boolean);
+        .filter(Boolean)
+        .filter((line) => !mustNotExclude(line));
     return [...new Set([...ALWAYS_EXCLUDE, ...patterns])];
 }
 /**

package/dist/commands/secrets.js

@@ -7,10 +7,22 @@
  * a supported spelling. The value comes from a pipe or from a prompt with the
  * echo off, and nothing here ever prints one back.
  */
+import { readFile } from 'node:fs/promises';
 import { request, requireFleet, CliError, EXIT } from '../api.js';
 import { c, table, relativeTime } from '../render.js';
 import { glyph } from '../ui.js';
 import { askSecret, canPrompt } from '../prompt.js';
+import { parseDotenv } from '../dotenv.js';
+import { declaredSecrets } from '../plan.js';
+/** The manifest in the working directory, if there is one to read. */
+async function declaredSecretsNearby() {
+    try {
+        return declaredSecrets(await readFile('fleet.yaml', 'utf8'));
+    }
+    catch {
+        return null;
+    }
+}
 const KEY_PATTERN = /^[A-Z_][A-Z0-9_]{0,127}$/;
 /**
  * Read the value from a pipe when there is one, otherwise ask for it.
@@ -95,6 +107,99 @@ export const secretsCommand = {
             console.log(c.dim('  takes effect on the next deploy of any service that references it'));
             return;
         }
+        /* ── import ────────────────────────────────────────────────── */
+        if (sub === 'import') {
+            // Reading and choosing happen before anything touches the network, so
+            // `--dry-run` works on a plane, and a typo in a filename is not reported
+            // only after a sign-in prompt.
+            const file = key ?? '.env';
+            let source;
+            try {
+                source = await readFile(file, 'utf8');
+            }
+            catch {
+                throw new CliError(`Cannot read "${file}".\n` +
+                    `  usage: fleet secrets import [file]   (defaults to .env)`, EXIT.usage);
+            }
+            const parsed = parseDotenv(source);
+            for (const skip of parsed.skipped) {
+                console.log(`${glyph.warn} ${c.yellow('skipped')}  line ${skip.line}: ${skip.reason}`);
+            }
+            for (const warning of parsed.warnings) {
+                console.log(`${glyph.warn} ${c.yellow('warning')}  ${warning}`);
+            }
+            if (!parsed.entries.length) {
+                throw new CliError(`No usable assignments in "${file}".`, EXIT.usage);
+            }
+            // Which of them to send. The default is what the manifest declares,
+            // because a .env is half configuration and the store is only for the
+            // other half.
+            const only = typeof flags.only === 'string' ? flags.only.split(',').map((k) => k.trim()) : null;
+            let chosen;
+            let basis;
+            if (only) {
+                const missing = only.filter((k) => !parsed.entries.some((e) => e.key === k));
+                if (missing.length) {
+                    throw new CliError(`Not in ${file}: ${missing.join(', ')}`, EXIT.usage);
+                }
+                chosen = parsed.entries.filter((e) => only.includes(e.key));
+                basis = '--only';
+            }
+            else if (flags.all) {
+                chosen = parsed.entries;
+                basis = '--all';
+            }
+            else {
+                const declared = await declaredSecretsNearby();
+                if (!declared) {
+                    throw new CliError(`No fleet.yaml here to say which keys are secrets.\n` +
+                        `  Pick them:      fleet secrets import ${file} --only KEY,OTHER_KEY\n` +
+                        `  Or send it all: fleet secrets import ${file} --all`, EXIT.usage);
+                }
+                chosen = parsed.entries.filter((e) => declared.has(e.key));
+                basis = 'fleet.yaml';
+                // Named in the manifest but absent from the file: the deploy will be
+                // refused for a missing secret later, so say it now.
+                for (const [name, wanted] of declared) {
+                    if (!parsed.entries.some((e) => e.key === name)) {
+                        console.log(`${glyph.warn} ${c.yellow('missing')}  ${c.bold(name)} is declared by ${wanted.join(', ')} but is not in ${file}`);
+                    }
+                }
+            }
+            if (!chosen.length) {
+                throw new CliError(`Nothing in "${file}" matches ${basis === 'fleet.yaml' ? 'the secrets fleet.yaml declares' : basis}.\n` +
+                    `  Send everything with --all, or name keys with --only KEY,OTHER_KEY`, EXIT.usage);
+            }
+            if (flags['dry-run']) {
+                const scope = service ? ` for ${c.bold(service)}` : '';
+                console.log(`\n  ${c.dim(`would store from ${file}${scope}, chosen by ${basis}`)}\n`);
+                for (const entry of chosen)
+                    console.log(`  ${c.bold(entry.key)} ${c.dim(`(line ${entry.line})`)}`);
+                console.log(c.dim(`\n  ${chosen.length} key(s). No values are shown, here or ever.`));
+                return;
+            }
+            const fleetId = await requireFleet(typeof flags.fleet === 'string' ? flags.fleet : undefined);
+            const target = service ? await resolveServiceId(fleetId, service) : null;
+            const where = target ? ` for ${c.bold(target.name)}` : '';
+            let stored = 0;
+            let replaced = 0;
+            for (const entry of chosen) {
+                const path = target
+                    ? `/services/${target.id}/secrets/${encodeURIComponent(entry.key)}`
+                    : `/fleets/${fleetId}/secrets/${encodeURIComponent(entry.key)}`;
+                const { body } = await request('PUT', path, { body: { value: entry.value } });
+                if (body.created)
+                    stored++;
+                else
+                    replaced++;
+                console.log(`${glyph.ok} ${c.green(body.created ? 'stored' : 'replaced')}  ${c.bold(entry.key)}${where}`);
+            }
+            const untouched = parsed.entries.length - chosen.length;
+            console.log(c.dim(`\n  ${stored} stored, ${replaced} replaced` +
+                (untouched ? `; ${untouched} other key(s) in ${file} left alone` : '')));
+            console.log(c.dim('  takes effect on the next deploy of any service that references them'));
+            return;
+        }
         /* ── rm ────────────────────────────────────────────────────── */
         if (sub === 'rm' || sub === 'remove' || sub === 'delete') {
             if (!key)
@@ -112,6 +217,10 @@ export const secretsCommand = {
         }
         throw new CliError('usage: fleet secrets [ls]\n' +
             '       fleet secrets set <KEY> [--service <name>]\n' +
-            '       fleet secrets rm  <KEY> [--service <name>]', EXIT.usage);
+            '       fleet secrets rm  <KEY> [--service <name>]\n' +
+            '       fleet secrets import [file] [--all | --only A,B] [--service <name>] [--dry-run]\n' +
+            '\n' +
+            '  import reads a .env (default: ./.env) and stores the keys fleet.yaml\n' +
+            '  declares as secrets. --all sends every key in the file instead.', EXIT.usage);
     },
 };

package/dist/commands/services.js

@@ -6,7 +6,7 @@ import { task, glyph } from '../ui.js';
 import { withLadder } from '../ladder.js';
 import { ask, canPrompt, confirm, selectOrThrow } from '../prompt.js';
 import { DEPLOY_STEPS, follow, phaseWalker, } from '../progress.js';
-import { planFromManifest } from '../plan.js';
+import { planFromManifest, projectNameFor } from '../plan.js';
 import { uploadContext, humanBytes } from '../archive.js';
 const manifestPath = (given) => given ?? 'fleet.yaml';
 async function readManifest(path) {
@@ -40,10 +40,12 @@ export const applyCommand = {
     async run(args, flags) {
         const fleetId = await requireFleet(typeof flags.fleet === 'string' ? flags.fleet : undefined);
         const manifest = await readManifest(manifestPath(args[0]));
-        const body = await task(`applying ${manifestPath(args[0])}`, async () => (await request('POST', `/fleets/${fleetId}/services`, { body: { manifest } })).body, {
+        const body = await task(`applying ${manifestPath(args[0])}`, async () => (await request('POST', `/fleets/${fleetId}/services`, {
+            body: { manifest, project: projectNameFor(process.cwd()) },
+        })).body, {
             done: (b) => b.created.length || b.updated.length
-                ? `applied ${b.created.length + b.updated.length} service(s)`
-                : 'no changes',
+                ? `applied ${b.created.length + b.updated.length} service(s) to project ${b.project}`
+                : `no changes in project ${b.project}`,
         });
         if (flags.json)
             return console.log(JSON.stringify(body, null, 2));
@@ -71,14 +73,29 @@ export const servicesCommand = {
             return console.log(JSON.stringify(body.services, null, 2));
         if (!body.services.length)
             return console.log('No services. Run `fleet apply` with a fleet.yaml.');
-        console.log(table(['service', 'url', 'placement', 'node', 'sha', 'status'], body.services.map((s) => [
-            s.name + (s.persistentVolume ? c.dim(' ⛁') : ''),
-            s.domain ?? s.hostname ?? c.dim('—'),
-            s.placementPolicy,
-            s.current?.nodeName ?? c.dim('—'),
-            s.current?.gitSha?.slice(0, 7) ?? c.dim('—'),
-            s.current ? statusColour(s.current.status) : c.dim('not deployed'),
-        ])));
+        // Grouped by project. A fleet.yaml describes a stack, and listing its
+        // services flat among somebody else's is how four related things came to
+        // look like four unrelated ones.
+        const byProject = new Map();
+        for (const s of body.services) {
+            const key = s.project || 'default';
+            const group = byProject.get(key) ?? [];
+            group.push(s);
+            byProject.set(key, group);
+        }
+        for (const [project, group] of [...byProject].sort((a, b) => a[0].localeCompare(b[0]))) {
+            const running = group.filter((s) => s.current?.status === 'running').length;
+            const ram = group.reduce((sum, s) => sum + s.requestRamMb, 0);
+            console.log(`\n${c.bold(project)}  ${c.dim(`${running}/${group.length} running · ${mb(ram)}`)}`);
+            console.log(table(['service', 'url', 'placement', 'node', 'sha', 'status'], group.map((s) => [
+                s.name + (s.persistentVolume ? c.dim(' ⛁') : ''),
+                s.domain ?? s.hostname ?? c.dim('—'),
+                s.placementPolicy,
+                s.current?.nodeName ?? c.dim('—'),
+                s.current?.gitSha?.slice(0, 7) ?? c.dim('—'),
+                s.current ? statusColour(s.current.status) : c.dim('not deployed'),
+            ])));
+        }
     },
 };
 async function findService(fleetId, name) {

package/dist/commands/up.js

@@ -14,7 +14,7 @@ import { c } from '../render.js';
 import { task, glyph } from '../ui.js';
 import { withLadder } from '../ladder.js';
 import { DEPLOY_STEPS, follow, phaseWalker } from '../progress.js';
-import { planFromManifest, deployOrder } from '../plan.js';
+import { planFromManifest, deployOrder, projectNameFor } from '../plan.js';
 import { uploadContext, humanBytes } from '../archive.js';
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 export const upCommand = {
@@ -46,10 +46,12 @@ export const upCommand = {
         }
         // ── Step 2: read and apply the manifest ───────────────────────────
         const manifest = await readFile(manifestPath, 'utf8');
-        const applyResult = await task(`applying ${manifestPath}`, async () => (await request('POST', `/fleets/${fleetId}/services`, { body: { manifest } })).body, {
+        const applyResult = await task(`applying ${manifestPath}`, async () => (await request('POST', `/fleets/${fleetId}/services`, {
+            body: { manifest, project: projectNameFor(process.cwd()) },
+        })).body, {
             done: (b) => b.created.length || b.updated.length
-                ? `applied ${b.created.length + b.updated.length} service(s)`
-                : 'no changes',
+                ? `applied ${b.created.length + b.updated.length} service(s) to project ${b.project}`
+                : `no changes in project ${b.project}`,
         });
         for (const w of applyResult.warnings) {
             console.log(`${glyph.warn} ${c.yellow('warning')}  ${w}`);

package/dist/dotenv.js

@@ -0,0 +1,103 @@
+/**
+ * Reading a .env file.
+ *
+ * Deliberately not a general dotenv implementation. This one feeds a
+ * credential store, which changes the trade-offs: a value that is silently
+ * altered on the way in fails authentication somewhere far away from here,
+ * with nothing to point back at this file. So the rules are narrow, and
+ * anything ambiguous is reported rather than guessed at.
+ */
+/** The same shape the control plane accepts as an environment variable name. */
+const KEY_PATTERN = /^[A-Z_][A-Z0-9_]{0,127}$/;
+export function parseDotenv(source) {
+    const entries = [];
+    const skipped = [];
+    const warnings = [];
+    const seen = new Set();
+    const lines = source.split(/\r?\n/);
+    for (let i = 0; i < lines.length; i++) {
+        const raw = lines[i];
+        const line = i + 1;
+        const trimmed = raw.trim();
+        if (!trimmed || trimmed.startsWith('#'))
+            continue;
+        // `export FOO=bar` is common in files meant to be sourced by a shell.
+        const withoutExport = trimmed.replace(/^export\s+/, '');
+        const eq = withoutExport.indexOf('=');
+        if (eq < 1) {
+            skipped.push({ line, text: trimmed, reason: 'not a KEY=VALUE assignment' });
+            continue;
+        }
+        const key = withoutExport.slice(0, eq).trim();
+        if (!KEY_PATTERN.test(key)) {
+            skipped.push({ line, text: key, reason: 'not a usable environment variable name' });
+            continue;
+        }
+        const rest = withoutExport.slice(eq + 1);
+        let value;
+        const quote = rest.trimStart()[0];
+        if (quote === '"' || quote === "'") {
+            const body = rest.trimStart();
+            const end = findClosingQuote(body, quote);
+            if (end < 0) {
+                // A multi-line value, or a typo. Either way, do not guess where it ends.
+                skipped.push({ line, text: key, reason: `unterminated ${quote === '"' ? 'double' : 'single'} quote` });
+                continue;
+            }
+            const inner = body.slice(1, end);
+            // Single quotes are literal, as in a shell. Double quotes take the usual
+            // escapes so a value can contain a newline.
+            value = quote === "'" ? inner : unescape(inner);
+        }
+        else {
+            value = rest.trim();
+            // A '#' after whitespace is a comment in most dotenv readers and part of
+            // the password in some. Truncating a credential is the worse mistake, so
+            // this keeps the whole value and says so.
+            if (/\s#/.test(value)) {
+                warnings.push(`${key} (line ${line}) contains " #" and was stored whole, comment included. ` +
+                    `Quote the value if part of it is a comment.`);
+            }
+        }
+        if (seen.has(key)) {
+            // Later wins, as a shell would do, but a duplicate is worth saying aloud:
+            // two different values for one key is rarely intentional.
+            warnings.push(`${key} appears more than once; the value on line ${line} is the one used.`);
+            const previous = entries.findIndex((e) => e.key === key);
+            entries.splice(previous, 1);
+        }
+        seen.add(key);
+        entries.push({ key, value, line });
+    }
+    return { entries, skipped, warnings };
+}
+/** Index of the closing quote, skipping ones that are escaped. */
+function findClosingQuote(body, quote) {
+    for (let i = 1; i < body.length; i++) {
+        if (body[i] === '\\' && quote === '"') {
+            i++;
+            continue;
+        }
+        if (body[i] === quote)
+            return i;
+    }
+    return -1;
+}
+function unescape(input) {
+    return input.replace(/\\(.)/g, (_, ch) => {
+        switch (ch) {
+            case 'n':
+                return '\n';
+            case 'r':
+                return '\r';
+            case 't':
+                return '\t';
+            case '\\':
+                return '\\';
+            case '"':
+                return '"';
+            default:
+                return `\\${ch}`;
+        }
+    });
+}

package/dist/index.js

@@ -50,6 +50,7 @@ const GROUPS = [
             ['rollback <service> [release]', 'Restore the previous or selected release'],
             ['secrets', 'List the fleet secret store'],
             ['secrets set <KEY>', 'Store a credential; the value is never echoed or logged'],
+            ['secrets import [.env]', 'Store the secrets fleet.yaml declares, read from a .env file'],
             ['secrets rm <KEY>', 'Remove a stored credential'],
             ['nodes cordon <name>', 'Stop scheduling new work onto a node'],
             ['nodes uncordon <name>', 'Allow scheduling again'],

package/dist/plan.js

@@ -7,6 +7,23 @@
  * whose database is not up yet fails its health check like any other outage.
  */
 import { parse as parseYaml } from 'yaml';
+/**
+ * What to call this manifest's services collectively when it does not say.
+ *
+ * The directory name, which is what Compose does and what a person would
+ * answer if asked "which project is this". Normalised to the same shape a
+ * service name has to be, so the server never rejects a name it derived.
+ */
+export function projectNameFor(dir) {
+    const base = dir.split('/').filter(Boolean).pop() ?? 'default';
+    const slug = base
+        .toLowerCase()
+        .replace(/[^a-z0-9-]+/g, '-')
+        .replace(/^-+|-+$/g, '')
+        .slice(0, 48)
+        .replace(/-+$/, '');
+    return slug || 'default';
+}
 /**
  * Read the manifest the way the control plane will.
  *
@@ -28,6 +45,32 @@ export function planFromManifest(source) {
         };
     });
 }
+/**
+ * Which secrets the manifest says it needs, and which services want each.
+ *
+ * A .env holds a mix — half configuration, half credentials — and only the
+ * credentials belong in the secret store. The manifest already draws that line
+ * by declaring `secrets:`, so importing can honour it rather than asking
+ * somebody to re-draw it at the command line.
+ */
+export function declaredSecrets(source) {
+    const doc = parseYaml(source);
+    const services = doc?.services;
+    const declared = new Map();
+    if (!services || typeof services !== 'object')
+        return declared;
+    for (const [name, raw] of Object.entries(services)) {
+        const body = (raw ?? {});
+        if (!Array.isArray(body.secrets))
+            continue;
+        for (const key of body.secrets) {
+            if (typeof key !== 'string')
+                continue;
+            declared.set(key, [...(declared.get(key) ?? []), name]);
+        }
+    }
+    return declared;
+}
 /**
  * Order services so a dependency is deployed before whatever depends on it.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yadurajfleetos/cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Fleet OS command-line interface for deploying and orchestrating services on user-owned hardware",
   "type": "module",
   "license": "MIT",