@deployfoundation/foundation-deploy 0.2.41 → 0.2.42

package/dist/bin/app.js

@@ -18,9 +18,43 @@ import {
 import"../chunk-dz91avrb.js";
 
 // bin/app.ts
+import * as cdk from "aws-cdk-lib";
+
+// src/deploy/repo-path.ts
 import { execFileSync } from "node:child_process";
 import { basename, dirname, relative, resolve, sep } from "node:path";
-import * as cdk from "aws-cdk-lib";
+function inside(root, absolute) {
+  const rel = relative(root, absolute);
+  return rel !== "" && !rel.startsWith("..") ? rel.split(sep).join("/") : undefined;
+}
+function gitTopLevel(directory) {
+  try {
+    return execFileSync("git", ["rev-parse", "--show-toplevel"], {
+      cwd: directory,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString().trim();
+  } catch {
+    return;
+  }
+}
+function repoRelativePath(filePath, env = process.env, topLevel = gitTopLevel) {
+  const absolute = resolve(filePath);
+  const codebuildRoot = env.CODEBUILD_SRC_DIR;
+  if (codebuildRoot !== undefined && codebuildRoot !== "") {
+    const rel = inside(resolve(codebuildRoot), absolute);
+    if (rel !== undefined)
+      return rel;
+  }
+  const top = topLevel(dirname(absolute));
+  if (top !== undefined) {
+    const rel = inside(top, absolute);
+    if (rel !== undefined)
+      return rel;
+  }
+  return basename(absolute);
+}
+
+// bin/app.ts
 var app = new cdk.App;
 var instanceFilePath = app.node.tryGetContext("instanceFile");
 if (instanceFilePath === undefined || instanceFilePath === "")
@@ -109,19 +143,6 @@ if (instance.newsletter.enabled)
   });
 cdk.Tags.of(app).add("project", instance.naming.secretPrefix);
 app.synth();
-function repoRelativePath(filePath) {
-  const absolute = resolve(filePath);
-  try {
-    const top = execFileSync("git", ["rev-parse", "--show-toplevel"], {
-      cwd: dirname(absolute),
-      stdio: ["ignore", "pipe", "ignore"]
-    }).toString().trim();
-    const rel = relative(top, absolute);
-    if (rel !== "" && !rel.startsWith(".."))
-      return rel.split(sep).join("/");
-  } catch {}
-  return basename(absolute);
-}
 export {
   env
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deployfoundation/foundation-deploy",
-  "version": "0.2.41",
+  "version": "0.2.42",
   "description": "Deploys one Foundation instance from a published, signed release: the CDK app and the deploy tool.",
   "license": "UNLICENSED",
   "private": false,

package/src/deploy/repo-path.ts

@@ -0,0 +1,54 @@
+/**
+ * The instance file's path INSIDE the instance repository, which is what the
+ * pipeline's CodeBuild project is told to deploy from.
+ *
+ * Two places run a deploy, and they find the repository root differently:
+ *
+ * - A person's checkout is a git work tree, so `git rev-parse` names the root.
+ * - CodeBuild unpacks CodePipeline's source artifact into `CODEBUILD_SRC_DIR`.
+ *   That is a zip of the repository, not a git work tree, so `git rev-parse`
+ *   fails there. Falling back to the bare file name made every pipeline deploy
+ *   rewrite its own `FOUNDATION_INSTANCE_FILE` to `instance.yaml`, and the
+ *   next run failed with "no instance file" (Sky and Olivia, 2026-10-11).
+ */
+import { execFileSync } from "node:child_process";
+import { basename, dirname, relative, resolve, sep } from "node:path";
+
+/** `rel` when it names a file under the root, else undefined. */
+function inside(root: string, absolute: string): string | undefined {
+  const rel = relative(root, absolute);
+  return rel !== "" && !rel.startsWith("..") ? rel.split(sep).join("/") : undefined;
+}
+
+function gitTopLevel(directory: string): string | undefined {
+  try {
+    return execFileSync("git", ["rev-parse", "--show-toplevel"], {
+      cwd: directory,
+      stdio: ["ignore", "pipe", "ignore"],
+    })
+      .toString()
+      .trim();
+  } catch {
+    // Not inside a git work tree.
+    return undefined;
+  }
+}
+
+export function repoRelativePath(
+  filePath: string,
+  env: Record<string, string | undefined> = process.env,
+  topLevel: (directory: string) => string | undefined = gitTopLevel,
+): string {
+  const absolute = resolve(filePath);
+  const codebuildRoot = env.CODEBUILD_SRC_DIR;
+  if (codebuildRoot !== undefined && codebuildRoot !== "") {
+    const rel = inside(resolve(codebuildRoot), absolute);
+    if (rel !== undefined) return rel;
+  }
+  const top = topLevel(dirname(absolute));
+  if (top !== undefined) {
+    const rel = inside(top, absolute);
+    if (rel !== undefined) return rel;
+  }
+  return basename(absolute);
+}