@catladder/pipeline 1.146.2 → 1.147.0

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-146-2-0f533fec" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v1-147-0-f922ca52" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/getLabels.js

@@ -34,7 +34,7 @@ var getLabels = function (context) {
     "app-name": sanitize(context.fullConfig.appName),
     "env-type": sanitize(context.environment.envType),
     "env-name": sanitize(context.environment.shortName),
-    "build-type": sanitize((_a = context.componentConfig.build) === null || _a === void 0 ? void 0 : _a.type)
+    "build-type": sanitize((_a = context.build.config) === null || _a === void 0 ? void 0 : _a.type)
   }, (_c = (_b = context.fullConfig.meta) === null || _b === void 0 ? void 0 : _b.labels) !== null && _c !== void 0 ? _c : {});
   return labels;
 };

package/dist/context/index.js

@@ -1,5 +1,15 @@
 "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;
   var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -138,6 +148,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createContext = exports.createComponentContext = void 0;
+var lodash_1 = require("lodash");
 var build_1 = require("../build");
 var deploy_1 = require("../deploy");
 var utils_1 = require("../utils");
@@ -147,10 +158,9 @@ __exportStar(require("./getEnvironment"), exports);
 __exportStar(require("./getEnvironmentVariables"), exports);
 var createComponentContext = function (ctx) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var envContext, componentConfigWithoutDefaults, defaults, componentConfig;
-    var _a;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
+    var envContext, componentConfigWithoutDefaults, defaults, componentConfig, environment, deploy, build, customJobs, dir, context, resolvedCustomJobs;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
           if (!/^[a-z0-9-]+$/.test(ctx.componentName)) {
             throw new Error("componentName may only contain lower case letters, numbers and -");
@@ -165,19 +175,31 @@ var createComponentContext = function (ctx) {
             deploy: {}
           };
           componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
-          _a = {
+          return [4 /*yield*/, (0, getEnvironment_1.getEnvironment)(ctx)];
+        case 1:
+          environment = _a.sent();
+          deploy = componentConfig.deploy, build = componentConfig.build, customJobs = componentConfig.customJobs, dir = componentConfig.dir;
+          context = {
             fullConfig: ctx.config,
             componentConfig: componentConfig,
-            buildContext: {
-              dir: componentConfig.dir,
+            build: {
+              dir: dir,
               packageManagerInfo: ctx.packageManagerInfo,
-              config: componentConfig.build
+              config: build
             },
-            componentName: ctx.componentName
+            deploy: deploy ? {
+              config: deploy
+            } : null,
+            componentName: ctx.componentName,
+            environment: environment,
+            packageManagerInfo: ctx.packageManagerInfo,
+            pipelineType: ctx.pipelineType,
+            trigger: ctx.trigger
           };
-          return [4 /*yield*/, (0, getEnvironment_1.getEnvironment)(ctx)];
-        case 1:
-          return [2 /*return*/, (_a.environment = _b.sent(), _a.packageManagerInfo = ctx.packageManagerInfo, _a.pipelineType = ctx.pipelineType, _a.trigger = ctx.trigger, _a)];
+          resolvedCustomJobs = (0, lodash_1.isFunction)(customJobs) ? customJobs(context) : customJobs;
+          return [2 /*return*/, __assign(__assign({}, context), {
+            customJobs: resolvedCustomJobs
+          })];
       }
     });
   });

package/dist/deploy/base/deploy.js

@@ -53,15 +53,16 @@ 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, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
   var autoStop = context.environment.envType === "review" ? "1 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   // if auto or manual is configured explicitly, use that
-  var whenDeployDefined = context.componentConfig.deploy && context.componentConfig.deploy.when ? context.componentConfig.deploy.when : undefined;
+  var whenDeployDefined = deployConfig && deployConfig.when ? deployConfig.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
+  : ((_b = context.componentConfig.env) === null || _b === void 0 ? void 0 : _b.stage) === false ? "auto" // is prod, but no staging, auto deploy
   : "manual"; // manually deploy
   var whenDeploy = whenDeployDefined ? whenDeployDefined : whenDeployDefault;
   return {
@@ -76,13 +77,13 @@ var createDeployJob = function (context, jobDefinition) {
     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) {
+    }]), false), __read(deployConfig ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,
         artifacts: false
       };
