@catladder/pipeline 1.55.0 → 1.56.0

package/dist/context/getEnvironmentVariables.js

@@ -0,0 +1,322 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function () {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+
+        case 7:
+          op = _.ops.pop();
+
+          _.trys.pop();
+
+          continue;
+
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+
+            _.ops.push(op);
+
+            break;
+          }
+
+          if (t[2]) _.ops.pop();
+
+          _.trys.pop();
+
+          continue;
+      }
+
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+
+exports.__esModule = true;
+exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironmentVariables = void 0;
+
+var lodash_1 = require("lodash");
+
+var deploy_1 = require("../deploy");
+
+var getEnvironmentContext_1 = require("./getEnvironmentContext");
+
+var resolveReferences_1 = require("./resolveReferences");
+
+var getEnvironmentVariables = function (config, componentName, env, commitInfo, alreadyVisited // to prevent endless loop
+) {
+  if (alreadyVisited === void 0) {
+    alreadyVisited = {};
+  }
+
+  return __awaiter(void 0, void 0, void 0, function () {
+    var environmentContext, envConfigRaw, deployConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+
+    return __generator(this, function (_k) {
+      switch (_k.label) {
+        case 0:
+          environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          envConfigRaw = environmentContext.envConfigRaw, deployConfigRaw = environmentContext.deployConfigRaw, envType = environmentContext.envType;
+          basePredefinedVariables = {
+            ENV_SHORT: env,
+            APP_DIR: envConfigRaw.dir,
+            ENV_TYPE: envType
+          };
+
+          if (envType === "local") {
+            devLocalConfig = envConfigRaw;
+            port = (_a = devLocalConfig.port) !== null && _a !== void 0 ? _a : 3000;
+            host = "localhost:" + port;
+            url = "http://" + host;
+            predefinedVariables = {
+              ENV_SHORT: "local",
+              ROOT_URL: url,
+              PORT: port.toString()
+            };
+          } else {
+            additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
+            host = (_c = (_b = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _b !== void 0 ? _b : additionalEnvVars.HOST_CANONICAL) !== null && _c !== void 0 ? _c : "unknown-host.example.com";
+            url = "https://".concat(host);
+            predefinedVariables = __assign(__assign(__assign({}, basePredefinedVariables), {
+              HOST: host,
+              ROOT_URL: url
+            }), additionalEnvVars);
+          }
+
+          publicEnvVarsRaw = (_e = (_d = envConfigRaw.vars) === null || _d === void 0 ? void 0 : _d.public) !== null && _e !== void 0 ? _e : {};
+          additionalSecretKeys = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].additionalSecretKeys(environmentContext) : [];
+          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []), false), __read(additionalSecretKeys), false);
+          secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
+            return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
+          }));
+          legacyFromComponents = (_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.fromComponents) !== null && _j !== void 0 ? _j : {};
+          publicEnvVarsRawWithLegasyFromComponents = (0, lodash_1.merge)({}, (0, resolveReferences_1.translateLegacyFromComponents)(legacyFromComponents), publicEnvVarsRaw);
+          publicEnvVarsRawSanitized = Object.fromEntries(Object.entries(publicEnvVarsRawWithLegasyFromComponents).map(function (_a) {
+            var _b = __read(_a, 2),
+                key = _b[0],
+                value = _b[1];
+
+            return [key, (0, lodash_1.isObject)(value) ? JSON.stringify(value) : "".concat(value)];
+          }));
+          envVarsRaw = addIndexVar(__assign(__assign(__assign({}, predefinedVariables), secretEnvVars), publicEnvVarsRawSanitized));
+          return [4
+          /*yield*/
+          , (0, resolveReferences_1.resolveReferences)(envVarsRaw, function (otherComponentName, variableName, alreadyVisited) {
+            return __awaiter(void 0, void 0, void 0, function () {
+              var otherEnvVars;
+              return __generator(this, function (_a) {
+                switch (_a.label) {
+                  case 0:
+                    return [4
+                    /*yield*/
+                    , (0, exports.getEnvironmentVariables)(config, otherComponentName, env, commitInfo, alreadyVisited)];
+
+                  case 1:
+                    otherEnvVars = _a.sent().envVars;
+                    return [2
+                    /*return*/
+                    , otherEnvVars[variableName]];
+                }
+              });
+            });
+          }, alreadyVisited)];
+
+        case 1:
+          envVars = _k.sent();
+          return [2
+          /*return*/
+          , {
+            envVars: envVars,
+            secretEnvVarKeys: secretEnvVarKeys,
+            host: host,
+            url: url
+          }];
+      }
+    });
+  });
+};
+
+exports.getEnvironmentVariables = getEnvironmentVariables;
+
+var sanitizeForEnVar = function (s) {
+  return s.replace(/-/g, "_");
+};
+
+var getSecretVarName = function (env, componentName, key) {
+  return "CL_".concat(sanitizeForEnVar(env), "_").concat(sanitizeForEnVar(componentName), "_").concat(key);
+}; // remove dash from component name
+
+
+exports.getSecretVarName = getSecretVarName;
+
+var addIndexVar = function (vars) {
+  return __assign(__assign({}, vars), {
+    _ALL_ENV_VAR_KEYS: JSON.stringify(Object.keys(vars))
+  });
+};
+
+var getSecretVarNameForContext = function (context, key) {
+  return (0, exports.getSecretVarName)(context.environment.shortName, context.componentName, key);
+};
+
+exports.getSecretVarNameForContext = getSecretVarNameForContext;

