@catladder/pipeline 1.111.5 → 1.113.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-111-5-e6bbfb36" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-113-0-8de39eaa" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/getLabels.d.ts

@@ -1,6 +1,7 @@
 import type { Context } from "../types";
 export declare const getLabels: (context: Context) => {
   "customer-name": string | undefined;
+  "component-name": string | undefined;
   "app-name": string | undefined;
   "env-type": string | undefined;
   "env-name": string | undefined;

package/dist/context/getLabels.js

@@ -28,6 +28,7 @@ var getLabels = function (context) {
   var _a, _b, _c;
   var labels = __assign({
     "customer-name": sanitize(context.fullConfig.customerName),
+    "component-name": sanitize(context.componentName),
     "app-name": sanitize(context.fullConfig.appName),
     "env-type": sanitize(context.environment.envType),
     "env-name": sanitize(context.environment.shortName),

package/dist/deploy/base/deploy.d.ts

@@ -1,4 +1,5 @@
 import type { Context } from "../../types/context";
-import type { JobWithoutScript } from "./types";
+import type { CatladderJob } from "../../types/jobs";
 export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export declare const getBaseDeploymentJob: (context: Context) => JobWithoutScript;
+export declare type DeployJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "cache" | "artifacts" | "services">;
+export declare const createDeployJob: (context: Context, jobDefinition: DeployJobDefinition) => CatladderJob;

package/dist/deploy/base/deploy.js

@@ -42,7 +42,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.getBaseDeploymentJob = exports.DEPLOY_JOB_NAME = void 0;
+exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
 var docker_1 = require("../../build/docker");
 var sbom_1 = require("../../build/sbom");
 var sbom_2 = require("../sbom");
@@ -50,7 +50,7 @@ var utils_1 = require("../utils");
 var stop_1 = require("./stop");
 var variables_1 = require("./variables");
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
-var getBaseDeploymentJob = function (context) {
+var createDeployJob = function (context, jobDefinition) {
   var _a, _b, _c, _d;
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
@@ -64,6 +64,11 @@ var getBaseDeploymentJob = function (context) {
   var whenDeploy = whenDeployDefined ? whenDeployDefined : whenDeployDefault;
   return {
     name: exports.DEPLOY_JOB_NAME,
+    script: jobDefinition.script,
+    image: jobDefinition.image,
+    cache: jobDefinition.cache,
+    artifacts: jobDefinition.artifacts,
+    services: jobDefinition.services,
     envMode: "stagePerEnv",
     needs: __spreadArray(__spreadArray([], __read((0, sbom_2.sbomDeactivated)(context) ? [] : [{
       job: sbom_1.SBOM_BUILD_JOB_NAME,
@@ -90,7 +95,7 @@ var getBaseDeploymentJob = function (context) {
     }],
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
-    variables: __assign(__assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.environment.jobOnlyVars.deploy.envVars), context.componentConfig.deploy ? (_d = context.componentConfig.deploy.extraVars) !== null && _d !== void 0 ? _d : {} : {}),
+    variables: __assign(__assign(__assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.environment.jobOnlyVars.deploy.envVars), context.componentConfig.deploy ? (_d = context.componentConfig.deploy.extraVars) !== null && _d !== void 0 ? _d : {} : {}), jobDefinition.variables),
     environment: __assign(__assign({}, context.environment.gitlabEnvironment), isStoppable ? {
       on_stop: stop_1.STOP_JOB_NAME,
       auto_stop_in: autoStop
@@ -98,4 +103,4 @@ var getBaseDeploymentJob = function (context) {
     jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
   };
 };
-exports.getBaseDeploymentJob = getBaseDeploymentJob;
+exports.createDeployJob = createDeployJob;

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

@@ -1,3 +1,10 @@
-export * from "./deploy";
-export * from "./rollback";
-export * from "./stop";
+import type { Context } from "../../types/context";
+import type { CatladderJob } from "../../types/jobs";
+import { type DeployJobDefinition } from "./deploy";
+import { type RollbackJobDefinition } from "./rollback";
+import { type StopJobDefinition } from "./stop";
+export declare const createDeployementJobs: (context: Context, definitions: {
+  deploy: DeployJobDefinition;
+  stop?: StopJobDefinition;
+  rollback?: RollbackJobDefinition;
+}) => CatladderJob[];

package/dist/deploy/base/index.js

@@ -1,21 +1,42 @@
 "use strict";
 
-var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function () {
-      return m[k];
+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;
     }
-  });
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-});
-var __exportStar = this && this.__exportStar || function (m, exports) {
-  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+  }
+  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;
-__exportStar(require("./deploy"), exports);
-__exportStar(require("./rollback"), exports);
-__exportStar(require("./stop"), exports);
+exports.createDeployementJobs = void 0;
+var deploy_1 = require("./deploy");
+var rollback_1 = require("./rollback");
+var stop_1 = require("./stop");
+var createDeployementJobs = function (context, definitions) {
+  return __spreadArray(__spreadArray([(0, deploy_1.createDeployJob)(context, definitions.deploy)], __read(definitions.stop ? [(0, stop_1.createStopJob)(context, definitions.stop)] : []), false), __read(definitions.rollback ? [(0, rollback_1.createRollbackJob)(context, definitions.rollback)] : []), false);
+};
+exports.createDeployementJobs = createDeployementJobs;

package/dist/deploy/base/rollback.d.ts

@@ -1,4 +1,5 @@
 import type { Context } from "../../types/context";
-import type { JobWithoutScript } from "./types";
+import type { CatladderJob } from "../../types/jobs";
 export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-export declare const getBaseRollbackJob: (context: Context) => JobWithoutScript;
+export declare type RollbackJobDefinition = Pick<CatladderJob, "script" | "variables" | "image">;
+export declare const createRollbackJob: (context: Context, jobDefinition: RollbackJobDefinition) => CatladderJob;

package/dist/deploy/base/rollback.js

@@ -11,25 +11,27 @@ var __assign = this && this.__assign || function () {
   return __assign.apply(this, arguments);
 };
 exports.__esModule = true;
-exports.getBaseRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
+exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
 var variables_1 = require("./variables");
 exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
-var getBaseRollbackJob = function (context) {
+var createRollbackJob = function (context, jobDefinition) {
   return {
     name: exports.ROLLBACK_JOB_NAME,
+    image: jobDefinition.image,
     envMode: "stagePerEnv",
     needs: [],
     rules: [{
       when: "manual",
       allow_failure: true
     }],
-    variables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
+    variables: __assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
       GIT_STRATEGY: "none"
-    }),
+    }), jobDefinition.variables),
     stage: "rollback",
     environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
       action: "access"
-    })
+    }),
+    script: jobDefinition.script
   };
 };