-    })) !== null && _c !== void 0 ? _c : [] : []), false),
+    })) !== null && _d !== void 0 ? _d : [] : []), false),
     // we don't want to deploy when there is a broken test
     needsStages: [{
       stage: "build",
@@ -95,13 +96,13 @@ var createDeployJob = function (context, jobDefinition) {
     when: whenDeploy === "auto" ? "on_success" : "manual",
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
-    variables: __assign(__assign(__assign(__assign(__assign({}, 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),
-    runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), (_e = jobDefinition.runnerVariables) !== null && _e !== void 0 ? _e : {}), context.componentConfig.deploy ? (_f = context.componentConfig.deploy.runnerVariables) !== null && _f !== void 0 ? _f : {} : {}),
+    variables: __assign(__assign(__assign(__assign(__assign({}, context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.environment.jobOnlyVars.deploy.envVars), deployConfig ? (_e = deployConfig.extraVars) !== null && _e !== void 0 ? _e : {} : {}), jobDefinition.variables),
+    runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), (_f = jobDefinition.runnerVariables) !== null && _f !== void 0 ? _f : {}), deployConfig ? (_g = deployConfig.runnerVariables) !== null && _g !== void 0 ? _g : {} : {}),
     environment: isStoppable ? {
       on_stop: stop_1.STOP_JOB_NAME,
       auto_stop_in: autoStop
     } : undefined,
-    jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
+    jobTags: deployConfig ? deployConfig.jobTags : undefined
   };
 };
 exports.createDeployJob = createDeployJob;

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

@@ -1,10 +1,6 @@
 import type { StringOrBashExpression } from "../../bash/BashExpression";
 import type { ComponentContext } from "../../types/context";
-export declare const getArtifactsRegistryHost: ({
-  componentConfig: {
-    deploy
-  }
-}: ComponentContext) => string;
+export declare const getArtifactsRegistryHost: (context: ComponentContext) => string;
 export declare const getArtifactsRegistryDockerUrl: (context: ComponentContext) => string;
 /**
  *

package/dist/deploy/cloudRun/artifactsRegistry.js

@@ -39,17 +39,18 @@ var BashExpression_1 = require("../../bash/BashExpression");
 var gitlab_1 = require("../../utils/gitlab");
 var types_1 = require("../types");
 var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
-var getArtifactsRegistryHost = function (_a) {
-  var deploy = _a.componentConfig.deploy;
-  if (!(0, types_1.isOfDeployType)(deploy, "google-cloudrun")) {
+var getArtifactsRegistryHost = function (context) {
+  var _a;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  return "".concat(deploy.region, "-docker.pkg.dev");
+  return "".concat(context.deploy.config.region, "-docker.pkg.dev");
 };
 exports.getArtifactsRegistryHost = getArtifactsRegistryHost;
 var getArtifactsRegistryDockerUrl = function (context) {
-  var deployConfig = context.componentConfig.deploy;
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
@@ -108,13 +109,11 @@ var getDeleteImageCommands = function (fullImageName, keepNewest) {
  * @returns
  */
 var getDeleteUnusedImagesCommands = function (context, keep) {
+  var _a;
   if (keep === void 0) {
     keep = 0;
   }
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/dist/deploy/cloudRun/cloudRunRevisions.js

@@ -19,8 +19,9 @@ var createArgsString_1 = require("./utils/createArgsString");
 var getServiceName_1 = require("./utils/getServiceName");
 var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
 var getListRevisionsCommand = function (context, args) {
+  var _a;
   var serviceName = (0, getServiceName_1.getServiceName)(context);
-  var deployConfig = context.componentConfig.deploy;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
@@ -37,10 +38,8 @@ var getListRevisionsCommand = function (context, args) {
   return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
 };
 var getDeleteUnusedRevisionsCommands = function (context, keep) {
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/dist/deploy/cloudRun/createJobs/cloudRunServices.js

@@ -56,7 +56,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
   var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
   var serviceName = (0, getServiceName_1.getServiceName)(context);
   var customConfig = service !== true ? service : undefined;
-  var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
+  var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.config.startCommand : undefined;
   var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
   var fullServiceName = serviceName.concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
   var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({

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

@@ -1,16 +1,16 @@
-import type { ComponentContext } from "../../../types/context";
+import type { Context } from "../../../types/context";
 import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
 export declare const gcloudCmd: (version?: "beta") => string;
 export declare const gcloudRunCmd: (version?: "beta") => string;
 export declare const gcloudSchedulerCmd: (version?: "beta") => string;
 export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCloudRun) => string[];
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
-export declare const getCloudRunDeployConfig: (context: ComponentContext) => DeployConfigCloudRun;
-export declare function getCommonCloudRunArgs(context: ComponentContext): {
+export declare const getCloudRunDeployConfig: (context: Context) => DeployConfigCloudRun;
+export declare function getCommonCloudRunArgs(context: Context): {
   project: string;
   region: import("../../types").Gcloudregion;
 };
-export declare function getCommonDeployArgs(context: ComponentContext): {
+export declare function getCommonDeployArgs(context: Context): {
   "set-cloudsql-instances": string | undefined;
   project: string;
   region: import("../../types").Gcloudregion;

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

@@ -64,7 +64,8 @@ var makeLabelString = function (obj) {
 };
 exports.makeLabelString = makeLabelString;
 var getCloudRunDeployConfig = function (context) {
-  var deployConfig = context.componentConfig.deploy;
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/dist/deploy/cloudRun/createJobs/index.js

@@ -22,10 +22,8 @@ var constants_1 = require("./constants");
 var getCloudRunDeployScripts_1 = require("./getCloudRunDeployScripts");
 var getCloudRunStopScripts_1 = require("./getCloudRunStopScripts");
 var createGoogleCloudRunDeployJobs = function (context) {
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/dist/deploy/custom/deployJob.js

@@ -41,28 +41,25 @@ var base_1 = require("../base");
 var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var createCustomDeployJobs = function (context) {
-  var _a, _b, _c;
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var _a, _b, _c, _d;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
     // should not happen
     throw new Error("deploy config is not custom");
   }
   // FIXME: custom deploy currently assumes yarn-based project
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context.buildContext, {
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context.build, {
     noCustomPostInstall: true
   });
   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),
+      image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
+      cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+      script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.build.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"),
+      image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
       script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
       variables: {}
     } : undefined

package/dist/deploy/dockerTag/deployJob.js

@@ -49,17 +49,15 @@ var docker_1 = require("../../build/docker");
 var base_1 = require("../base");
 var types_1 = require("../types");
 var createDockerTagDeployJobs = function (context) {
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "dockerTag")) {
     // should not happen
     throw new Error("deploy config is not dockerTag");
   }
   var tag = deployConfig.tag;
   return (0, base_1.createDeployementJobs)(context, {
-    deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
+    deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)()), {
       script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["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, "\"")], false)
     })
   });

package/dist/deploy/kubernetes/cloudSql/index.js

@@ -8,39 +8,41 @@ var context_1 = require("../../../context");
 var utils_1 = require("../../cloudSql/utils");
 var types_1 = require("../../types");
 var hasKubernetesCloudSQL = function (context) {
-  var _a, _b;
-  if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
-    return (_b = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql) === null || _b === void 0 ? void 0 : _b.enabled;
+  var _a, _b, _c;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  if ((0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
+    return (_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql) === null || _c === void 0 ? void 0 : _c.enabled;
   }
   return false;
 };
 exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
 var createKubernetesCloudsqlBaseValues = function (context) {
-  var _a, _b, _c, _d, _e, _f;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c, _d, _e, _f, _g;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
     throw new Error("cannot get cloud sql config");
   }
-  var config = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
+  var config = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.cloudsql;
   if (!config) {
     throw new Error("cannot get cloud sql config");
   }
   var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
   if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
-    var instanceConnectionName = "".concat((_b = config.projectId) !== null && _b !== void 0 ? _b : "skynet-164509", ":").concat((_c = config.region) !== null && _c !== void 0 ? _c : "europe-west6", ":").concat((_d = config.instanceId) !== null && _d !== void 0 ? _d : context.environment.envVars.KUBE_NAMESPACE);
+    var instanceConnectionName = "".concat((_c = config.projectId) !== null && _c !== void 0 ? _c : "skynet-164509", ":").concat((_d = config.region) !== null && _d !== void 0 ? _d : "europe-west6", ":").concat((_e = config.instanceId) !== null && _e !== void 0 ? _e : context.environment.envVars.KUBE_NAMESPACE);
     return {
       cloudsql: {
         enabled: config.enabled,
         dbUser: "postgres",
         instanceConnectionName: instanceConnectionName,
         proxyCredentials: proxyCredentials,
-        fullDbName: (_e = context.environment.envVars.KUBE_APP_NAME) !== null && _e !== void 0 ? _e : ""
+        fullDbName: (_f = context.environment.envVars.KUBE_APP_NAME) !== null && _f !== void 0 ? _f : ""
       }
     };
   } else if (config.type === "unmanaged") {
     return {
       cloudsql: {
         enabled: config.enabled,
-        dbUser: (_f = config.dbUser) !== null && _f !== void 0 ? _f : "postgres",
+        dbUser: (_g = config.dbUser) !== null && _g !== void 0 ? _g : "postgres",
         instanceConnectionName: config.instanceConnectionName,
         proxyCredentials: proxyCredentials,
         fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)

package/dist/deploy/kubernetes/deployJob.js

@@ -55,11 +55,8 @@ var bashYaml_1 = require("../../bash/bashYaml");
 var gitlab_1 = require("../../utils/gitlab");
 var ALL_VALUES_FILE = "__all_values.yml";
 var createKubernetesDeployJobs = function (context) {
-  var _a, _b;
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var _a, _b, _c;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
     // should not happen
     throw new Error("deploy config is not kubernetes");
@@ -78,8 +75,8 @@ var createKubernetesDeployJobs = function (context) {
       RELEASE_NAME: context.environment.fullName,
       HELM_EXPERIMENTAL_OCI: "1",
       KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName),
-      HELM_GITLAB_CHART_NAME: (_a = deployConfig.chartName) !== null && _a !== void 0 ? _a : "/helm-charts/the-panter-chart",
-      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_b = deployConfig.additionalHelmArgs) !== null && _b !== void 0 ? _b : []), false).join(" "),
+      HELM_GITLAB_CHART_NAME: (_b = deployConfig.chartName) !== null && _b !== void 0 ? _b : "/helm-charts/the-panter-chart",
+      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_c = deployConfig.additionalHelmArgs) !== null && _c !== void 0 ? _c : []), false).join(" "),
       COMPONENT_NAME: context.componentName,
       /** @deprecated */
       BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID

package/dist/deploy/kubernetes/kubeEnv.js

@@ -50,7 +50,8 @@ var shouldGoIntoSecrets = function (key, value) {
  * we evalulate the actual values later, but want to store the secrets in kubernetes secrets
  */
 var createKubeEnv = function (context) {
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
     // should not happen
     throw new Error("deploy config is not kubernetes");
   }

package/dist/deploy/kubernetes/kubeValues.js

@@ -63,7 +63,7 @@ var createAppConfig = function (context, application) {
     rest = __rest(_a, ["healthRoute", "command"]);
   return (0, utils_1.mergeWithMergingArrays)({
     host: context.environment.host,
-    command: command !== null && command !== void 0 ? command : context.componentConfig.build.startCommand,
+    command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
     livenessProbe: {
       httpGet: {
         path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health"
@@ -92,9 +92,9 @@ var removeFalsy = function (record) {
   }));
 };
 var createKubeValues = function (context) {
-  var _a, _b;
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
+  var _a, _b, _c;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+  if (!deployConfig) {
     return [];
   }
   if (!(0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
@@ -104,16 +104,16 @@ var createKubeValues = function (context) {
   var values = deployConfig.values;
   // we remove the application config because it can be just the value `false` which is a convenience feature, but not supported in the helm chart
   // we only merge the rest of the values in
-  var _c = values !== null && values !== void 0 ? values : {},
-    application = _c.application,
-    jobs = _c.jobs,
-    cronjobs = _c.cronjobs,
-    rest = __rest(_c, ["application", "jobs", "cronjobs"]);
+  var _d = values !== null && values !== void 0 ? values : {},
+    application = _d.application,
+    jobs = _d.jobs,
+    cronjobs = _d.cronjobs,
+    rest = __rest(_d, ["application", "jobs", "cronjobs"]);
   var env = (0, kubeEnv_1.createKubeEnv)(context);
   var defaultKubeValues = (0, lodash_1.merge)({
     env: env,
     application: createAppConfig(context, application)
-  }, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context) : {}, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
+  }, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context) : {}, ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
   var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({
     jobs: removeFalsy(jobs),
     cronjobs: removeFalsy(cronjobs)

package/dist/deploy/kubernetes/mongodb.js

@@ -33,15 +33,15 @@ var getMongodbReplicasetHost = function (context, index) {
   return getMongodbHost(context, "".concat(fullAppname, "-mongodb-").concat(index, ".").concat(fullAppname, "-mongodb-headless"));
 };
 var createMongodbUrl = function (context, dbName) {
-  var _a, _b;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c, _d;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "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;
+  var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
   var queryParams = undefined;
   var hosts = "";
   if ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset") {
-    hosts = (0, lodash_1.range)(0, (_b = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _b !== void 0 ? _b : 2).map(function (i) {
+    hosts = (0, lodash_1.range)(0, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _d !== void 0 ? _d : 2).map(function (i) {
       return getMongodbReplicasetHost(context, i);
     }).join(",");
     queryParams = "replicaSet=rs0&authSource=admin";
@@ -52,11 +52,11 @@ var createMongodbUrl = function (context, dbName) {
   return "mongodb://".concat(getCredentialString(context)).concat(hosts, "/").concat(dbName).concat(queryParams ? "?".concat(queryParams) : "");
 };
 var createMongoBackupDefaultConfig = function (context) {
-  var _a;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "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;
+  var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
   var fullAppName = context.environment.envVars.KUBE_APP_NAME;
   var backupEnabled = ["prod", "stage"].includes(context.environment.envType);
   var hostToBackup;
@@ -81,11 +81,11 @@ var createMongoBackupDefaultConfig = function (context) {
   };
 };
 var createMongodbBaseConfig = function (context) {
-  var _a, _b;
-  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+  var _a, _b, _c, _d;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "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;
+  var mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
   return {
     mongodb: {
       enabled: true,
@@ -101,7 +101,7 @@ var createMongodbBaseConfig = function (context) {
     },
     env: {
       secret: __assign({
-        MONGO_URL: createMongodbUrl(context, (_b = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.dbName) !== null && _b !== void 0 ? _b : "app")
+        MONGO_URL: createMongodbUrl(context, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.dbName) !== null && _d !== void 0 ? _d : "app")
       }, (mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset" ? {
         MONGO_OPLOG_URL: createMongodbUrl(context, "local")
       } // oplog only works with replicasets

package/dist/deploy/sbom.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript = exports.sbomDeactivated = void 0;
 var sbom_1 = require("../build/sbom");
 var sbomDeactivated = function (context) {
-  return context.componentConfig.build.type === "custom" && context.componentConfig.build.sbom === false;
+  return context.build.config.type === "custom" && context.build.config.sbom === false;
 };
 exports.sbomDeactivated = sbomDeactivated;
 var getDependencyTrackUploadScript = function (context) {

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

@@ -11,7 +11,7 @@ export type DeployConfigType = DeployConfig["type"];
 export type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
   type: T;
 }>;
-export declare const isOfDeployType: <T extends ("kubernetes" | "custom" | "google-cloudrun" | "dockerTag")[]>(t: DeployConfig | false, ...types: T) => t is Extract<DeployConfigKubernetes, {
+export declare const isOfDeployType: <T extends ("kubernetes" | "custom" | "google-cloudrun" | "dockerTag")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigKubernetes, {
   type: T[number];
 }> | Extract<DeployConfigCustom, {
   type: T[number];

package/dist/deploy/types/index.js

@@ -32,6 +32,6 @@ var isOfDeployType = function (t) {
   for (var _i = 1; _i < arguments.length; _i++) {
     types[_i - 1] = arguments[_i];
   }
-  return t && types.includes(t.type);
+  return t && types.includes(t.type) ? true : false;
 };
 exports.isOfDeployType = isOfDeployType;

package/dist/deploy/utils.js

@@ -16,7 +16,8 @@ var getKubernetesNamespace = function (config, env) {
 };
 exports.getKubernetesNamespace = getKubernetesNamespace;
 var contextIsStoppable = function (context) {
-  var deployConfig = context.componentConfig.deploy;
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if ((0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
     return true;
   }

package/dist/pipeline/createJobsForComponent.js

@@ -168,7 +168,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createJobsForComponent = void 0;
-var lodash_1 = require("lodash");
 var build_1 = require("../build");
 var context_1 = require("../context");
 var deploy_1 = require("../deploy");
@@ -184,15 +183,16 @@ var injectDefaultVarsInCustomJobs = function (context, jobs) {
   });
 };
 var getCustomJobs = function (context) {
-  if (!context.componentConfig.customJobs) {
+  if (!context.customJobs) {
     return [];
   }
-  var rawJobs = (0, lodash_1.isFunction)(context.componentConfig.customJobs) ? context.componentConfig.customJobs(context) : context.componentConfig.customJobs;
+  var rawJobs = context.customJobs;
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
 var createRawJobs = function (context) {
-  var buildJobs = build_1.BUILD_TYPES[context.componentConfig.build.type].jobs(context);
-  var deployJobs = context.componentConfig.deploy !== false ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context) : [];
+  var _a, _b;
+  var buildJobs = build_1.BUILD_TYPES[context.build.config.type].jobs(context);
+  var deployJobs = ((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config) ? deploy_1.DEPLOY_TYPES[(_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.type].jobs(context) : [];
   var customJobs = getCustomJobs(context);
   return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
 };