package/dist/context/index.d.ts

@@ -1,4 +1,5 @@
 import type { Config } from "../types/config";
 import type { CommitInfo, Context } from "../types/context";
 export * from "./getEnvironment";
+export * from "./getEnvironmentVariables";
 export declare const createContext: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, packageManagerInfo?: import("../types/context").YarnPackageManagerInfo | undefined) => Promise<Context>;

package/dist/context/index.js

@@ -169,34 +169,30 @@ var utils_1 = require("../utils");
 
 var getEnvironment_1 = require("./getEnvironment");
 
+var getEnvironmentContext_1 = require("./getEnvironmentContext");
+
 __exportStar(require("./getEnvironment"), exports);
 
+__exportStar(require("./getEnvironmentVariables"), exports);
+
 var createContext = function (config, componentName, env, commitInfo, packageManagerInfo) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var rawConfig, envConfig, componentConfigWithoutDefaults, defaults, componentConfig;
+    var envContext, componentConfigWithoutDefaults, defaults, componentConfig;
 
     var _a;
 
-    var _b, _c;
-
-    return __generator(this, function (_d) {
-      switch (_d.label) {
+    return __generator(this, function (_b) {
+      switch (_b.label) {
         case 0:
           if (!/^[a-z0-9-]+$/.test(componentName)) {
             throw new Error("componentName may only contain lower case letters, numbers and -");
           }
 
-          rawConfig = config.components[componentName];
-
-          if (!rawConfig) {
-            throw new Error("unknown component " + componentName);
-          }
-
-          envConfig = (_c = (_b = rawConfig.env) === null || _b === void 0 ? void 0 : _b[env]) !== null && _c !== void 0 ? _c : {};
-          componentConfigWithoutDefaults = (0, utils_1.mergeWithMergingArrays)(rawConfig, envConfig);
+          envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          componentConfigWithoutDefaults = envContext.envConfigRaw;
           defaults = componentConfigWithoutDefaults.deploy ? {
-            build: build_1.BUILD_TYPES[componentConfigWithoutDefaults.build.type].defaults(),
-            deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults()
+            build: build_1.BUILD_TYPES[componentConfigWithoutDefaults.build.type].defaults(envContext),
+            deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults(envContext)
           } : {
             build: {},
             deploy: {}
@@ -214,7 +210,7 @@ var createContext = function (config, componentName, env, commitInfo, packageMan
         case 1:
           return [2
           /*return*/
-          , (_a.environment = _d.sent(), _a.commitInfo = commitInfo, _a.packageManagerInfo = packageManagerInfo, _a)];
+          , (_a.environment = _b.sent(), _a.commitInfo = commitInfo, _a.packageManagerInfo = packageManagerInfo, _a)];
       }
     });
   });

package/dist/deploy/cloudRun/deployJob.js

@@ -56,6 +56,8 @@ var types_1 = require("../types");
 
 var gcloudServiceAccountLoginCommands_1 = require("./utils/gcloudServiceAccountLoginCommands");
 
+var gitlab_1 = require("../../utils/gitlab");
+
 var createGoogleCloudRunDeployJobs = function (context) {
   var _a, _b;
 
@@ -97,12 +99,12 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return "gcloud run deploy ".concat(serviceName, " ").concat(commandArg, " ").concat(commonDeployArgs, " --env-vars-file=____envvars.yaml --allow-unauthenticated");
   };
 
-  var getJobDeployScripts = function (jobName, job) {
+  var getJobCreateScripts = function (jobName, job) {
     // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
     // lucky, update on the other hand accepts it... so let's just imediatly update it
     // also we cannot upsert a job, so we have to create it and catch the error and then update
     var args = "".concat(jobName, " --command=\"").concat(job.command.split(" ").join(","), "\" ").concat(commonDeployArgs);
-    return ["set +e", "gcloud beta run jobs create ".concat(args), "set -e", "gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")];
+    return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["gcloud beta run jobs create ".concat(args)])), false), ["gcloud beta run jobs update ".concat(args, " --env-vars-file=____envvars.yaml")], false);
   };
 
   var getJobRunScript = function (jobName) {
@@ -121,13 +123,25 @@ var createGoogleCloudRunDeployJobs = function (context) {
     return [getFullJobName(name), job];
   });
 
