@catladder/pipeline 1.52.2 → 1.54.0

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-52-2-6a3a3676" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-54-0-a367bcd6" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/getEnvironment.d.ts

@@ -1,5 +1,5 @@
 import type { Config } from "../types/config";
 import type { CommitInfo, Context, Environment } from "../types/context";
+export declare const getEnvironment: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, alreadyVisited?: Record<string, Record<string, boolean>>) => Promise<Environment>;
 export declare const getSecretVarName: (env: string, componentName: string, key: string) => string;
-export declare const getSecretVarNameForContext: (context: Context, key: string) => string;
-export declare const getEnvironment: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, alreadyVisited?: Record<string, Record<string, boolean>>) => Promise<Environment>;
+export declare const getSecretVarNameForContext: (context: Context, key: string) => string;

package/dist/context/getEnvironment.js

@@ -190,52 +190,19 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 
-var __importDefault = this && this.__importDefault || function (mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
-};
-
 exports.__esModule = true;
-exports.getEnvironment = exports.getSecretVarNameForContext = exports.getSecretVarName = void 0;
+exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironment = void 0;
 
 var lodash_1 = require("lodash");
 
-var slugify_1 = __importDefault(require("slugify"));
-
 var deploy_1 = require("../deploy");
 
-var types_1 = require("../deploy/types");
-
 var config_1 = require("../types/config");
 
 var utils_1 = require("../utils");
 
 var resolveReferences_1 = require("./resolveReferences");
 
-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;
-
 var getEnvironment = function (config, componentName, env, commitInfo, alreadyVisited // to prevent endless loop
 ) {
   if (alreadyVisited === void 0) {
@@ -243,27 +210,15 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
   }
 
   return __awaiter(void 0, void 0, void 0, function () {
-    var defaultConfig, envConfig, mergedConfig, envType, basePredefinedVariables, gitlabEnvironmentName, environmentSlug, predefinedVariables, host, url, fullName, devLocalConfig, port, componentSlug, envInUrl, domainCanonical, HOST_CANONICAL, KUBE_APP_NAME_PREFIX, KUBE_APP_NAME, KUBE_NAMESPACE, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+    var envConfig, envType, basePredefinedVariables, gitlabEnvironmentName, environmentSlug, predefinedVariables, host, url, fullName, envVarContext, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
 
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
 
-    return __generator(this, function (_o) {
-      switch (_o.label) {
+    return __generator(this, function (_l) {
+      switch (_l.label) {
         case 0:
-          defaultConfig = config.components[componentName];
-
-          if (!defaultConfig) {
-            throw new Error("unknown component " + componentName);
-          }
-
-          envConfig = (_b = (_a = defaultConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
-
-          if (envConfig === false) {
-            throw new Error("env is disabled: " + env);
-          }
-
-          mergedConfig = (0, utils_1.mergeWithMergingArrays)(defaultConfig, envConfig);
-          envType = (_c = envConfig === null || envConfig === void 0 ? void 0 : envConfig.type) !== null && _c !== void 0 ? _c : (0, config_1.isKnowEnvType)(env) ? env : null;
+          envConfig = getEnvConfig(config, componentName, env);
+          envType = (_a = envConfig === null || envConfig === void 0 ? void 0 : envConfig.type) !== null && _a !== void 0 ? _a : (0, config_1.isKnowEnvType)(env) ? env : null;
 
           if (!envType) {
             throw new Error("Missing type in environment " + env + " in component " + componentName);
@@ -271,16 +226,25 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
 
           basePredefinedVariables = {
             ENV_SHORT: env,
-            APP_DIR: mergedConfig.dir,
+            APP_DIR: envConfig.dir,
             ENV_TYPE: envType
           };
           gitlabEnvironmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
           environmentSlug = envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
           fullName = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
+          envVarContext = {
+            deployConfig: envConfig.deploy,
+            fullName: fullName,
+            envType: envType,
+            commitInfo: commitInfo,
+            componentName: componentName,
+            env: env,
+            fullConfig: config
+          };
 
           if (envType === "local") {
-            devLocalConfig = mergedConfig;
-            port = (_d = devLocalConfig.port) !== null && _d !== void 0 ? _d : 3000;
+            devLocalConfig = envConfig;
+            port = (_b = devLocalConfig.port) !== null && _b !== void 0 ? _b : 3000;
             host = "localhost:" + port;
             url = "http://" + host;
             predefinedVariables = {
@@ -289,34 +253,22 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
               PORT: port.toString()
             };
           } else {
-            componentSlug = (0, slugify_1["default"])(componentName);
-            envInUrl = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, ".").concat(env) : env;
-            domainCanonical = (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy) && (mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.deploy.type) === "kubernetes" && ((_e = mergedConfig.deploy.cluster) === null || _e === void 0 ? void 0 : _e.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
-            config.domainCanonical || "panter.cloud";
-            HOST_CANONICAL = (0, types_1.isOfDeployType)(mergedConfig.deploy, "google-cloudrun") ? fullName.toLowerCase() + "-" + process.env[(0, exports.getSecretVarName)(env, componentName, deploy_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)] : "".concat(componentSlug, ".").concat(envInUrl, ".").concat(config.appName, ".").concat(config.customerName, ".").concat(domainCanonical);
-            host = (_f = mergedConfig === null || mergedConfig === void 0 ? void 0 : mergedConfig.host) !== null && _f !== void 0 ? _f : HOST_CANONICAL;
+            additionalEnvVars = envConfig.deploy ? deploy_1.DEPLOY_TYPES[envConfig.deploy.type].getAdditionalEnvVars(envVarContext) : {};
+            host = (_d = (_c = envConfig === null || envConfig === void 0 ? void 0 : envConfig.host) !== null && _c !== void 0 ? _c : additionalEnvVars.HOST_CANONICAL) !== null && _d !== void 0 ? _d : "unknown-host.example.com";
             url = "https://".concat(host);
-            KUBE_APP_NAME_PREFIX = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, "-") : "";
-            KUBE_APP_NAME = "".concat(KUBE_APP_NAME_PREFIX).concat(componentName);
-            KUBE_NAMESPACE = (0, deploy_1.getKubernetesNamespace)(config, env);
-            predefinedVariables = __assign(__assign({}, basePredefinedVariables), {
-              HOST_CANONICAL: HOST_CANONICAL,
+            predefinedVariables = __assign(__assign(__assign({}, basePredefinedVariables), {
               HOST: host,
-              ROOT_URL: url,
-              KUBE_NAMESPACE: KUBE_NAMESPACE,
-              KUBE_APP_NAME: KUBE_APP_NAME,
-              KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX
-            });
+              ROOT_URL: url
+            }), additionalEnvVars);
           }
 
-          publicEnvVarsRaw = (_h = (_g = mergedConfig.vars) === null || _g === void 0 ? void 0 : _g.public) !== null && _h !== void 0 ? _h : {};
-          additionalSecretKeys = mergedConfig.deploy ? deploy_1.DEPLOY_TYPES[mergedConfig.deploy.type].additionalSecretKeys( // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          mergedConfig.deploy) : [];
-          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_k = (_j = mergedConfig.vars) === null || _j === void 0 ? void 0 : _j.secret) !== null && _k !== void 0 ? _k : []), false), __read(additionalSecretKeys), false);
+          publicEnvVarsRaw = (_f = (_e = envConfig.vars) === null || _e === void 0 ? void 0 : _e.public) !== null && _f !== void 0 ? _f : {};
+          additionalSecretKeys = envConfig.deploy ? deploy_1.DEPLOY_TYPES[envConfig.deploy.type].additionalSecretKeys(envVarContext) : [];
+          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_h = (_g = envConfig.vars) === null || _g === void 0 ? void 0 : _g.secret) !== null && _h !== void 0 ? _h : []), false), __read(additionalSecretKeys), false);
           secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
             return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
           }));
-          legacyFromComponents = (_m = (_l = mergedConfig.vars) === null || _l === void 0 ? void 0 : _l.fromComponents) !== null && _m !== void 0 ? _m : {};
+          legacyFromComponents = (_k = (_j = envConfig.vars) === null || _j === void 0 ? void 0 : _j.fromComponents) !== null && _k !== void 0 ? _k : {};
           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),
@@ -349,7 +301,7 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
           }, alreadyVisited)];
 
         case 1:
-          envVars = _o.sent();
+          envVars = _l.sent();
           return [2
           /*return*/
           , {
@@ -371,4 +323,45 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
   });
 };
 
-exports.getEnvironment = getEnvironment;
+exports.getEnvironment = getEnvironment;
+
+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;
+
+var getEnvConfig = function (config, componentName, env) {
+  var _a, _b;
+
+  var defaultConfig = config.components[componentName];
+
+  if (!defaultConfig) {
+    throw new Error("unknown component " + componentName);
+  }
+
+  var envCustomizations = (_b = (_a = defaultConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
+
+  if (envCustomizations === false) {
+    throw new Error("env is disabled: " + env);
+  }
+
+  return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+};

package/dist/deploy/cloudRun/deployJob.d.ts

@@ -1,3 +1,3 @@
 import type { Context } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createDeployJob: (context: Context) => CatladderJob[];
+export declare const createGoogleCloudRunDeployJobs: (context: Context) => CatladderJob[];

package/dist/deploy/cloudRun/deployJob.js

@@ -36,7 +36,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createDeployJob = void 0;
+exports.createGoogleCloudRunDeployJobs = void 0;
 
 var js_yaml_1 = require("js-yaml");
 
@@ -56,16 +56,16 @@ var types_1 = require("../types");
 
 var gcloudServiceAccountLoginCommands_1 = require("./utils/gcloudServiceAccountLoginCommands");
 
-var createDeployJob = function (context) {
+var createGoogleCloudRunDeployJobs = function (context) {
   var deployConfig = context.componentConfig.deploy;
 
   if (deployConfig === false) {
     return [];
   }
 
-  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
+  if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun", "google-cloudrun-job")) {
     // should not happen
-    throw new Error("deploy config is not custom");
+    throw new Error("deploy config is wrong");
   }
 
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
@@ -76,7 +76,6 @@ var createDeployJob = function (context) {
   var pushImageToArtifactsRegistry = __spreadArray(__spreadArray([docker_1.gitlabDockerLogin], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud auth configure-docker ".concat(deployConfig.region, "-docker.pkg.dev"), "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG ".concat(gcloudImageName), "docker push ".concat(gcloudImageName)], false);
 
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  var serviceName = context.environment.fullName.toLowerCase();
   var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
     var _b = __read(_a, 2),
         key = _b[0],
@@ -84,9 +83,39 @@ var createDeployJob = function (context) {
 
     return "".concat(key, "=").concat(value);
   }).join(",");
-  var command = context.componentConfig.build.startCommand ? "--command=\"".concat(context.componentConfig.build.startCommand.split(" ").join(","), "\"") : ""; // TODO: split secrets out
+  var commonArgs = "--project ".concat(deployConfig.projectId, " --region=").concat(deployConfig.region);
 
-  var cloudRunDeploy = ["echo \"$ENV_VARS\" > ____envvars.yaml", "gcloud run deploy ".concat(serviceName, " --image ").concat(gcloudImageName, " --region=").concat(deployConfig.region, " --allow-unauthenticated --project ").concat(deployConfig.projectId, " ").concat(command, " --env-vars-file=____envvars.yaml --labels ").concat(labelsString), "docker image rm ".concat(gcloudImageName)];
+  var getDeployCommand = function () {
+    var _a;
+
+    var name = context.environment.fullName.toLowerCase();
+    var command = (_a = deployConfig.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand;
+    var commandArg = command ? "--command=\"".concat(command.split(" ").join(","), "\"") : "";
+    var commonDeployArgs = "".concat(commandArg, " --image ").concat(gcloudImageName, " ").concat(commonArgs, " --env-vars-file=____envvars.yaml --labels ").concat(labelsString);
+
+    if (deployConfig.type === "google-cloudrun") {
+      return "gcloud run deploy ".concat(name, " ").concat(commonDeployArgs, " --allow-unauthenticated");
+    }
+
+    if (deployConfig.type === "google-cloudrun-job") {
+      return "gcloud beta run jobs create ".concat(name, " ").concat(commonDeployArgs);
+    }
+  };
+
+  var getStopCommand = function () {
+    var name = context.environment.fullName.toLowerCase();
+    var commonStopArgs = "".concat(commonArgs, " --quiet");
+
+    if (deployConfig.type === "google-cloudrun") {
+      return "gcloud run services delete ".concat(name, " ").concat(commonStopArgs);
+    }
+
+    if (deployConfig.type === "google-cloudrun-job") {
+      return "gcloud beta run jobs delete ".concat(name, " ").concat(commonStopArgs);
+    }
+  };
+
+  var cloudRunDeploy = ["echo \"$ENV_VARS\" > ____envvars.yaml", getDeployCommand(), "docker image rm ".concat(gcloudImageName)];
   var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(context);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
     artifacts: {
@@ -103,8 +132,8 @@ var createDeployJob = function (context) {
     script: __spreadArray(__spreadArray([], __read(pushImageToArtifactsRegistry), false), __read(cloudRunDeploy), false)
   }), (0, lodash_1.merge)({}, baseStopJob, {
     image: (0, runner_1.getRunnerImage)("gcloud"),
-    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), ["gcloud run services delete ".concat(serviceName, " --project ").concat(deployConfig.projectId, " --region=").concat(deployConfig.region, " --quiet")], false)
+    script: __spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), [getStopCommand()], false)
   })];
 };
 
