rastack 0.0.35 → 0.0.37

package/test/deploy.spec.ts

@@ -4,8 +4,14 @@ import {
   buildSteps,
   checkSteps,
   ciPlan,
+  deployStackArgs,
   deployStackCommand,
   deploySteps,
+  bootstrapStackArgs,
+  bootstrapStackCommand,
+  bootstrapStackName,
+  bootstrapStackParameters,
+  APP_STACK_OUTPUTS,
   lambdaEnv,
   mergeConfig,
   normalizeConfig,
@@ -13,8 +19,8 @@ import {
   repoVariables,
   scaffoldFiles,
   stackParameters,
-  templateUrl,
   validateConfig,
+  zipStore,
   renderCiWorkflow,
   renderDeployWorkflow,
   CI_WORKFLOW_PATH,
@@ -180,25 +186,107 @@ describe("stack parameters + launch command", () => {
     );
   });
 
-  it("builds the template URL only when the templates bucket is known", () => {
-    expect(templateUrl(base())).toBeNull();
-    expect(templateUrl(base({ templatesBucket: "tpl" }))).toBe(
-      "https://tpl.s3.af-south-1.amazonaws.com/app.yaml",
-    );
-  });
-
-  it("launches by URL when hosted, else from the in-repo template", () => {
+  it("always launches from the in-repo --template-file (deploy takes no URL)", () => {
+    // `aws cloudformation deploy` accepts ONLY `--template-file`; `--template-url`
+    // is exclusive to create-stack/update-stack and makes deploy reject the
+    // command. Even with a known templates bucket, the local file is used.
     const hosted = deployStackCommand(
       base({ templatesBucket: "tpl", artifactsBucket: "art" }),
     );
-    expect(hosted).toContain(
-      "--template-url https://tpl.s3.af-south-1.amazonaws.com/app.yaml",
-    );
+    expect(hosted).toContain("--template-file deploy/cloudformation/app.yaml");
+    expect(hosted).not.toContain("--template-url");
     expect(hosted).toContain("--stack-name rastack-airline");
     expect(hosted).toContain("ArtifactsBucket=art");
 
     const local = deployStackCommand(base());
     expect(local).toContain("--template-file deploy/cloudformation/app.yaml");
+    expect(local).not.toContain("--template-url");
+  });
+
+  it("emits ONE line (PowerShell-safe — no backslash continuations)", () => {
+    // A `\`-continued command is bash-only; pasted into PowerShell each `--flag`
+    // becomes its own statement and errors. Keep it to a single line.
+    const cmd = deployStackCommand(base({ artifactsBucket: "art" }));
+    expect(cmd).not.toContain("\\");
+    expect(cmd.split("\n")).toHaveLength(1);
+    expect(cmd.startsWith("aws cloudformation deploy ")).toBe(true);
+  });
+
+  it("deployStackArgs is the argv the printed command joins", () => {
+    const cfg = base({ artifactsBucket: "art" });
+    expect(`aws ${deployStackArgs(cfg).join(" ")}`).toBe(
+      deployStackCommand(cfg),
+    );
+    expect(deployStackArgs(cfg).slice(0, 2)).toEqual([
+      "cloudformation",
+      "deploy",
+    ]);
+  });
+});
+
+describe("bootstrap stack", () => {
+  it("derives the bootstrap stack name from the prefix", () => {
+    expect(bootstrapStackName(base())).toBe("rastack-bootstrap");
+    expect(bootstrapStackName(base({ namePrefix: "acme" }))).toBe(
+      "acme-bootstrap",
+    );
+  });
+
+  it("passes the publisher repo coordinates as parameters", () => {
+    const params = bootstrapStackParameters(base());
+    const map = Object.fromEntries(params.map((p) => [p.key, p.value]));
+    expect(map.NamePrefix).toBe("rastack");
+    expect(map.GitHubOwner).toBe("theserverkid");
+    expect(map.PublisherRepo).toBe("reactapistack-demo");
+    expect(map.PublisherBranch).toBe("master");
+    expect(map.CreateOIDCProvider).toBeUndefined();
+  });
+
+  it("adds CreateOIDCProvider=false when reusing an existing provider", () => {
+    const params = bootstrapStackParameters(base(), true);
+    expect(params.find((p) => p.key === "CreateOIDCProvider")!.value).toBe(
+      "false",
+    );
+  });
+
+  it("builds a single-line command from the bootstrap template", () => {
+    const cmd = bootstrapStackCommand(base());
+    expect(cmd).not.toContain("\\");
+    expect(cmd.split("\n")).toHaveLength(1);
+    expect(cmd).toContain(
+      "--template-file deploy/cloudformation/bootstrap.yaml",
+    );
+    expect(cmd).toContain("--stack-name rastack-bootstrap");
+    expect(`aws ${bootstrapStackArgs(base()).join(" ")}`).toBe(cmd);
+  });
+});
+
+describe("app stack outputs map", () => {
+  it("maps each stack Output key to a DeployOutputs field", () => {
+    const keys = APP_STACK_OUTPUTS.map((o) => o.key);
+    expect(keys).toContain("FunctionName");
+    expect(keys).toContain("ApiUrl");
+    expect(keys).toContain("DeployRoleArn");
+    expect(APP_STACK_OUTPUTS.find((o) => o.key === "FunctionName")!.field).toBe(
+      "functionName",
+    );
+  });
+});
+
+describe("zipStore — placeholder packaging", () => {
+  it("produces a valid, deterministic STORE archive", () => {
+    const data = Buffer.from("#!/bin/sh\necho placeholder\n");
+    const a = zipStore([{ name: "bootstrap", data, mode: 0o755 }]);
+    const b = zipStore([{ name: "bootstrap", data, mode: 0o755 }]);
+    // Deterministic (fixed DOS timestamp) → idempotent uploads.
+    expect(a.equals(b)).toBe(true);
+    // Local file header + End-of-central-directory signatures.
+    expect(a.readUInt32LE(0)).toBe(0x04034b50);
+    expect(a.readUInt32LE(a.length - 22)).toBe(0x06054b50);
+    // One entry recorded in the EOCD.
+    expect(a.readUInt16LE(a.length - 12)).toBe(1);
+    // STORE method → the file bytes appear verbatim after the header + name.
+    expect(a.includes(data)).toBe(true);
   });
 });
 

package/test/update.spec.ts

@@ -0,0 +1,95 @@
+import {
+  compareSemver,
+  globalPrefixFromPackageDir,
+  installSpec,
+  npmInstallArgs,
+  parseUpdateFlags,
+  updateAvailable,
+} from "../src/update";
+
+describe("update — flag parsing", () => {
+  it("defaults to a latest, non-check, non-dry-run update", () => {
+    expect(parseUpdateFlags([])).toEqual({
+      version: "latest",
+      check: false,
+      dryRun: false,
+    });
+  });
+
+  it("takes a bare positional as the target version", () => {
+    expect(parseUpdateFlags(["0.0.40"]).version).toBe("0.0.40");
+  });
+
+  it("accepts --version / --to and the check + dry-run flags", () => {
+    expect(parseUpdateFlags(["--version", "1.2.3"]).version).toBe("1.2.3");
+    expect(parseUpdateFlags(["--to", "1.2.3"]).version).toBe("1.2.3");
+    expect(parseUpdateFlags(["--check"]).check).toBe(true);
+    expect(parseUpdateFlags(["--dry-run"]).dryRun).toBe(true);
+    expect(parseUpdateFlags(["--print"]).dryRun).toBe(true);
+  });
+});
+
+describe("update — npm spec + args", () => {
+  it("installs bare `rastack` for latest, pinned otherwise", () => {
+    expect(installSpec("latest")).toBe("rastack");
+    expect(installSpec("")).toBe("rastack");
+    expect(installSpec("0.0.40")).toBe("rastack@0.0.40");
+  });
+
+  it("builds a quiet global install argv", () => {
+    expect(npmInstallArgs("latest")).toEqual([
+      "install",
+      "-g",
+      "rastack",
+      "--no-fund",
+      "--no-audit",
+      "--loglevel=error",
+    ]);
+    expect(npmInstallArgs("0.0.40")[2]).toBe("rastack@0.0.40");
+  });
+});
+
+describe("update — global prefix derivation", () => {
+  it("derives the per-user prefix from a POSIX global install", () => {
+    expect(
+      globalPrefixFromPackageDir("/home/me/.rastack/lib/node_modules/rastack"),
+    ).toBe("/home/me/.rastack");
+  });
+
+  it("derives the prefix from a Windows global install", () => {
+    expect(
+      globalPrefixFromPackageDir(
+        "C:\\Users\\me\\.rastack\\node_modules\\rastack",
+      ),
+    ).toBe("C:\\Users\\me\\.rastack");
+  });
+
+  it("prefers the lib/node_modules layout when both could match", () => {
+    // POSIX path also contains `/node_modules/` — the lib form must win so the
+    // prefix is the install root, not `<root>/lib`.
+    expect(
+      globalPrefixFromPackageDir("/opt/tools/lib/node_modules/rastack"),
+    ).toBe("/opt/tools");
+  });
+
+  it("returns null for a source checkout (not under node_modules)", () => {
+    expect(
+      globalPrefixFromPackageDir("/home/me/src/reactapistack/tools"),
+    ).toBeNull();
+  });
+});
+
+describe("update — semver comparison", () => {
+  it("orders versions numerically, ignoring a `v` prefix and pre-release", () => {
+    expect(compareSemver("0.0.9", "0.0.10")).toBe(-1);
+    expect(compareSemver("v1.2.0", "1.2.0")).toBe(0);
+    expect(compareSemver("2.0.0", "1.9.9")).toBe(1);
+    expect(compareSemver("1.0.0-beta", "1.0.0")).toBe(0);
+  });
+
+  it("reports whether an update is available", () => {
+    expect(updateAvailable("0.0.33", "0.0.40")).toBe(true);
+    expect(updateAvailable("0.0.40", "0.0.40")).toBe(false);
+    expect(updateAvailable("0.1.0", "0.0.40")).toBe(false);
+  });
+});

package/dist/rastack-deploy.d.ts

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-/**
- * `rastack deploy` — configure a repo's serverless deployment.
- *
- *   rastack deploy [--app <slug>] [--region <r>] [--owner <o>] [--repo <r>]
- *                  [--branch <b>] [--namespace <n>] [--templates-bucket <b>]
- *                  [--artifacts-bucket <b>] [--arch arm64|x86_64]
- *                  [--print] [--run] [--yes]
- *
- * Writes/updates `.rastack/deploy.json` (creating it if `rastack init` has not
- * run) and prints exactly how to stand the app up: the one-time
- * `aws cloudformation deploy` that creates all infrastructure, the GitHub repo
- * Variables CI reads, and the Lambda's runtime env. Infra is created once by a
- * human — this command *configures* that step, it does not silently mutate the
- * cloud. `--run` executes the launch command for you; `--print` is
- * non-interactive (config as-is).
- *
- * The recurring code deploy is CI's job (`rastack ci deploy`), not this command.
- */
-export {};

package/dist/rastack-deploy.js

@@ -1,196 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-/**
- * `rastack deploy` — configure a repo's serverless deployment.
- *
- *   rastack deploy [--app <slug>] [--region <r>] [--owner <o>] [--repo <r>]
- *                  [--branch <b>] [--namespace <n>] [--templates-bucket <b>]
- *                  [--artifacts-bucket <b>] [--arch arm64|x86_64]
- *                  [--print] [--run] [--yes]
- *
- * Writes/updates `.rastack/deploy.json` (creating it if `rastack init` has not
- * run) and prints exactly how to stand the app up: the one-time
- * `aws cloudformation deploy` that creates all infrastructure, the GitHub repo
- * Variables CI reads, and the Lambda's runtime env. Infra is created once by a
- * human — this command *configures* that step, it does not silently mutate the
- * cloud. `--run` executes the launch command for you; `--print` is
- * non-interactive (config as-is).
- *
- * The recurring code deploy is CI's job (`rastack ci deploy`), not this command.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const config_1 = require("./deploy/config");
-const io_1 = require("./deploy/io");
-function parseFlags(argv) {
-    const patch = { github: {}, lambda: {} };
-    let print = false;
-    let run = false;
-    let nonInteractive = false;
-    for (let i = 0; i < argv.length; i++) {
-        const a = argv[i];
-        const next = () => argv[++i] ?? "";
-        switch (a) {
-            case "--app":
-                patch.app = next();
-                break;
-            case "--region":
-                patch.region = next();
-                break;
-            case "--owner":
-                patch.github.owner = next();
-                break;
-            case "--repo":
-                patch.github.repo = next();
-                break;
-            case "--branch":
-                patch.github.branch = next();
-                break;
-            case "--prefix":
-                patch.namePrefix = next();
-                break;
-            case "--namespace":
-                patch.namespace = next();
-                break;
-            case "--stack-name":
-                patch.stackName = next();
-                break;
-            case "--templates-bucket":
-                patch.templatesBucket = next();
-                break;
-            case "--artifacts-bucket":
-                patch.artifactsBucket = next();
-                break;
-            case "--arch":
-                patch.lambda.arch = next();
-                break;
-            case "--print":
-                print = true;
-                nonInteractive = true;
-                break;
-            case "--run":
-                run = true;
-                break;
-            case "--yes":
-            case "-y":
-            case "--non-interactive":
-                nonInteractive = true;
-                break;
-            default:
-                if (a.startsWith("-")) {
-                    console.error(`Unknown flag: ${a}`);
-                    process.exit(1);
-                }
-        }
-    }
-    return { patch, print, run, nonInteractive };
-}
-function seedConfig(patch) {
-    const existing = (0, io_1.loadConfig)();
-    return existing ? (0, config_1.mergeConfig)(existing, patch) : (0, config_1.normalizeConfig)(patch);
-}
-async function promptMissing(cfg) {
-    return (0, io_1.withPrompt)(async (rl) => {
-        const app = await (0, io_1.ask)(rl, "App slug", cfg.app);
-        const owner = await (0, io_1.ask)(rl, "GitHub owner", cfg.github.owner);
-        const repo = await (0, io_1.ask)(rl, "GitHub repo", cfg.github.repo);
-        const branch = await (0, io_1.ask)(rl, "Deploy branch", cfg.github.branch);
-        const region = await (0, io_1.ask)(rl, "AWS region", cfg.region);
-        const namespace = await (0, io_1.ask)(rl, "Iceberg namespace", cfg.namespace);
-        const artifactsBucket = await (0, io_1.ask)(rl, "Artifacts bucket (from bootstrap stack)", cfg.artifactsBucket ?? "");
-        const templatesBucket = await (0, io_1.ask)(rl, "Templates bucket (from bootstrap stack, optional)", cfg.templatesBucket ?? "");
-        return (0, config_1.mergeConfig)(cfg, {
-            app,
-            region,
-            namespace,
-            artifactsBucket,
-            templatesBucket,
-            github: { owner, repo, branch },
-        });
-    });
-}
-/** Pad a list of `Key=Value` rows into an aligned table. */
-function table(rows) {
-    const width = Math.max(0, ...rows.map((r) => r.key.length));
-    return rows.map((r) => `    ${r.key.padEnd(width)}  ${r.value}`).join("\n");
-}
-function printSummary(cfg) {
-    const src = (0, config_1.templateUrl)(cfg);
-    console.log(`\n  Deployment config (${cfg.stackName} @ ${cfg.region})\n`);
-    console.log("  ── 1. Create the infrastructure (once, by a human) ──");
-    if (!cfg.artifactsBucket) {
-        console.log("    ⚠ artifactsBucket is unset — app.yaml requires it. Run the bootstrap\n" +
-            "      stack first, then set --artifacts-bucket (its ArtifactsBucketName output).");
-    }
-    if (!src) {
-        console.log("    (launching from the in-repo template; set --templates-bucket to launch\n" +
-            "     the hosted app.yaml by URL instead)");
-    }
-    console.log("\n" + (0, config_1.deployStackCommand)(cfg) + "\n");
-    console.log("  ── 2. Wire the GitHub repo Variables (from the stack Outputs) ──");
-    console.log(table((0, config_1.repoVariables)(cfg).map((v) => ({
-        key: v.name,
-        value: v.value || `<${v.from}>`,
-    }))));
-    console.log("\n  ── 3. The Lambda runtime env (set by the stack) ──");
-    console.log(table((0, config_1.lambdaEnv)(cfg)));
-    console.log(`\n  ── 4. Then every push to ${cfg.github.branch} runs \`rastack ci deploy\`. ──\n`);
-}
-function runLaunch(cfg) {
-    const params = (0, config_1.stackParameters)(cfg).map((p) => `${p.key}=${p.value}`);
-    const src = (0, config_1.templateUrl)(cfg);
-    const args = [
-        "cloudformation",
-        "deploy",
-        ...(src
-            ? ["--template-url", src]
-            : ["--template-file", "deploy/cloudformation/app.yaml"]),
-        "--stack-name",
-        cfg.stackName,
-        "--capabilities",
-        "CAPABILITY_NAMED_IAM",
-        "--region",
-        cfg.region,
-        "--parameter-overrides",
-        ...params,
-    ];
-    console.log(`\n  ▸ aws ${args.join(" ")}\n`);
-    try {
-        // Runs the developer's own AWS CLI with args built from their config — no
-        // untrusted input, and `execFileSync` (no shell) avoids any injection.
-        (0, child_process_1.execFileSync)("aws", args, { stdio: "inherit" });
-    }
-    catch (err) {
-        console.error(`\n  ✗ aws cloudformation deploy failed. Is the AWS CLI installed and are` +
-            ` your credentials configured?\n    ${err.message}`);
-        process.exit(1);
-    }
-}
-async function main(argv) {
-    const flags = parseFlags(argv);
-    let cfg = seedConfig(flags.patch);
-    if ((0, io_1.canPrompt)(flags.nonInteractive)) {
-        console.log("\n  rastack deploy — configure the serverless deployment\n");
-        cfg = await promptMissing(cfg);
-    }
-    const errors = (0, config_1.validateConfig)(cfg);
-    if (errors.length) {
-        for (const e of errors)
-            console.error(`  ✗ ${e}`);
-        console.error(`\n  ${errors.length} problem(s) — fix the config and re-run.`);
-        process.exit(1);
-    }
-    if (!flags.print) {
-        const file = (0, io_1.saveConfig)(cfg);
-        console.log(`  ✓ saved ${file}`);
-    }
-    printSummary(cfg);
-    if (flags.run)
-        runLaunch(cfg);
-}
-if (require.main === module) {
-    main(process.argv.slice(2)).catch((err) => {
-        console.error(`  ✗ ${err.message}`);
-        process.exit(1);
-    });
-}