rastack 0.0.41 → 0.0.42

package/src/rastack-init.ts

@@ -56,6 +56,7 @@ import {
   ghAvailable,
   gitRemoteUrl,
   loadConfig,
+  resolveDeployAsset,
   saveConfig,
   setRepoVariable,
   stackOutput,
@@ -209,13 +210,15 @@ function printPlan(cfg: DeployConfig): void {
   const withBucket = mergeConfig(cfg, {
     artifactsBucket: bucket ?? "<ArtifactsBucketName from bootstrap stack>",
   });
+  const bootstrapTemplate = resolveDeployAsset("bootstrap.yaml") ?? undefined;
+  const appTemplate = resolveDeployAsset("app.yaml") ?? undefined;
   console.log(`\n  Deployment plan (${cfg.stackName} @ ${cfg.region})\n`);
   console.log(
     `  ── 1. Bootstrap stack (${bootstrapStackName(cfg)}) — run only if it does not exist ──`,
   );
-  console.log("\n  " + bootstrapStackCommand(cfg) + "\n");
+  console.log("\n  " + bootstrapStackCommand(cfg, false, bootstrapTemplate) + "\n");
   console.log("  ── 2. Per-app backend (app.yaml) ──");
-  console.log("\n  " + deployStackCommand(withBucket) + "\n");
+  console.log("\n  " + deployStackCommand(withBucket, appTemplate) + "\n");
   console.log(
     "  ── 3. Wire these GitHub repo Variables from the stack Outputs ──",
   );
@@ -285,7 +288,7 @@ async function standUp(
   console.log("\n▸ Uploading the Lambda placeholder bundle");
   if (!uploadPlaceholder(artifactsBucket, cfg.region)) {
     console.error(
-      "  ✗ deploy/cloudformation/placeholder/bootstrap not found — cannot create the function.",
+      "  ✗ Lambda placeholder bundle not found in the rastack package — cannot create the function.",
     );
     process.exit(1);
   }
@@ -295,9 +298,17 @@ async function standUp(
     artifactsBucket,
     templatesBucket: templatesBucket ?? undefined,
   });
+  const appTemplate = resolveDeployAsset("app.yaml");
+  if (!appTemplate) {
+    console.error(
+      "  ✗ app.yaml template not found in the rastack package. Reinstall rastack\n" +
+        "    (`npm i -g rastack`) or run from the framework repo.",
+    );
+    process.exit(1);
+  }
   console.log(`\n▸ Deploying ${cfg.stackName}`);
   try {
-    awsRun(deployStackArgs(cfg));
+    awsRun(deployStackArgs(cfg, appTemplate));
   } catch (err) {
     console.error(
       `\n  ✗ aws cloudformation deploy failed for ${cfg.stackName}.\n    ${(err as Error).message}`,
@@ -372,8 +383,16 @@ function wireRepoVariables(cfg: DeployConfig, interactive: boolean): void {
 
 /** Deploy the bootstrap stack, retrying once against an existing OIDC provider. */
 function deployBootstrap(cfg: DeployConfig): void {
+  const template = resolveDeployAsset("bootstrap.yaml");
+  if (!template) {
+    console.error(
+      "  ✗ bootstrap.yaml template not found in the rastack package. Reinstall\n" +
+        "    rastack (`npm i -g rastack`) or run from the framework repo.",
+    );
+    process.exit(1);
+  }
   try {
-    awsRun(bootstrapStackArgs(cfg));
+    awsRun(bootstrapStackArgs(cfg, false, template));
   } catch {
     // The most common cause is an account that already has a GitHub OIDC
     // provider (only one is allowed per URL). Retry telling the template to
@@ -382,7 +401,7 @@ function deployBootstrap(cfg: DeployConfig): void {
       "  • retrying bootstrap, reusing the account's existing GitHub OIDC provider",
     );
     try {
-      awsRun(bootstrapStackArgs(cfg, true));
+      awsRun(bootstrapStackArgs(cfg, true, template));
     } catch (err) {
       console.error(
         `\n  ✗ bootstrap stack deploy failed.\n    ${(err as Error).message}`,

package/test/deploy.spec.ts

@@ -243,6 +243,19 @@ describe("stack parameters + launch command", () => {
       "deploy",
     ]);
   });
+
+  it("accepts a template-file override (the package-resolved path)", () => {
+    // `init` runs in a consumer repo that carries no framework IaC, so it passes
+    // the path the template was resolved to inside the `rastack` package.
+    const cfg = base({ artifactsBucket: "art" });
+    const abs = "/opt/rastack/dist/templates/cloudformation/app.yaml";
+    expect(deployStackArgs(cfg, abs)).toContain(abs);
+    expect(deployStackCommand(cfg, abs)).toContain(`--template-file ${abs}`);
+    // Default is unchanged when no override is given.
+    expect(deployStackCommand(cfg)).toContain(
+      "--template-file deploy/cloudformation/app.yaml",
+    );
+  });
 });
 
 describe("bootstrap stack", () => {
@@ -281,6 +294,21 @@ describe("bootstrap stack", () => {
     expect(`aws ${bootstrapStackArgs(base()).join(" ")}`).toBe(cmd);
   });
 
+  it("accepts a template-file override (the package-resolved path)", () => {
+    const abs = "/opt/rastack/dist/templates/cloudformation/bootstrap.yaml";
+    expect(bootstrapStackArgs(base(), false, abs)).toContain(abs);
+    expect(bootstrapStackCommand(base(), true, abs)).toContain(
+      `--template-file ${abs}`,
+    );
+    // Reuse-OIDC + override compose without disturbing the default path.
+    expect(bootstrapStackArgs(base(), true, abs)).toContain(
+      "CreateOIDCProvider=false",
+    );
+    expect(bootstrapStackCommand(base())).toContain(
+      "--template-file deploy/cloudformation/bootstrap.yaml",
+    );
+  });
+
   it("validates only the account-level fields, not the per-app ones", () => {
     // A config with no `app` is fine for bootstrap — it never touches app.yaml.
     const cfg = normalizeConfig({
@@ -513,3 +541,28 @@ describe("scaffold", () => {
     expect(files.map((f) => f.path)).toEqual([CONFIG_PATH]);
   });
 });
+
+describe("resolveDeployAsset — bundled template resolution", () => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { resolveDeployAsset } = require("../src/deploy/io");
+  const path = require("path");
+
+  it("resolves the framework templates to an existing file", () => {
+    for (const name of ["app.yaml", "bootstrap.yaml"]) {
+      const resolved = resolveDeployAsset(name);
+      expect(resolved).not.toBeNull();
+      expect(path.isAbsolute(resolved)).toBe(true);
+      expect(resolved.endsWith(name)).toBe(true);
+    }
+  });
+
+  it("resolves the Lambda placeholder bundle", () => {
+    const resolved = resolveDeployAsset(path.join("placeholder", "bootstrap"));
+    expect(resolved).not.toBeNull();
+    expect(resolved.endsWith(path.join("placeholder", "bootstrap"))).toBe(true);
+  });
+
+  it("returns null for an asset that does not exist", () => {
+    expect(resolveDeployAsset("does-not-exist.yaml")).toBeNull();
+  });
+});