-exports.getBaseRollbackJob = getBaseRollbackJob;
+exports.createRollbackJob = createRollbackJob;

package/dist/deploy/base/stop.d.ts

@@ -1,4 +1,5 @@
 import type { Context } from "../../types/context";
-import type { JobWithoutScript } from "./types";
+import type { CatladderJob } from "../../types/jobs";
 export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export declare const getBaseDeploymentStopJob: (context: Context) => JobWithoutScript;
+export declare type StopJobDefinition = Pick<CatladderJob, "script" | "variables" | "image">;
+export declare const createStopJob: (context: Context, jobDefinition: StopJobDefinition) => CatladderJob;

package/dist/deploy/base/stop.js

@@ -11,12 +11,13 @@ var __assign = this && this.__assign || function () {
   return __assign.apply(this, arguments);
 };
 exports.__esModule = true;
-exports.getBaseDeploymentStopJob = exports.STOP_JOB_NAME = void 0;
+exports.createStopJob = exports.STOP_JOB_NAME = void 0;
 var variables_1 = require("./variables");
 exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
-var getBaseDeploymentStopJob = function (context) {
+var createStopJob = function (context, jobDefinition) {
   return {
     name: exports.STOP_JOB_NAME,
+    image: jobDefinition.image,
     envMode: "stagePerEnv",
     needs: [],
     rules: [{
@@ -27,13 +28,14 @@ var getBaseDeploymentStopJob = function (context) {
       when: "manual",
       allow_failure: true
     }],
-    variables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
+    variables: __assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
       GIT_STRATEGY: "none"
-    }),
+    }), jobDefinition.variables),
     stage: "stop",
     environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
       action: "stop"
