@catladder/cli 0.0.0-next-8b9ad5ca → 0.0.0-next-1cd29c1f

package/dist/pipeline/src/context/transformJobOnlyVars.js

@@ -13,7 +13,7 @@ const envVars_1 = require("./utils/envVars");
  * @returns
  */
 const transformJobOnlyVars = async (env, componentName, vars) => {
-  var _a, _b;
+  var _a;
   if (!vars) {
     return {
       envVars: {},
@@ -21,7 +21,7 @@ const transformJobOnlyVars = async (env, componentName, vars) => {
     };
   }
   const publicVars = (0, envVars_1.stringifyValues)((_a = vars === null || vars === void 0 ? void 0 : vars.public) !== null && _a !== void 0 ? _a : {});
-  const secretEnvVarKeys = (0, envVars_1.stringListToSecreteEnvVarList)((_b = vars === null || vars === void 0 ? void 0 : vars.secret) !== null && _b !== void 0 ? _b : []);
+  const secretEnvVarKeys = (0, envVars_1.normalizeSecretVarsConfig)(vars === null || vars === void 0 ? void 0 : vars.secret);
   const deployJobOnlySecretEnvVars = (vars === null || vars === void 0 ? void 0 : vars.secret) ? (0, envVars_1.makeSecretEnvVarMapping)(env, componentName, secretEnvVarKeys) : {};
   const envVars = {
     ...deployJobOnlySecretEnvVars,

package/dist/pipeline/src/context/transformJobOnlyVars.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformJobOnlyVars.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/transformJobOnlyVars.ts"],"names":[],"mappings":";;;AAEA,6CAIyB;AAEzB;;;;;;GAMG;AACI,MAAM,oBAAoB,GAAG,KAAK,EACvC,GAAW,EACX,aAAqB,EACrB,IAAoB,EAInB,EAAE;;IACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,OAAO,EAAE,EAAE;YACX,gBAAgB,EAAE,EAAE;SACrB,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,yBAAe,EAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,EAAE,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAA,uCAA6B,EAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,EAAE,CAAC,CAAC;IAC3E,MAAM,0BAA0B,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM;QAC7C,CAAC,CAAC,IAAA,iCAAuB,EAAC,GAAG,EAAE,aAAa,EAAE,gBAAgB,CAAC;QAC/D,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,OAAO,GAAG;QACd,GAAG,0BAA0B;QAC7B,GAAG,UAAU;KACd,CAAC;IACF,OAAO;QACL,OAAO;QACP,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,oBAAoB,wBA6B/B"}
+{"version":3,"file":"transformJobOnlyVars.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/transformJobOnlyVars.ts"],"names":[],"mappings":";;;AAEA,6CAIyB;AAEzB;;;;;;GAMG;AACI,MAAM,oBAAoB,GAAG,KAAK,EACvC,GAAW,EACX,aAAqB,EACrB,IAAoB,EAInB,EAAE;;IACH,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,OAAO,EAAE,EAAE;YACX,gBAAgB,EAAE,EAAE;SACrB,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,yBAAe,EAAC,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,mCAAI,EAAE,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,IAAA,mCAAyB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,CAAC;IACjE,MAAM,0BAA0B,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM;QAC7C,CAAC,CAAC,IAAA,iCAAuB,EAAC,GAAG,EAAE,aAAa,EAAE,gBAAgB,CAAC;QAC/D,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,OAAO,GAAG;QACd,GAAG,0BAA0B;QAC7B,GAAG,UAAU;KACd,CAAC;IACF,OAAO;QACL,OAAO;QACP,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,oBAAoB,wBA6B/B"}

package/dist/pipeline/src/context/utils/envVars.d.ts

@@ -1,8 +1,15 @@
 import type { SecretEnvVar } from "../getEnvironmentVariables";
+import type { EnvVars } from "../../types/config";
 export declare const stringifyValues: (obj: Record<string, unknown>) => {
   [k: string]: string;
 };
 export declare const stringListToSecreteEnvVarList: (keys: string[]) => SecretEnvVar[];
+/**
+ * normalizes both config forms of vault-stored env vars: the deprecated
+ * plain string[] (all keys secret) and the record form carrying a kind
+ * (or config object) per key
+ */
+export declare const normalizeSecretVarsConfig: (secret: EnvVars["secret"]) => SecretEnvVar[];
 export declare const makeSecretEnvVarMapping: (env: string, componentName: string, secretEnvVars: SecretEnvVar[]) => {
   [k: string]: import("../../bash/BashExpression").BashExpression;
 };

package/dist/pipeline/src/context/utils/envVars.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.makeSecretEnvVarMapping = exports.stringListToSecreteEnvVarList = exports.stringifyValues = void 0;
+exports.makeSecretEnvVarMapping = exports.normalizeSecretVarsConfig = exports.stringListToSecreteEnvVarList = exports.stringifyValues = void 0;
 const lodash_es_1 = require("lodash-es");
 const getEnvironmentVariables_1 = require("../getEnvironmentVariables");
 const BashExpression_1 = require("../../bash/BashExpression");
@@ -13,6 +13,27 @@ const stringListToSecreteEnvVarList = keys => keys.map(key => ({
   key
 }));
 exports.stringListToSecreteEnvVarList = stringListToSecreteEnvVarList;
+/**
+ * normalizes both config forms of vault-stored env vars: the deprecated
+ * plain string[] (all keys secret) and the record form carrying a kind
+ * (or config object) per key
+ */
+const normalizeSecretVarsConfig = secret => {
+  if (!secret) {
+    return [];
+  }
+  if (Array.isArray(secret)) {
+    return (0, exports.stringListToSecreteEnvVarList)(secret);
+  }
+  return Object.entries(secret).map(([key, config]) => typeof config === "string" ? {
+    key,
+    kind: config
+  } : {
+    key,
+    ...config
+  });
+};
+exports.normalizeSecretVarsConfig = normalizeSecretVarsConfig;
 const makeSecretEnvVarMapping = (env, componentName, secretEnvVars) => {
   return Object.fromEntries(secretEnvVars.map(({
     key

package/dist/pipeline/src/context/utils/envVars.js.map

@@ -1 +1 @@
-{"version":3,"file":"envVars.js","sourceRoot":"","sources":["../../../../../../pipeline/src/context/utils/envVars.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,wEAA8D;AAC9D,8DAA4D;AAErD,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAE,EAAE,CAC9D,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IACxC,GAAG;IACH,IAAA,oBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE;CACrD,CAAC,CACH,CAAC;AANS,QAAA,eAAe,mBAMxB;AAEG,MAAM,6BAA6B,GAAG,CAAC,IAAc,EAAkB,EAAE,CAC9E,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AADlB,QAAA,6BAA6B,iCACX;AACxB,MAAM,uBAAuB,GAAG,CACrC,GAAW,EACX,aAAqB,EACrB,aAA6B,EAC7B,EAAE;IACF,OAAO,MAAM,CAAC,WAAW,CACvB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAC7B,GAAG;QACH,IAAA,gCAAe,EAAC,IAAA,0CAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KAC3D,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC"}
+{"version":3,"file":"envVars.js","sourceRoot":"","sources":["../../../../../../pipeline/src/context/utils/envVars.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,wEAA8D;AAC9D,8DAA4D;AAGrD,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAE,EAAE,CAC9D,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IACxC,GAAG;IACH,IAAA,oBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE;CACrD,CAAC,CACH,CAAC;AANS,QAAA,eAAe,mBAMxB;AAEG,MAAM,6BAA6B,GAAG,CAAC,IAAc,EAAkB,EAAE,CAC9E,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AADlB,QAAA,6BAA6B,iCACX;AAE/B;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,MAAyB,EACT,EAAE;IAClB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAA,qCAA6B,EAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,CAClD,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CACxE,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,yBAAyB,6BAYpC;AACK,MAAM,uBAAuB,GAAG,CACrC,GAAW,EACX,aAAqB,EACrB,aAA6B,EAC7B,EAAE;IACF,OAAO,MAAM,CAAC,WAAW,CACvB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAC7B,GAAG;QACH,IAAA,gCAAe,EAAC,IAAA,0CAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KAC3D,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC"}

package/dist/pipeline/src/customImages/hash.d.ts

@@ -0,0 +1,15 @@
+/**
+ * input for content-hashing an image definition. `extraDirs` covers
+ * image definitions that include other image dirs (dockerfile INCLUDE).
+ */
+export type ImageHashConfig = {
+  dir: string;
+  extraDirs?: string[];
+  hashExtraPaths?: string[];
+  buildArgs?: Record<string, string>;
+};
+export type CustomImageHashResult = {
+  hash: string;
+  watchedPaths: string[];
+};
+export declare function computeCustomImageHash(config: ImageHashConfig): CustomImageHashResult;

package/dist/pipeline/src/customImages/hash.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.computeCustomImageHash = void 0;
+const crypto_1 = require("crypto");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const IGNORED_FILES = new Set([".DS_Store", "Thumbs.db"]);
+const isIgnoredFile = path => {
+  var _a;
+  return IGNORED_FILES.has((_a = path.split("/").pop()) !== null && _a !== void 0 ? _a : "");
+};
+function listFilesRecursive(dir) {
+  const resolved = (0, path_1.resolve)(dir);
+  const entries = (0, fs_1.readdirSync)(resolved, {
+    recursive: true,
+    encoding: "utf-8"
+  });
+  return entries.filter(entry => {
+    if (isIgnoredFile(entry)) {
+      // OS junk files exist locally but not in CI checkouts — they
+      // must never influence the content hash
+      return false;
+    }
+    const fullPath = (0, path_1.join)(resolved, entry);
+    return (0, fs_1.statSync)(fullPath).isFile();
+  }).sort();
+}
+function computeCustomImageHash(config) {
+  var _a;
+  const hash = (0, crypto_1.createHash)("sha256");
+  const watchedPaths = [];
+  // Hash all files in the dir (includes the Dockerfile and any context files)
+  const dirFiles = listFilesRecursive(config.dir);
+  for (const file of dirFiles) {
+    const fullPath = (0, path_1.join)((0, path_1.resolve)(config.dir), file);
+    hash.update(file); // include relative path for disambiguation
+    hash.update((0, fs_1.readFileSync)(fullPath));
+  }
+  watchedPaths.push(`${config.dir}/**/*`);
+  // extra dirs (e.g. included base image definitions)
+  for (const extraDir of (_a = config.extraDirs) !== null && _a !== void 0 ? _a : []) {
+    for (const file of listFilesRecursive(extraDir)) {
+      hash.update(file);
+      hash.update((0, fs_1.readFileSync)((0, path_1.join)((0, path_1.resolve)(extraDir), file)));
+    }
+    watchedPaths.push(`${extraDir}/**/*`);
+  }
+  // Hash extra paths (for files outside the dir)
+  if (config.hashExtraPaths) {
+    // Extra paths are literal file paths (not globs) for simplicity
+    const extraFiles = [...config.hashExtraPaths].sort();
+    for (const file of extraFiles) {
+      hash.update(file);
+      hash.update((0, fs_1.readFileSync)(file));
+    }
+    watchedPaths.push(...config.hashExtraPaths);
+  }
+  // Hash build args (sorted keys for determinism)
+  if (config.buildArgs) {
+    const sorted = Object.entries(config.buildArgs).sort(([a], [b]) => a.localeCompare(b));
+    hash.update(JSON.stringify(sorted));
+  }
+  return {
+    hash: hash.digest("hex").slice(0, 12),
+    watchedPaths
+  };
+}
+exports.computeCustomImageHash = computeCustomImageHash;

package/dist/pipeline/src/customImages/hash.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../../../../pipeline/src/customImages/hash.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,2BAAyD;AACzD,+BAAqC;AAiBrC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AAC1D,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,WACrC,OAAA,aAAa,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,mCAAI,EAAE,CAAC,CAAA,EAAA,CAAC;AAEjD,SAAS,kBAAkB,CAAC,GAAW;IACrC,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAA,gBAAW,EAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9E,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAChB,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,6DAA6D;YAC7D,wCAAwC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;IACrC,CAAC,CAAC;SACD,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,sBAAsB,CACpC,MAAuB;;IAEvB,MAAM,IAAI,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC;IAClC,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,4EAA4E;IAC5E,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEhD,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,2CAA2C;QAC9D,IAAI,CAAC,MAAM,CAAC,IAAA,iBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC;IACtC,CAAC;IACD,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC;IAExC,oDAAoD;IACpD,KAAK,MAAM,QAAQ,IAAI,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,EAAE,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,+CAA+C;IAC/C,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;QAC1B,gEAAgE;QAChE,MAAM,UAAU,GAAG,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;QACrD,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;IAC9C,CAAC;IAED,gDAAgD;IAChD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAChE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CACnB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QACrC,YAAY;KACb,CAAC;AACJ,CAAC;AAhDD,wDAgDC"}

package/dist/pipeline/src/customImages/jobImagesPlan.d.ts

@@ -0,0 +1,59 @@
+import type { CatladderImageRef } from "../runner";
+import type { Config, GitlabJobImage, PipelineType } from "../types";
+import type { CatladderJob, CatladderJobNeed } from "../types/jobs";
+export declare const GENERATED_IMAGES_FOLDER = ".catladder-generated/images";
+export type JobImagesMode = "central" | "repo";
+export declare const getJobImagesMode: (config: Config, pipelineType: PipelineType) => JobImagesMode;
+export type ResolvedJobImage = {
+  /** the concrete image url */
+  image: string;
+  /** the dependency on the image build job (repo mode only) */
+  need?: CatladderJobNeed;
+  /** whether the image lives in the repository's own registry */
+  fromRepoRegistry?: boolean;
+};
+export type GeneratedImageFile = {
+  path: string;
+  content: string;
+};
+/**
+ * plans the catladder job images of one backend run: resolves image
+ * references, and (in repo mode) collects the image build jobs and the
+ * image definitions to materialize into the generated files.
+ *
+ * Reference-driven: only images actually used by a job are built.
+ */
+export declare class JobImagesPlan {
+  readonly mode: JobImagesMode;
+  private readonly pipelineType;
+  private used;
+  constructor(mode: JobImagesMode, pipelineType: PipelineType);
+  /**
+   * resolves a job image (marker or concrete) to a concrete image url
+   * plus the build job dependency in repo mode
+   */
+  resolve(image: CatladderJob["image"]): {
+    image: GitlabJobImage | undefined;
+    need?: CatladderJobNeed;
+    fromRepoRegistry?: boolean;
+  };
+  resolveRef(ref: CatladderImageRef): ResolvedJobImage;
+  /**
+   * the registry image prefix. On github, container images can't use
+   * runtime env vars — the expression form is required.
+   */
+  private registryImageRef;
+  private use;
+  /**
+   * the image build jobs for all used images (repo mode; empty in
+   * central mode)
+   */
+  getEnsureJobs(): CatladderJob[];
+  private createEnsureJob;
+  /**
+   * the image definitions of all used images, materialized into the
+   * generated files (so pipelines build from committed, reviewable
+   * files and gitlab's rules:changes can watch them)
+   */
+  getGeneratedFiles(): GeneratedImageFile[];
+}

package/dist/pipeline/src/customImages/jobImagesPlan.js

@@ -0,0 +1,172 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.JobImagesPlan = exports.getJobImagesMode = exports.GENERATED_IMAGES_FOLDER = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const ciVariables_1 = require("../bash/ciVariables");
+const docker_1 = require("../build/docker");
+const constants_1 = require("../constants");
+const runner_1 = require("../runner");
+const gitlab_1 = require("../utils/gitlab");
+const hash_1 = require("./hash");
+const shippedImages_1 = require("./shippedImages");
+exports.GENERATED_IMAGES_FOLDER = ".catladder-generated/images";
+/**
+ * the official docker cli image used to build the job images — NOT a
+ * catladder image, so building images never depends on one (bootstrap)
+ */
+const BUILDER_IMAGE = "docker.io/docker:29.5.1";
+const getJobImagesMode = (config, pipelineType) => {
+  var _a;
+  // the central registry is not reachable from github runners
+  if (pipelineType === "github" && config.jobImages === "central") {
+    throw new Error(`jobImages: "central" is not supported on github: catladder's central registry (${constants_1.DOCKER_REGISTRY}) is unreachable from github runners. Use "repo" (the default) instead.`);
+  }
+  return (_a = config.jobImages) !== null && _a !== void 0 ? _a : pipelineType === "github" ? "repo" : "central";
+};
+exports.getJobImagesMode = getJobImagesMode;
+const ensureJobName = name => `🐳 job image ${name}`;
+/**
+ * plans the catladder job images of one backend run: resolves image
+ * references, and (in repo mode) collects the image build jobs and the
+ * image definitions to materialize into the generated files.
+ *
+ * Reference-driven: only images actually used by a job are built.
+ */
+class JobImagesPlan {
+  constructor(mode, pipelineType) {
+    this.mode = mode;
+    this.pipelineType = pipelineType;
+    this.used = new Map();
+  }
+  /**
+   * resolves a job image (marker or concrete) to a concrete image url
+   * plus the build job dependency in repo mode
+   */
+  resolve(image) {
+    if (!(0, runner_1.isCatladderImageRef)(image)) {
+      return {
+        image
+      };
+    }
+    return this.resolveRef(image);
+  }
+  resolveRef(ref) {
+    const name = ref.catladderImage;
+    if (this.mode === "central" || shippedImages_1.CENTRAL_ONLY_IMAGES.has(name)) {
+      return {
+        image: (0, runner_1.getCentralRunnerImageUrl)(name)
+      };
+    }
+    const {
+      hash
+    } = this.use(name);
+    return {
+      image: `${this.registryImageRef()}/catladder/${name}:${hash}`,
+      fromRepoRegistry: true,
+      need: {
+        job: ensureJobName(name),
+        artifacts: false,
+        optional: true,
+        global: true
+      }
+    };
+  }
+  /**
+   * the registry image prefix. On github, container images can't use
+   * runtime env vars — the expression form is required.
+   */
+  registryImageRef() {
+    return this.pipelineType === "github" ? "ghcr.io/${{ github.repository }}" : `${(0, ciVariables_1.getCiVariable)({
+      pipelineType: this.pipelineType
+    }, "registryImage")}`;
+  }
+  use(name) {
+    var _a;
+    const existing = this.used.get(name);
+    if (existing) {
+      return existing;
+    }
+    const dependencies = (_a = shippedImages_1.RUNNER_IMAGE_DEPENDENCIES[name]) !== null && _a !== void 0 ? _a : [];
+    // dependencies are materialized (and hashed) as part of this image,
+    // but also usable standalone
+    dependencies.forEach(dependency => this.use(dependency));
+    const {
+      hash
+    } = (0, hash_1.computeCustomImageHash)({
+      dir: (0, shippedImages_1.getShippedImageDir)(name),
+      extraDirs: dependencies.map(dependency => (0, shippedImages_1.getShippedImageDir)(dependency))
+    });
+    const entry = {
+      hash
+    };
+    this.used.set(name, entry);
+    return entry;
+  }
+  /**
+   * the image build jobs for all used images (repo mode; empty in
+   * central mode)
+   */
+  getEnsureJobs() {
+    return [...this.used.entries()].map(([name, {
+      hash
+    }]) => this.createEnsureJob(name, hash));
+  }
+  createEnsureJob(name, hash) {
+    var _a;
+    const ctx = {
+      pipelineType: this.pipelineType
+    };
+    const registryUser = (0, ciVariables_1.getCiVariable)(ctx, "registryUser");
+    const jobToken = (0, ciVariables_1.getCiVariable)(ctx, "jobToken");
+    const registry = (0, ciVariables_1.getCiVariable)(ctx, "registry");
+    const imageRef = `${this.registryImageRef()}/catladder/${name}:${hash}`;
+    const watchedDirs = [name, ...((_a = shippedImages_1.RUNNER_IMAGE_DEPENDENCIES[name]) !== null && _a !== void 0 ? _a : [])];
+    const {
+      services,
+      runnerVariables
+    } = (0, docker_1.getDockerJobBaseProps)();
+    return {
+      name: ensureJobName(name),
+      stage: "setup",
+      image: BUILDER_IMAGE,
+      services,
+      runnerVariables,
+      needs: [],
+      // gitlab: only run when the image definition changed; github has
+      // no equivalent and always runs (the existence check is fast)
+      rules: [{
+        changes: watchedDirs.map(dir => `${exports.GENERATED_IMAGES_FOLDER}/${dir}/**/*`)
+      }],
+      variables: {},
+      script: [...(0, gitlab_1.collapseableSection)("docker-login", "Docker Login")([`docker login --username ${registryUser} --password ${jobToken} ${registry}`]), ...(0, gitlab_1.collapseableSection)("check-image", "Checking if image exists")([`if docker manifest inspect ${imageRef} > /dev/null 2>&1; then`, `  echo "Image ${imageRef} already exists, skipping build"`, `  exit 0`, `fi`]), ...(0, gitlab_1.collapseableSection)("docker-build", "Building image")([`DOCKER_BUILDKIT=1 docker build -t ${imageRef} -f ${exports.GENERATED_IMAGES_FOLDER}/${name}/Dockerfile ${shippedImages_1.RUNNER_IMAGE_BUILD_CONTEXT[name] === "root" ? exports.GENERATED_IMAGES_FOLDER : `${exports.GENERATED_IMAGES_FOLDER}/${name}`}`]), ...(0, gitlab_1.collapseableSection)("docker-push", "Pushing image")([`docker push ${imageRef}`])]
+    };
+  }
+  /**
+   * the image definitions of all used images, materialized into the
+   * generated files (so pipelines build from committed, reviewable
+   * files and gitlab's rules:changes can watch them)
+   */
+  getGeneratedFiles() {
+    return [...this.used.keys()].flatMap(name => {
+      const dir = (0, shippedImages_1.getShippedImageDir)(name);
+      return listFilesRecursive(dir).map(file => ({
+        path: (0, path_1.join)(exports.GENERATED_IMAGES_FOLDER, name, file),
+        content: (0, fs_1.readFileSync)((0, path_1.join)(dir, file), "utf-8")
+      }));
+    });
+  }
+}
+exports.JobImagesPlan = JobImagesPlan;
+const IGNORED_FILES = new Set([".DS_Store", "Thumbs.db"]);
+const listFilesRecursive = dir => (0, fs_1.readdirSync)(dir, {
+  recursive: true,
+  encoding: "utf-8"
+}).filter(entry => {
+  var _a;
+  // OS junk files exist locally but not in CI checkouts
+  return !IGNORED_FILES.has((_a = entry.split("/").pop()) !== null && _a !== void 0 ? _a : "") && (0, fs_1.statSync)((0, path_1.join)(dir, entry)).isFile();
+}).sort();

package/dist/pipeline/src/customImages/jobImagesPlan.js.map

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

package/dist/pipeline/src/customImages/shippedImages.d.ts

@@ -0,0 +1,28 @@
+import type { RunnerImageName } from "../runner";
+/**
+ * images whose Dockerfile INCLUDEs another image's Dockerfile
+ * (dockerfile-x/dockerfile-plus, resolved against the images root as
+ * build context)
+ */
+export declare const RUNNER_IMAGE_DEPENDENCIES: Partial<Record<RunnerImageName, RunnerImageName[]>>;
+/**
+ * the docker build context of each image, mirroring the central image
+ * builds: the jobs family builds from the images root (their
+ * Dockerfiles INCLUDE sibling images), the others from their own dir
+ * (their COPY paths are relative to it)
+ */
+/**
+ * images that cannot be built from the shipped definitions and always
+ * come from the central registry: semantic-release bakes catladder's
+ * own cli sources into the image (repo-root build context).
+ * TODO: make the semantic-release image self-contained.
+ */
+export declare const CENTRAL_ONLY_IMAGES: ReadonlySet<RunnerImageName>;
+export declare const RUNNER_IMAGE_BUILD_CONTEXT: Record<RunnerImageName, "root" | "self">;
+/**
+ * the directory containing the image definitions shipped with the
+ * package (copied into dist at build time; the repository layout is
+ * the fallback for development and tests)
+ */
+export declare const getShippedImagesDir: () => string;
+export declare const getShippedImageDir: (name: RunnerImageName) => string;

package/dist/pipeline/src/customImages/shippedImages.js

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getShippedImageDir = exports.getShippedImagesDir = exports.RUNNER_IMAGE_BUILD_CONTEXT = exports.CENTRAL_ONLY_IMAGES = exports.RUNNER_IMAGE_DEPENDENCIES = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+/**
+ * images whose Dockerfile INCLUDEs another image's Dockerfile
+ * (dockerfile-x/dockerfile-plus, resolved against the images root as
+ * build context)
+ */
+exports.RUNNER_IMAGE_DEPENDENCIES = {
+  "jobs-meteor": ["jobs-default"],
+  "jobs-testing-chrome": ["jobs-default"]
+};
+/**
+ * the docker build context of each image, mirroring the central image
+ * builds: the jobs family builds from the images root (their
+ * Dockerfiles INCLUDE sibling images), the others from their own dir
+ * (their COPY paths are relative to it)
+ */
+/**
+ * images that cannot be built from the shipped definitions and always
+ * come from the central registry: semantic-release bakes catladder's
+ * own cli sources into the image (repo-root build context).
+ * TODO: make the semantic-release image self-contained.
+ */
+exports.CENTRAL_ONLY_IMAGES = new Set(["semantic-release"]);
+exports.RUNNER_IMAGE_BUILD_CONTEXT = {
+  "jobs-default": "root",
+  "jobs-meteor": "root",
+  "jobs-testing-chrome": "root",
+  kubernetes: "self",
+  "docker-build": "self",
+  gcloud: "self",
+  "semantic-release": "self",
+  "agent-claude": "self"
+};
+/**
+ * the directory containing the image definitions shipped with the
+ * package (copied into dist at build time; the repository layout is
+ * the fallback for development and tests)
+ */
+const getShippedImagesDir = () => {
+  const candidates = [
+  // built package: dist/customImages -> dist/runner-images
+  (0, path_1.join)(__dirname, "..", "runner-images"),
+  // repository: pipeline/src/customImages -> <root>/runner-images
+  (0, path_1.join)(__dirname, "..", "..", "..", "runner-images")];
+  const found = candidates.find(candidate => (0, fs_1.existsSync)(candidate));
+  if (!found) {
+    throw new Error("shipped job image definitions not found");
+  }
+  return found;
+};
+exports.getShippedImagesDir = getShippedImagesDir;
+const getShippedImageDir = name => (0, path_1.join)((0, exports.getShippedImagesDir)(), name);
+exports.getShippedImageDir = getShippedImageDir;

package/dist/pipeline/src/customImages/shippedImages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shippedImages.js","sourceRoot":"","sources":["../../../../../pipeline/src/customImages/shippedImages.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAChC,+BAA4B;AAG5B;;;;GAIG;AACU,QAAA,yBAAyB,GAElC;IACF,aAAa,EAAE,CAAC,cAAc,CAAC;IAC/B,qBAAqB,EAAE,CAAC,cAAc,CAAC;CACxC,CAAC;AAEF;;;;;GAKG;AACH;;;;;GAKG;AACU,QAAA,mBAAmB,GAAiC,IAAI,GAAG,CAAC;IACvE,kBAAkB;CACnB,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAGnC;IACF,cAAc,EAAE,MAAM;IACtB,aAAa,EAAE,MAAM;IACrB,qBAAqB,EAAE,MAAM;IAC7B,UAAU,EAAE,MAAM;IAClB,cAAc,EAAE,MAAM;IACtB,MAAM,EAAE,MAAM;IACd,kBAAkB,EAAE,MAAM;IAC1B,cAAc,EAAE,MAAM;CACvB,CAAC;AAEF;;;;GAIG;AACI,MAAM,mBAAmB,GAAG,GAAW,EAAE;IAC9C,MAAM,UAAU,GAAG;QACjB,yDAAyD;QACzD,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,eAAe,CAAC;QACtC,gEAAgE;QAChE,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC;KACnD,CAAC;IACF,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,SAAS,CAAC,CAAC,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B;AAEK,MAAM,kBAAkB,GAAG,CAAC,IAAqB,EAAU,EAAE,CAClE,IAAA,WAAI,EAAC,IAAA,2BAAmB,GAAE,EAAE,IAAI,CAAC,CAAC;AADvB,QAAA,kBAAkB,sBACK"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts

@@ -1,11 +1,14 @@
 import type { ComponentContext } from "../../../types/context";
-import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
 export declare const gcloudCmd: (version?: "beta") => string;
 export declare const gcloudRunCmd: (version?: "beta") => string;
 export declare const gcloudSchedulerCmd: (version?: "beta") => string;
-export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCloudRun) => string[];
+/**
+ * the default compute service account of the gcloud project — used by
+ * cloud scheduler to authenticate its calls
+ */
+export declare const getComputeServiceAccountEmail: (context: ComponentContext) => string;
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
-export declare const getCloudRunDeployConfig: (context: ComponentContext) => DeployConfigCloudRun;
+export declare const getCloudRunDeployConfig: (context: ComponentContext) => import("../../types").DeployConfigCloudRun;
 export declare function getCommonCloudRunArgs(context: ComponentContext): {
   project: string;
   region: import("../../types").Gcloudregion;

package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
+exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.getComputeServiceAccountEmail = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
+const store_1 = require("../../../store");
 const types_1 = require("../../types");
 const artifactsRegistry_1 = require("../artifactsRegistry");
 const gcloudCmd = version => {
@@ -18,8 +19,15 @@ const gcloudSchedulerCmd = version => {
   return `${(0, exports.gcloudCmd)(version)} scheduler`;
 };
 exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
-const setGoogleProjectNumberScript = deployConfig => [`export GCLOUD_PROJECT_NUMBER=$(${(0, exports.gcloudCmd)()} projects describe ${deployConfig.projectId} --format="value(projectNumber)")`, 'echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"'];
-exports.setGoogleProjectNumberScript = setGoogleProjectNumberScript;
+/**
+ * the default compute service account of the gcloud project — used by
+ * cloud scheduler to authenticate its calls
+ */
+const getComputeServiceAccountEmail = context => {
+  const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+  return `${(0, store_1.getGcloudProjectNumber)(context.fullConfig, deployConfig.projectId)}-compute@developer.gserviceaccount.com`;
+};
+exports.getComputeServiceAccountEmail = getComputeServiceAccountEmail;
 const makeLabelString = obj => Object.entries(obj).map(([key, value]) => `${key}=${value}`).join(",");
 exports.makeLabelString = makeLabelString;
 const getCloudRunDeployConfig = context => {

package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;AAEA,uCAA6C;AAE7C,4DAAiE;AAE1D,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC5C,OAAO,OAAO,CAAC,CAAC,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC/C,OAAO,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACrD,OAAO,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,YAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,MAAM,4BAA4B,GAAG,CAC1C,YAAkC,EAClC,EAAE,CAAC;IACH,kCAAkC,IAAA,iBAAS,GAAE,sBAC3C,YAAY,CAAC,SACf,mCAAmC;IACnC,sDAAsD;CACvD,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAE,EAAE,CAC9D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;KAChB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;KACxC,IAAI,CAAC,GAAG,CAAC,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,MAAM,uBAAuB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEF,SAAgB,qBAAqB,CAAC,OAAyB;IAC7D,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,OAAyB;IAC3D,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,KAAK,EAAE,IAAA,6CAAyB,EAAC,OAAO,CAAC;QACzC,GAAG,UAAU;QACb,wBAAwB,EAAE,YAAY,CAAC,QAAQ;YAC7C,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB;YAC9C,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC;AAVD,kDAUC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;AAEA,0CAAwD;AACxD,uCAA6C;AAC7C,4DAAiE;AAE1D,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC5C,OAAO,OAAO,CAAC,CAAC,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC/C,OAAO,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACrD,OAAO,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,YAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEF;;;GAGG;AACI,MAAM,6BAA6B,GAAG,CAAC,OAAyB,EAAE,EAAE;IACzE,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO,GAAG,IAAA,8BAAsB,EAC9B,OAAO,CAAC,UAAU,EAClB,YAAY,CAAC,SAAS,CACvB,wCAAwC,CAAC;AAC5C,CAAC,CAAC;AANW,QAAA,6BAA6B,iCAMxC;AAEK,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAE,EAAE,CAC9D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;KAChB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;KACxC,IAAI,CAAC,GAAG,CAAC,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,MAAM,uBAAuB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEF,SAAgB,qBAAqB,CAAC,OAAyB;IAC7D,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,OAAyB;IAC3D,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,KAAK,EAAE,IAAA,6CAAyB,EAAC,OAAO,CAAC;QACzC,GAAG,UAAU;QACb,wBAAwB,EAAE,YAAY,CAAC,QAAQ;YAC7C,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB;YAC9C,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC;AAVD,kDAUC"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.js

@@ -77,7 +77,7 @@ const getSchedulerArgs = (scheduler, context) => {
       }),
       "message-body": body ? '"' + (0, bash_1.bashEscape)(JSON.stringify(body)) + '"' : undefined,
       "http-method": "POST",
-      "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`
+      "oauth-service-account-email": `"${(0, common_1.getComputeServiceAccountEmail)(context)}"`
     };
   }
   if (scheduler.type === "http") {
@@ -85,7 +85,7 @@ const getSchedulerArgs = (scheduler, context) => {
       uri: scheduler.url,
       "message-body": scheduler.body,
       "http-method": scheduler.method,
-      "oidc-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`
+      "oidc-service-account-email": `"${(0, common_1.getComputeServiceAccountEmail)(context)}"`
     };
   }
   throw new Error(`Unknown scheduler type: ${scheduler.type}`);

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/schedules.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/schedules.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js

@@ -22,7 +22,7 @@ function getCloudRunDeployScripts(context) {
   var _a, _b;
   const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
   const allEnvVars = (0, lodash_es_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  return [...(0, gitlab_1.collapseableSection)("prepare", "Prepare...")([...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context), ...(0, common_1.setGoogleProjectNumberScript)(deployConfig)]), ...(0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME)), ...(0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")([...(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  return [...(0, gitlab_1.collapseableSection)("prepare", "Prepare...")([...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)]), ...(0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME)), ...(0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")([...(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), ...(0, schedules_1.getCreateScheduleScript)(context), ...(0, cloudRunJobs_1.getJobCreateScripts)(context), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "preDeploy"), ...(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(([_, service]) => service !== false && service !== null).map(([name, service]) => (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name)), ...Object.entries((_b = deployConfig.workerPools) !== null && _b !== void 0 ? _b : {}).filter(([_, workerPool]) => workerPool !== false && workerPool !== null).map(([name, workerPool]) => (0, cloudRunWorkerPools_1.getWorkerPoolDeployScript)(context, workerPool, name)), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")]), ...(0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))];
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;