-  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
+  var cloudRunDeployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml", "cat ____envvars.yaml"], __read(jobsWithNames.map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobCreateScripts(name, job);
+  }).flat()), false), __read(jobsWithNames.filter(function (_a) {
     var _b = __read(_a, 2),
         name = _b[0],
         job = _b[1];
 
-    return getJobDeployScripts(name, job);
-  }).flat()), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
+    return job.when === "preDeploy";
+  }).map(function (_a) {
+    var _b = __read(_a, 2),
+        name = _b[0],
+        job = _b[1];
+
+    return getJobRunScript(name);
+  })), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(jobsWithNames.filter(function (_a) {
     var _b = __read(_a, 2),
         name = _b[0],
         job = _b[1];

package/dist/deploy/cloudRun/index.js

@@ -56,18 +56,18 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
   additionalSecretKeys: function () {
     return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
   },
-  getAdditionalEnvVars: function (_a) {
-    var fullName = _a.fullName,
-        env = _a.env,
-        componentName = _a.componentName,
-        deployConfig = _a.deployConfig;
+  getAdditionalEnvVars: function (ctx) {
+    var fullName = ctx.fullName,
+        env = ctx.env,
+        componentName = ctx.componentName,
+        deployConfigRaw = ctx.deployConfigRaw;
     var HOST_CANONICAL = fullName.toLowerCase() + "-" + process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)];
-    var jobTriggers = deployConfig && deployConfig.jobs ? Object.fromEntries(Object.entries(deployConfig.jobs).map(function (_a) {
+    var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
           name = _b[0],
           job = _b[1];
 
-      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + name, "https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(name, ":run")];
+      return ["CLOUD_RUN_JOB_TRIGGER_URL_" + name, "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat(name, ":run")];
     })) : {};
     return __assign({
       HOST_CANONICAL: HOST_CANONICAL

package/dist/deploy/index.d.ts

@@ -1,30 +1,17 @@
-import type { Config, EnvType } from "../types";
-import type { CommitInfo, Context } from "../types/context";
+import type { Context } from "../types/context";
+import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { DeployConfigGeneric, DeployConfigType } from "./types";
+export * from "./cloudRun";
+export * from "./cloudSql";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
-export declare type EnvVarContext<D extends DeployConfigType> = {
-  deployConfig: false | DeployConfigGeneric<D>;
-  commitInfo?: CommitInfo;
-  env: string;
-  envType: EnvType;
-  componentName: string;
-  fullName: string;
-  /**
-   * the full catladder config
-   */
-
-  fullConfig: Config;
-};
 export declare type DeployTypeDefinition<T extends DeployConfigType> = {
   jobs: (context: Context) => CatladderJob[];
-  defaults: () => Partial<DeployConfigGeneric<T>>;
-  additionalSecretKeys: (envVarContext: EnvVarContext<T>) => string[];
-  getAdditionalEnvVars: (envVarContext: EnvVarContext<T>) => Record<string, string | undefined | null>;
+  defaults: (envContext: EnvironmentContext<any, T>) => Partial<DeployConfigGeneric<T>>;
+  additionalSecretKeys: (envContext: EnvironmentContext<any, T>) => string[];
+  getAdditionalEnvVars: (envContext: EnvironmentContext<any, T>) => Record<string, string | undefined | null>;
 };
-export * from "./cloudSql";
-export * from "./cloudRun";
 export declare type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<T> };
 export declare const DEPLOY_TYPES: DeployTypes;

package/dist/deploy/index.js

@@ -28,16 +28,16 @@ var dockerTag_1 = require("./dockerTag");
 
 var kubernetes_1 = require("./kubernetes");
 
+__exportStar(require("./cloudRun"), exports);
+
+__exportStar(require("./cloudSql"), exports);
+
 __exportStar(require("./kubernetes"), exports);
 
 __exportStar(require("./types"), exports);
 
 __exportStar(require("./utils"), exports);
 
-__exportStar(require("./cloudSql"), exports);
-
-__exportStar(require("./cloudRun"), exports);
-
 exports.DEPLOY_TYPES = {
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE,

package/dist/deploy/kubernetes/additionalSecretKeys.d.ts

@@ -1,4 +1,4 @@
-import type { EnvVarContext } from "..";
+import type { EnvironmentContext } from "../../types/environmentContext";
 export declare const additionalKubernetesSecretKeys: ({
-  deployConfig
-}: EnvVarContext<"kubernetes">) => string[];
+  deployConfigRaw
+}: EnvironmentContext<any, "kubernetes">) => string[];

package/dist/deploy/kubernetes/additionalSecretKeys.js

@@ -6,23 +6,23 @@ exports.additionalKubernetesSecretKeys = void 0;
 var additionalKubernetesSecretKeys = function (_a) {
   var _b, _c, _d, _e;
 
-  var deployConfig = _a.deployConfig;
+  var deployConfigRaw = _a.deployConfigRaw;
 
-  if (!deployConfig) {
+  if (!deployConfigRaw) {
     return [];
   }
 
   var keys = [];
 
-  if ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) {
+  if ((_c = (_b = deployConfigRaw.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) {
     keys.push("MONGODB_ROOT_PASSWORD");
 
-    if (deployConfig.values.mongodb.architecture === "replicaset") {
+    if (deployConfigRaw.values.mongodb.architecture === "replicaset") {
       keys.push("MONGODB_REPLICASET_KEY");
     }
   }
 
-  if ((_e = (_d = deployConfig.values) === null || _d === void 0 ? void 0 : _d.cloudsql) === null || _e === void 0 ? void 0 : _e.enabled) {
+  if ((_e = (_d = deployConfigRaw.values) === null || _d === void 0 ? void 0 : _d.cloudsql) === null || _e === void 0 ? void 0 : _e.enabled) {
     keys.push("POSTGRESQL_PASSWORD");
     keys.push("cloudsqlProxyCredentials");
   }

package/dist/deploy/kubernetes/index.js

@@ -28,7 +28,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
 
     var componentName = _a.componentName,
         fullConfig = _a.fullConfig,
-        deployConfig = _a.deployConfig,
+        deployConfigRaw = _a.deployConfigRaw,
         env = _a.env,
         envType = _a.envType,
         commitInfo = _a.commitInfo;
@@ -37,7 +37,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
     var KUBE_NAMESPACE = (0, __1.getKubernetesNamespace)(fullConfig, env);
     var componentSlug = (0, slugify_1["default"])(componentName);
     var envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, ".").concat(env) : env;
-    var domainCanonical = deployConfig && ((_b = deployConfig.cluster) === null || _b === void 0 ? void 0 : _b.domainCanonical) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
+    var domainCanonical = deployConfigRaw && ((_b = deployConfigRaw.cluster) === null || _b === void 0 ? void 0 : _b.domainCanonical) || // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
     fullConfig.domainCanonical || "panter.cloud";
     var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
 

package/dist/deploy/types/googleCloudRun.d.ts

@@ -11,7 +11,7 @@ export declare type DeployConfigCloudRunJob = {
    * command
    */
   command: string;
-  when: "manual" | "postDeploy";
+  when: "manual" | "preDeploy" | "postDeploy";
 };
 export declare type DeployConfigCloudRun = {
   /**