@catladder/pipeline 1.146.1 → 1.147.0

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.d.ts

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

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.d.ts

@@ -1,10 +1,10 @@
 import type { StringOrBashExpression } from "../../bash/BashExpression";
-import type { Context } from "../../types";
+import type { ComponentContext } from "../../types";
 /**
  * separate by secrets and public.
  * we evalulate the actual values later, but want to store the secrets in kubernetes secrets
  */
-export declare const createKubeEnv: (context: Context) => {
+export declare const createKubeEnv: (context: ComponentContext) => {
   secret: Record<string, StringOrBashExpression>;
   public: Record<string, StringOrBashExpression>;
 };

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.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from "../../types/context";
-export declare const createKubeValues: (context: Context) => never[] | ({
+import type { ComponentContext } from "../../types/context";
+export declare const createKubeValues: (context: ComponentContext) => never[] | ({
   env: {
     secret: Record<string, import("../../bash/BashExpression").StringOrBashExpression>;
     public: Record<string, import("../../bash/BashExpression").StringOrBashExpression>;

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.d.ts

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

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.d.ts

@@ -1,4 +1,4 @@
-import type { Context } from "../types/context";
-export declare const sbomDeactivated: (context: Context) => boolean;
-export declare const getDependencyTrackUploadScript: (context: Context) => string[];
-export declare const getDependencyTrackDeleteScript: (context: Context) => string[];
+import type { ComponentContext } from "../types/context";
+export declare const sbomDeactivated: (context: ComponentContext) => boolean;
+export declare const getDependencyTrackUploadScript: (context: ComponentContext) => string[];
+export declare const getDependencyTrackDeleteScript: (context: ComponentContext) => string[];

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.d.ts

@@ -1,5 +1,5 @@
-import type { Config, Context } from "../types";
+import type { Config, ComponentContext } from "../types";
 import type { DeployConfigKubernetesCluster } from "./types";
 export declare const getFullKubernetesClusterName: (cluster: DeployConfigKubernetesCluster) => string | undefined;
 export declare const getKubernetesNamespace: (config: Pick<Config, "customerName" | "appName">, env: string) => string;
-export declare const contextIsStoppable: (context: Context) => boolean;
+export declare const contextIsStoppable: (context: ComponentContext) => boolean;

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.d.ts

@@ -1,3 +1,3 @@
-import type { CreateContextContext } from "../context";
+import type { CreateComponentContextContext } from "../context";
 import type { CatladderJobWithContext } from "../types/context";
-export declare const createJobsForComponent: (contextContext: Omit<CreateContextContext, "packageManagerInfo">) => Promise<Array<CatladderJobWithContext>>;
+export declare const createJobsForComponent: (contextContext: Omit<CreateComponentContextContext, "packageManagerInfo">) => Promise<Array<CatladderJobWithContext>>;

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);
 };
@@ -205,7 +205,7 @@ var createJobsForComponent = function (contextContext) {
           return [4 /*yield*/, (0, packageManager_1.getPackageManagerInfo)(contextContext.config, contextContext.componentName)];
         case 1:
           packageManagerInfo = _a.sent();
-          return [4 /*yield*/, (0, context_1.createContext)(__assign(__assign({}, contextContext), {
+          return [4 /*yield*/, (0, context_1.createComponentContext)(__assign(__assign({}, contextContext), {
             packageManagerInfo: packageManagerInfo
           }))];
         case 2: