@catladder/pipeline 0.0.0-refactor-deploy-5f0bbd8a → 0.0.0-refactor-image-ca767657

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-deploy-5f0bbd8a" || "";
+exports.PIPELINE_IMAGE_TAG = "refactor-image-ca767657" || "";
 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

@@ -0,0 +1,5 @@
+import type { Context } from "../../types/context";
+import type { CatladderJob } from "../../types/jobs";
+export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
+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

@@ -0,0 +1,106 @@
+"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 __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.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+var docker_1 = require("../../build/docker");
+var sbom_1 = require("../../build/sbom");
+var sbom_2 = require("../sbom");
+var utils_1 = require("../utils");
+var stop_1 = require("./stop");
+var variables_1 = require("./variables");
+exports.DEPLOY_JOB_NAME = "🚀 Deploy";
+var createDeployJob = function (context, jobDefinition) {
+  var _a, _b, _c, _d;
+  var hasDocker = (0, docker_1.requiresDockerBuild)(context);
+  var isStoppable = (0, utils_1.contextIsStoppable)(context);
+  var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
+  // if auto or manual is configured explicitly, use that
+  var whenDeployDefined = context.componentConfig.deploy && context.componentConfig.deploy.when ? context.componentConfig.deploy.when : undefined;
+  // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
+  var whenDeployDefault = context.environment.envType !== "prod" ? "auto" // is not stage, auto deploy
+  : ((_a = context.componentConfig.env) === null || _a === void 0 ? void 0 : _a.stage) === false ? "auto" // is prod, but no staging, auto deploy
+  : "manual"; // manually deploy
+  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,
+      artifacts: true
+    }]), false), __read(context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+      return {
+        componentName: c,
+        job: exports.DEPLOY_JOB_NAME,
+        artifacts: false
+      };
+    })) !== null && _c !== void 0 ? _c : [] : []), false),
+    // we don't want to deploy when there is a broken test
+    needsStages: [{
+      stage: "build",
+      artifacts: hasDocker ? false : true
+    }, {
+      stage: "test",
+      artifacts: false
+    }],
+    rules: [whenDeploy === "auto" ? {
+      when: "on_success"
+    } : {
+      when: "manual"
+    }],
+    allow_failure: whenDeploy === "manual" ? true : false,
+    stage: "deploy",
+    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
+    } : {}),
+    jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
+  };
+};
+exports.createDeployJob = createDeployJob;

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

@@ -1,8 +1,10 @@
-import type { Context } from "../../types";
-import type { JobWithoutScript } from "./types";
-export * from "./rollback";
-export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-export declare const getBaseDeploymentJob: (context: Context) => JobWithoutScript;
-export declare const getBaseDeploymentStopJob: (context: Context) => JobWithoutScript;
+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,30 +1,5 @@
 "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, {