-    })
+    }),
+    script: jobDefinition.script
   };
 };
-exports.getBaseDeploymentStopJob = getBaseDeploymentStopJob;
+exports.createStopJob = createStopJob;

package/dist/deploy/cloudRun/deployJob.js

@@ -49,14 +49,14 @@ var _1 = require(".");
 var docker_1 = require("../../build/docker");
 var getLabels_1 = require("../../context/getLabels");
 var runner_1 = require("../../runner");
+var gitlab_1 = require("../../utils/gitlab");
 var base_1 = require("../base");
+var sbom_1 = require("../sbom");
 var types_1 = require("../types");
-var gcloudServiceAccountLoginCommands_1 = require("./utils/gcloudServiceAccountLoginCommands");
+var createArgsString_1 = require("./utils/createArgsString");
 var database_1 = require("./utils/database");
-var gitlab_1 = require("../../utils/gitlab");
+var gcloudServiceAccountLoginCommands_1 = require("./utils/gcloudServiceAccountLoginCommands");
 var jobName_1 = require("./utils/jobName");
-var createArgsString_1 = require("./utils/createArgsString");
-var sbom_1 = require("../sbom");
 var setExtraVarsScripts = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
@@ -70,7 +70,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   var fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
   var dockerUrl = "".concat(deployConfig.region, "-docker.pkg.dev/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
   var gcloudImageName = "".concat(dockerUrl, "/$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_TAG");
@@ -220,26 +219,29 @@ var createGoogleCloudRunDeployJobs = function (context) {
       name = _b[0];
     return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
   })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
-  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
-    artifacts: {
-      paths: ["____envvars.yaml"]
-    },
-    variables: {
-      CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
-      ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
-        lineWidth: -1,
-        quotingType: "'",
-        forceQuotes: true
-      })
-    },
-    image: (0, runner_1.getRunnerImage)("gcloud"),
-    script: deployScripts
-  }), (0, lodash_1.merge)({}, (0, base_1.getBaseDeploymentStopJob)(context), {
-    image: (0, runner_1.getRunnerImage)("gcloud"),
-    variables: {
-      CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
-    },
-    script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
-  })];
+  return (0, base_1.createDeployementJobs)(context, {
+    deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
+      artifacts: {
+        paths: ["____envvars.yaml"]
+      },
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+        ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
+          lineWidth: -1,
+          quotingType: "'",
+          forceQuotes: true
+        })
+      },
+      image: (0, runner_1.getRunnerImage)("gcloud"),
+      script: deployScripts
+    }),
+    stop: {
+      image: (0, runner_1.getRunnerImage)("gcloud"),
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+      },
+      script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
+    }
+  });
 };
 exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;

package/dist/deploy/custom/deployJob.js

@@ -33,12 +33,11 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 exports.__esModule = true;
 exports.createCustomDeployJobs = void 0;
-var lodash_1 = require("lodash");
 var yarn_1 = require("../../build/node/yarn");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
-var types_1 = require("../types");
 var sbom_1 = require("../sbom");
+var types_1 = require("../types");
 var createCustomDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -49,18 +48,22 @@ var createCustomDeployJobs = function (context) {
     // should not happen
     throw new Error("deploy config is not custom");
   }
-  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   // FIXME: custom deploy currently assumes yarn-based project
   var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
     noCustomPostInstall: true
   });