-exports.createDeployJob = createDeployJob;
+exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;

package/dist/deploy/cloudRun/index.d.ts

@@ -1,4 +1,9 @@
 import type { DeployTypeDefinition } from "..";
 export declare const GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 export declare const GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
-export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun">;
+export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun">;
+export declare const GCLOUD_RUN_JOB_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun-job">;
+export declare const GCLOUD_RUN_DEPLOY_TYPES: {
+  "google-cloudrun": DeployTypeDefinition<"google-cloudrun">;
+  "google-cloudrun-job": DeployTypeDefinition<"google-cloudrun-job">;
+};

package/dist/deploy/cloudRun/index.js

@@ -1,18 +1,56 @@
 "use strict";
 
 exports.__esModule = true;
-exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
+exports.GCLOUD_RUN_DEPLOY_TYPES = exports.GCLOUD_RUN_JOB_DEPLOY_TYPE = exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
+
+var context_1 = require("../../context");
 
 var deployJob_1 = require("./deployJob");
 
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 exports.GCLOUD_RUN_DEPLOY_TYPE = {
-  jobs: deployJob_1.createDeployJob,
+  jobs: deployJob_1.createGoogleCloudRunDeployJobs,
   defaults: function () {
     return {};
   },
   additionalSecretKeys: function () {
     return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
+  },
+  getAdditionalEnvVars: function (_a) {
+    var fullName = _a.fullName,
+        env = _a.env,
+        componentName = _a.componentName;
+    var HOST_CANONICAL = fullName.toLowerCase() + "-" + process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)];
+    return {
+      HOST_CANONICAL: HOST_CANONICAL
+    };
+  }
+};
+exports.GCLOUD_RUN_JOB_DEPLOY_TYPE = {
+  jobs: deployJob_1.createGoogleCloudRunDeployJobs,
+  defaults: function () {
+    return {};
+  },
+  additionalSecretKeys: function () {
+    return [exports.GCLOUD_DEPLOY_CREDENTIALS_KEY];
+  },
+  getAdditionalEnvVars: function (_a) {
+    var deployConfig = _a.deployConfig,
+        fullName = _a.fullName;
+
+    if (!deployConfig) {
+      return {};
+    }
+
+    var jobName = fullName.toLowerCase();
+    var CLOUD_RUN_JOB_TRIGGER_URL = "https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run");
+    return {
+      CLOUD_RUN_JOB_TRIGGER_URL: CLOUD_RUN_JOB_TRIGGER_URL
+    };
   }
+};
+exports.GCLOUD_RUN_DEPLOY_TYPES = {
+  "google-cloudrun": exports.GCLOUD_RUN_DEPLOY_TYPE,
+  "google-cloudrun-job": exports.GCLOUD_RUN_JOB_DEPLOY_TYPE
 };

package/dist/deploy/custom/index.js

@@ -12,5 +12,8 @@ exports.CUSTOM_DEPLOY_TYPE = {
   },
   additionalSecretKeys: function () {
     return [];
+  },
+  getAdditionalEnvVars: function () {
+    return {};
   }
 };

package/dist/deploy/dockerTag/index.js

@@ -12,5 +12,8 @@ exports.DOCKER_TAG_DEPLOY_TYPE = {
   },
   additionalSecretKeys: function () {
     return [];
+  },
+  getAdditionalEnvVars: function () {
+    return {};
   }
 };

package/dist/deploy/index.d.ts

@@ -1,13 +1,28 @@
-import type { Context } from "../types/context";
+import type { Config, EnvType } from "../types";
+import type { CommitInfo, Context } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 import type { DeployConfigGeneric, DeployConfigType } from "./types";
 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: (config: DeployConfigGeneric<T>) => string[];
+  additionalSecretKeys: (envVarContext: EnvVarContext<T>) => string[];
+  getAdditionalEnvVars: (envVarContext: EnvVarContext<T>) => Record<string, string | undefined | null>;
 };
 export * from "./cloudSql";
 export * from "./cloudRun";

package/dist/deploy/index.js

@@ -1,5 +1,19 @@
 "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 __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   Object.defineProperty(o, k2, {
@@ -38,9 +52,8 @@ __exportStar(require("./cloudSql"), exports);
 
 __exportStar(require("./cloudRun"), exports);
 
-exports.DEPLOY_TYPES = {
+exports.DEPLOY_TYPES = __assign({
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE,
-  "google-cloudrun": cloudRun_1.GCLOUD_RUN_DEPLOY_TYPE,
   dockerTag: dockerTag_1.DOCKER_TAG_DEPLOY_TYPE
-};
+}, cloudRun_1.GCLOUD_RUN_DEPLOY_TYPES);

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

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

package/dist/deploy/kubernetes/additionalSecretKeys.js

@@ -3,20 +3,26 @@
 exports.__esModule = true;
 exports.additionalKubernetesSecretKeys = void 0;
 