-    enumerable: true,
-    get: function () {
-      return m[k];
-    }
-  });
-} : 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);
-};
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -57,85 +32,11 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.getBaseDeploymentStopJob = exports.getBaseDeploymentJob = exports.ROLLBACK_JOB_NAME = exports.STOP_JOB_NAME = exports.DEPLOY_JOB_NAME = void 0;
-var docker_1 = require("../../build/docker");
-var sbom_1 = require("../../build/sbom");
-var sbom_2 = require("../sbom");
-var utils_1 = require("../utils");
-var variables_1 = require("./variables");
-__exportStar(require("./rollback"), exports);
-exports.DEPLOY_JOB_NAME = "🚀 Deploy";
-exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
-exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
-var getBaseDeploymentJob = function (context) {
-  var _a, _b, _c, _d;
-  var hasDocker = (0, docker_1.requiresDockerBuild)(context);
-  var isStoppable = (0, utils_1.contextIsStoppable)(context);
-  var autoStop = context.environment.envType === "review" ? "2 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
-  // if auto or manual is configured explicitly, use that
-  var whenDeployDefined = context.componentConfig.deploy && context.componentConfig.deploy.when ? context.componentConfig.deploy.when : undefined;
-  // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
-  var whenDeployDefault = context.environment.envType !== "prod" ? "auto" // is not stage, auto deploy
-  : ((_a = context.componentConfig.env) === null || _a === void 0 ? void 0 : _a.stage) === false ? "auto" // is prod, but no staging, auto deploy
-  : "manual"; // manually deploy
-  var whenDeploy = whenDeployDefined ? whenDeployDefined : whenDeployDefault;
-  return {
-    name: exports.DEPLOY_JOB_NAME,
-    envMode: "stagePerEnv",
-    needs: __spreadArray(__spreadArray([], __read((0, sbom_2.sbomDeactivated)(context) ? [] : [{
-      job: sbom_1.SBOM_BUILD_JOB_NAME,
-      artifacts: true
-    }]), false), __read(context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
-      return {
-        componentName: c,
-        job: exports.DEPLOY_JOB_NAME,
-        artifacts: false
-      };
-    })) !== null && _c !== void 0 ? _c : [] : []), false),
-    // we don't want to deploy when there is a broken test
-    needsStages: [{
-      stage: "build",
-      artifacts: hasDocker ? false : true
-    }, {
-      stage: "test",
-      artifacts: false
-    }],
-    rules: [whenDeploy === "auto" ? {
-      when: "on_success"
-    } : {
-      when: "manual"
-    }],
-    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 : {} : {}),
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), isStoppable ? {
-      on_stop: exports.STOP_JOB_NAME,
-      auto_stop_in: autoStop
-    } : {}),
-    jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
-  };
-};
-exports.getBaseDeploymentJob = getBaseDeploymentJob;
-var getBaseDeploymentStopJob = function (context) {
-  return {
-    name: exports.STOP_JOB_NAME,
-    envMode: "stagePerEnv",
-    needs: [],
-    rules: [{
-      "if": "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
-      when: "on_success",
-      allow_failure: true
-    }, {
-      when: "manual",
-      allow_failure: true
-    }],
-    variables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
-      GIT_STRATEGY: "none"
-    }),
-    stage: "stop",
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
-      action: "stop"
-    })
-  };
+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.getBaseDeploymentStopJob = getBaseDeploymentStopJob;
+exports.createDeployementJobs = createDeployementJobs;

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

@@ -1,3 +1,5 @@
 import type { Context } from "../../types/context";
-import type { JobWithoutScript } from "./types";
-export declare const getBaseRollbackJob: (context: Context) => JobWithoutScript;
+import type { CatladderJob } from "../../types/jobs";
+export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
+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 = void 0;
-var _1 = require(".");
+exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
 var variables_1 = require("./variables");
-var getBaseRollbackJob = function (context) {
+exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
+var createRollbackJob = function (context, jobDefinition) {
   return {
-    name: _1.ROLLBACK_JOB_NAME,
+    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

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

package/dist/deploy/base/stop.js

@@ -0,0 +1,41 @@
+"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.createStopJob = exports.STOP_JOB_NAME = void 0;
+var variables_1 = require("./variables");
+exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
+var createStopJob = function (context, jobDefinition) {
+  return {
+    name: exports.STOP_JOB_NAME,
+    image: jobDefinition.image,
+    envMode: "stagePerEnv",
+    needs: [],
+    rules: [{
+      "if": "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
+      when: "on_success",
+      allow_failure: true
+    }, {
+      when: "manual",
+      allow_failure: true
+    }],
+    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.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,10 +70,9 @@ 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");
+  var gcloudImageName = "".concat(dockerUrl, "/").concat(context.environment.shortName, "/").concat(context.componentName, ":$DOCKER_IMAGE_TAG");
   var pushImageToArtifactsRegistry = [docker_1.gitlabDockerLogin, "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)];
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
   var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
@@ -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;
@@ -62,9 +61,6 @@ var createKubernetesDeployJobs = function (context) {
     throw new Error("deploy config is not kubernetes");
   }
   var kubeValues = (0, kubeValues_1.createKubeValues)(context);
-  var kubernetesEnvironment = {
-    namespace: context.environment.envVars.KUBE_NAMESPACE
-  };
   var shared = {
     image: (0, runner_1.getRunnerImage)("kubernetes"),
     variables: __assign(__assign({}, context.environment.envVars), {
@@ -82,26 +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),
-    environment: {
-      kubernetes: kubernetesEnvironment
-    }
-  }), (0, lodash_1.merge)({}, baseStopJob, shared, {
-    script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
-    environment: {
-      kubernetes: kubernetesEnvironment
-    }
-  }), (0, lodash_1.merge)({}, baseRollbackJob, shared, {
-    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false),
-    environment: {
-      kubernetes: kubernetesEnvironment
-    }
-  })];
+  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;