-  return __spreadArray([(0, lodash_1.merge)({}, baseDeploymentJob, {
-    image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
-    cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
-    script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false)
-  })], __read(deployConfig.stopScript ? [(0, lodash_1.merge)({}, (0, base_1.getBaseDeploymentStopJob)(context), {
-    image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
-    script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
-  })] : []), false);
+  return (0, base_1.createDeployementJobs)(context, {
+    deploy: {
+      image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
+      cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
+      script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
+      variables: {}
+    },
+    stop: deployConfig.stopScript ? {
+      image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
+      script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
+      variables: {}
+    } : undefined
+  });
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;

package/dist/deploy/dockerTag/deployJob.js

@@ -1,8 +1,17 @@
 "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);
+};
 exports.__esModule = true;
 exports.createDockerTagDeployJobs = void 0;
-var lodash_1 = require("lodash");
 var docker_1 = require("../../build/docker");
 var base_1 = require("../base");
 var types_1 = require("../types");
@@ -15,10 +24,11 @@ var createDockerTagDeployJobs = function (context) {
     // should not happen
     throw new Error("deploy config is not dockerTag");
   }
-  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
   var tag = deployConfig.tag;
-  return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
-    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
-  })];
+  return (0, base_1.createDeployementJobs)(context, {
+    deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
+      script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
+    })
+  });
 };
 exports.createDockerTagDeployJobs = createDockerTagDeployJobs;

package/dist/deploy/kubernetes/deployJob.js

@@ -44,13 +44,12 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 exports.__esModule = true;
 exports.createKubernetesDeployJobs = void 0;
 var js_yaml_1 = require("js-yaml");
-var lodash_1 = require("lodash");
-var __1 = require("../..");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
+var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var kubeValues_1 = require("./kubeValues");
-var sbom_1 = require("../sbom");
+var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
 var createKubernetesDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -79,17 +78,18 @@ var createKubernetesDeployJobs = function (context) {
       BUILD_ID: (_c = context.commitInfo) === null || _c === void 0 ? void 0 : _c.buildId
     })
   };
-  var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);
-  var baseStopJob = (0, base_1.getBaseDeploymentStopJob)(context);
-  var baseRollbackJob = (0, base_1.getBaseRollbackJob)(context);
   var clusterName = "kube-".concat(context.environment.fullName);
-  var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_TOKEN"), "\""), "kubectl config set-context \"".concat(clusterName, "\" --cluster=\"").concat(clusterName, "\" --user=\"").concat(clusterName, "\" --namespace=\"").concat(context.environment.envVars.KUBE_NAMESPACE, "\""), "kubectl config use-context \"".concat(clusterName, "\"")];
-  return [(0, lodash_1.merge)({}, baseDeploymentJob, shared, {
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
-  }), (0, lodash_1.merge)({}, baseStopJob, shared, {
-    script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
-  }), (0, lodash_1.merge)({}, baseRollbackJob, shared, {
-    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
-  })];
+  var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "KUBE_TOKEN"), "\""), "kubectl config set-context \"".concat(clusterName, "\" --cluster=\"").concat(clusterName, "\" --user=\"").concat(clusterName, "\" --namespace=\"").concat(context.environment.envVars.KUBE_NAMESPACE, "\""), "kubectl config use-context \"".concat(clusterName, "\"")];
+  return (0, base_1.createDeployementJobs)(context, {
+    deploy: __assign(__assign({}, shared), {
+      script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
+    }),
+    stop: __assign(__assign({}, shared), {
+      script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
+    }),
+    rollback: __assign(__assign({}, shared), {
+      script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
+    })
+  });
 };
 exports.createKubernetesDeployJobs = createKubernetesDeployJobs;

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