-var additionalKubernetesSecretKeys = function (config) {
-  var _a, _b, _c, _d;
+var additionalKubernetesSecretKeys = function (_a) {
+  var _b, _c, _d, _e;
+
+  var deployConfig = _a.deployConfig;
+
+  if (!deployConfig) {
+    return [];
+  }
 
   var keys = [];
 
-  if ((_b = (_a = config.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) {
+  if ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) {
     keys.push("MONGODB_ROOT_PASSWORD");
 
-    if (config.values.mongodb.architecture === "replicaset") {
+    if (deployConfig.values.mongodb.architecture === "replicaset") {
       keys.push("MONGODB_REPLICASET_KEY");
     }
   }
 
-  if ((_d = (_c = config.values) === null || _c === void 0 ? void 0 : _c.cloudsql) === null || _d === void 0 ? void 0 : _d.enabled) {
+  if ((_e = (_d = deployConfig.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

@@ -1,8 +1,18 @@
 "use strict";
 
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
 exports.__esModule = true;
 exports.KUBERNETES_DEPLOY_TYPE = void 0;
 
+var slugify_1 = __importDefault(require("slugify"));
+
+var __1 = require("..");
+
 var additionalSecretKeys_1 = require("./additionalSecretKeys");
 
 var deployJob_1 = require("./deployJob");
@@ -12,5 +22,30 @@ exports.KUBERNETES_DEPLOY_TYPE = {
   defaults: function () {
     return {};
   },
-  additionalSecretKeys: additionalSecretKeys_1.additionalKubernetesSecretKeys
+  additionalSecretKeys: additionalSecretKeys_1.additionalKubernetesSecretKeys,
+  getAdditionalEnvVars: function (_a) {
+    var _b;
+
+    var componentName = _a.componentName,
+        fullConfig = _a.fullConfig,
+        deployConfig = _a.deployConfig,
+        env = _a.env,
+        envType = _a.envType,
+        commitInfo = _a.commitInfo;
+    var KUBE_APP_NAME_PREFIX = envType === "review" && commitInfo ? "".concat(commitInfo.reviewSlug, "-") : "";
+    var KUBE_APP_NAME = "".concat(KUBE_APP_NAME_PREFIX).concat(componentName);
+    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
+    fullConfig.domainCanonical || "panter.cloud";
+    var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
+
+    return {
+      KUBE_NAMESPACE: KUBE_NAMESPACE,
+      KUBE_APP_NAME: KUBE_APP_NAME,
+      KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX,
+      HOST_CANONICAL: HOST_CANONICAL
+    };
+  }
 };

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

@@ -1,20 +1,39 @@
 import type { DeployConfigBase } from "./base";
 export declare type Gcloudregion = "asia-east1" | "asia-northeast1" | "asia-northeast2" | "europe-north1" | "europe-southwest1" | "europe-west1" | "europe-west4" | "europe-west8" | "europe-west9" | "me-west1" | "us-central1" | "us-east1" | "us-east4" | "us-east5" | "us-south1" | "us-west1" | "asia-east2" | "asia-northeast3" | "asia-southeast1" | "asia-southeast2" | "asia-south1" | "asia-south2" | "australia-southeast1" | "australia-southeast2" | "europe-central2" | "europe-west2" | "europe-west3" | "europe-west6" | "northamerica-northeast1" | "northamerica-northeast2" | "southamerica-east1" | "southamerica-west1" | "us-west2" | "us-west3" | "us-west4";
-export declare type DeployConfigCloudRun = {
-  /**
-   * EXPERIMENTAL cloud run deployment.
-   *
-   * Requires that cloud run is enabled on the project, as well as cloud run api and artifacts registry.
-   */
-  type: "google-cloudrun";
+export declare type DeployConfigCloudRunBase = {
   /**
    * the google cloud porject id
    */
-
   projectId: string;
   /**
    * the region. Set to europe-west6 for switzerland
    */
 
   region: Gcloudregion;
-} & DeployConfigBase;
+  /**
+   * command / entrypoint, fallsback to buildConfig.startcommand
+   */
+
+  command?: string;
+} & DeployConfigBase;
+export declare type DeployConfigCloudRunService = {
+  /**
+   * EXPERIMENTAL cloud run deployment.
+   *
+   * This will deploy a cloud run service.
+   *
+   * Requires that cloud run is enabled on the project, as well as cloud run api and artifacts registry.
+   */
+  type: "google-cloudrun";
+} & DeployConfigCloudRunBase;
+export declare type DeployConfigCloudRunJob = {
+  /**
+   * EXPERIMENTAL cloud run job.
+   *
+   * This will deploy a cloud run job. This does not do much currently, but will be later used for cronjobs
+   *
+   * Requires that cloud run is enabled on the project, as well as cloud run api and artifacts registry.
+   */
+  type: "google-cloudrun-job";
+} & DeployConfigCloudRunBase;
+export declare type DeployConfigCloudRun = DeployConfigCloudRunService | DeployConfigCloudRunJob;

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

@@ -11,11 +11,13 @@ export declare type DeployConfigType = DeployConfig["type"];
 export declare type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
   type: T;
 }>;
-export declare const isOfDeployType: <T extends ("custom" | "dockerTag" | "google-cloudrun" | "kubernetes")[]>(t: DeployConfig | false, ...types: T) => t is Extract<DeployConfigCustom, {
+export declare const isOfDeployType: <T extends ("custom" | "dockerTag" | "google-cloudrun" | "google-cloudrun-job" | "kubernetes")[]>(t: DeployConfig | false, ...types: T) => t is Extract<DeployConfigCustom, {
   type: T[number];
 }> | Extract<DeployConfigDockerTag, {
   type: T[number];
-}> | Extract<DeployConfigCloudRun, {
+}> | Extract<import("./googleCloudRun").DeployConfigCloudRunService, {
+  type: T[number];
+}> | Extract<import("./googleCloudRun").DeployConfigCloudRunJob, {
   type: T[number];
 }> | Extract<DeployConfigKubernetes, {
   type: T[number];