@@ -1,4 +1,4 @@
-import type { Context } from "../..";
+import type { Context } from "../../types/context";
 export declare const createMongodbBaseConfig: (context: Context) => {
   mongodb: {
     enabled: boolean;

package/dist/deploy/kubernetes/mongodb.js

@@ -13,9 +13,10 @@ var __assign = this && this.__assign || function () {
 exports.__esModule = true;
 exports.createMongodbBaseConfig = void 0;
 var lodash_1 = require("lodash");
-var __1 = require("../..");
+var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
+var types_1 = require("../types");
 var getCredentialString = function (context) {
-  return "root:$".concat((0, __1.getSecretVarNameForContext)(context, "MONGODB_ROOT_PASSWORD"), "@");
+  return "root:$".concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "MONGODB_ROOT_PASSWORD"), "@");
 };
 var getMongodbHost = function (context, name) {
   var namespace = context.environment.envVars.KUBE_NAMESPACE;
@@ -31,7 +32,7 @@ var getMongodbReplicasetHost = function (context, index) {
 };
 var createMongodbUrl = function (context, dbName) {
   var _a, _b;
-  if (!(0, __1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
     throw new Error("can only createMongodbUrl on supported deploys");
   }
   var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
@@ -50,7 +51,7 @@ var createMongodbUrl = function (context, dbName) {
 };
 var createMongoBackupDefaultConfig = function (context) {
   var _a;
-  if (!(0, __1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
     throw new Error("can only create mongodb base config on supported deploys");
   }
   var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
@@ -79,7 +80,7 @@ var createMongoBackupDefaultConfig = function (context) {
 };
 var createMongodbBaseConfig = function (context) {
   var _a, _b;
-  if (!(0, __1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
     throw new Error("can only create mongodb base config on supported deploys");
   }
   var mongodbConfig = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.mongodb;
@@ -88,8 +89,8 @@ var createMongodbBaseConfig = function (context) {
       enabled: true,
       auth: {
         enabled: true,
-        rootPassword: "$" + (0, __1.getSecretVarNameForContext)(context, "MONGODB_ROOT_PASSWORD"),
-        replicaSetKey: "$" + (0, __1.getSecretVarNameForContext)(context, "MONGODB_REPLICASET_KEY")
+        rootPassword: "$" + (0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "MONGODB_ROOT_PASSWORD"),
+        replicaSetKey: "$" + (0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "MONGODB_REPLICASET_KEY")
       },
       persistence: {
         storageClass: "standard-rwo"

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

@@ -11,7 +11,7 @@ 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 ("kubernetes" | "custom" | "dockerTag" | "google-cloudrun")[]>(t: DeployConfig | false, ...types: T) => t is Extract<DeployConfigCustom, {
   type: T[number];
 }> | Extract<DeployConfigDockerTag, {
   type: T[number];

package/dist/pipeline/gitlab/createGitlabJobs.d.ts

@@ -9,6 +9,7 @@ export declare const makeGitlabJob: (componentName: string, env: string, {
   name,
   needs,
   jobTags,
+  script,
   ...job
 }: CatladderJob<string>, allJobs: AllCatladderJobs) => [fullName: string, job: GitlabJobDef];
 export declare const createGitlabJobs: (allJobs: AllCatladderJobs) => Promise<AllGitlabJobs>;

package/dist/pipeline/gitlab/createGitlabJobs.js

@@ -168,6 +168,7 @@ exports.__esModule = true;
 exports.createGitlabJobs = exports.makeGitlabJob = void 0;
 var lodash_1 = require("lodash");
 var defaults_1 = require("../../defaults");
+var utils_1 = require("../../utils");
 var removeUndefined = function (obj) {
   return Object.fromEntries(Object.entries(obj).filter(function (_a) {
     var _b = __read(_a, 2),
@@ -203,7 +204,8 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
     name = _a.name,
     needs = _a.needs,
     jobTags = _a.jobTags,
-    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags"]);
+    script = _a.script,
+    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script"]);
   var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
   var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
     var _a, _b, _c, _d;
@@ -237,6 +239,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
   })).values()), false);
   var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
   var gitlabJob = removeUndefined(__assign(__assign({}, job), {
+    script: script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil),
     tags: jobTags,
     stage: stage,
     environment: ((_b = job.environment) === null || _b === void 0 ? void 0 : _b.on_stop) ? __assign(__assign({}, job.environment), {