@catladder/cli 0.0.0-refactor-docker-c24f8608 → 0.0.0-refactor-cache-b38c122b

package/dist/pipeline/src/deploy/kubernetes/mongodb.js

@@ -1,46 +1,33 @@
 "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);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMongodbBaseConfig = void 0;
-var lodash_1 = require("lodash");
-var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
-var types_1 = require("../types");
-var getCredentialString = function (context) {
-    return "root:$".concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "MONGODB_ROOT_PASSWORD"), "@");
+const lodash_1 = require("lodash");
+const getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
+const types_1 = require("../types");
+const getCredentialString = (context) => `root:$${(0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "MONGODB_ROOT_PASSWORD")}@`;
+const getMongodbHost = (context, name) => {
+    const namespace = context.environment.envVars.KUBE_NAMESPACE;
+    return `${name}.${namespace}.svc.cluster.local:27017`;
 };
-var getMongodbHost = function (context, name) {
-    var namespace = context.environment.envVars.KUBE_NAMESPACE;
-    return "".concat(name, ".").concat(namespace, ".svc.cluster.local:27017");
+const getMongodbStandaloneHost = (context) => {
+    const fullAppname = context.environment.envVars.KUBE_APP_NAME;
+    return getMongodbHost(context, `${fullAppname}-mongodb`);
 };
-var getMongodbStandaloneHost = function (context) {
-    var fullAppname = context.environment.envVars.KUBE_APP_NAME;
-    return getMongodbHost(context, "".concat(fullAppname, "-mongodb"));
+const getMongodbReplicasetHost = (context, index) => {
+    const fullAppname = context.environment.envVars.KUBE_APP_NAME;
+    return getMongodbHost(context, `${fullAppname}-mongodb-${index}.${fullAppname}-mongodb-headless`);
 };
-var getMongodbReplicasetHost = function (context, index) {
-    var fullAppname = context.environment.envVars.KUBE_APP_NAME;
-    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")) {
+const createMongodbUrl = (context, dbName) => {
+    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 queryParams = undefined;
-    var hosts = "";
+    const mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
+    let queryParams = undefined;
+    let 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) { return getMongodbReplicasetHost(context, i); })
+        hosts = (0, lodash_1.range)(0, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _d !== void 0 ? _d : 2)
+            .map((i) => getMongodbReplicasetHost(context, i))
             .join(",");
         queryParams = "replicaSet=rs0&authSource=admin";
     }
@@ -48,48 +35,48 @@ var createMongodbUrl = function (context, dbName) {
         hosts = getMongodbStandaloneHost(context);
         queryParams = "authSource=admin";
     }
-    return "mongodb://".concat(getCredentialString(context)).concat(hosts, "/").concat(dbName).concat(queryParams ? "?".concat(queryParams) : "");
+    return `mongodb://${getCredentialString(context)}${hosts}/${dbName}${queryParams ? `?${queryParams}` : ""}`;
 };
-var createMongoBackupDefaultConfig = function (context) {
-    var _a;
-    if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+const createMongoBackupDefaultConfig = (context) => {
+    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 fullAppName = context.environment.envVars.KUBE_APP_NAME;
-    var backupEnabled = ["prod", "stage"].includes(context.environment.envType);
-    var hostToBackup;
-    var pvcToBackup;
+    const mongodbConfig = (_c = (_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.values) === null || _c === void 0 ? void 0 : _c.mongodb;
+    const fullAppName = context.environment.envVars.KUBE_APP_NAME;
+    const backupEnabled = ["prod", "stage"].includes(context.environment.envType);
+    let hostToBackup;
+    let pvcToBackup;
     if ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset") {
         // bit quirky, we need to specify the host and its volume
         // on replicaset its probably best to not use the first one, whcih usually starts as master, so we take the second (last one would also be ok)
-        var backupHostIndex = (mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset" &&
+        const backupHostIndex = (mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset" &&
             mongodbConfig.replicaCount &&
             mongodbConfig.replicaCount > 1
             ? 1
             : 0;
         hostToBackup = getMongodbReplicasetHost(context, backupHostIndex);
-        pvcToBackup = "datadir-".concat(fullAppName, "-mongodb-").concat(backupHostIndex);
+        pvcToBackup = `datadir-${fullAppName}-mongodb-${backupHostIndex}`;
     }
     else {
         hostToBackup = getMongodbStandaloneHost(context);
-        pvcToBackup = "".concat(fullAppName, "-mongodb");
+        pvcToBackup = `${fullAppName}-mongodb`;
     }
     return {
         enabled: backupEnabled,
-        hostToBackup: hostToBackup,
-        pvcToBackup: pvcToBackup,
+        hostToBackup,
+        pvcToBackup,
         image: "mrelite/kubectlmongoshell:v1.0",
         schedule: "0 4 * * *",
         volumeSnapshotClass: "snapshotclass",
     };
 };
-var createMongodbBaseConfig = function (context) {
-    var _a, _b;
-    if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+const createMongodbBaseConfig = (context) => {
+    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;
+    const 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,
@@ -104,9 +91,12 @@ var createMongodbBaseConfig = function (context) {
             backup: createMongoBackupDefaultConfig(context),
         },
         env: {
-            secret: __assign({ MONGO_URL: createMongodbUrl(context, (_b = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.dbName) !== null && _b !== void 0 ? _b : "app") }, ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset"
-                ? { MONGO_OPLOG_URL: createMongodbUrl(context, "local") } // oplog only works with replicasets
-                : {})),
+            secret: {
+                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/pipeline/src/deploy/kubernetes/mongodb.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/mongodb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mongodb.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/mongodb.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.js

@@ -1,29 +1,27 @@
 "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);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processSecretsAsFiles = void 0;
-var lodash_1 = require("lodash");
-var processSecretsAsFiles = function (values) {
+const lodash_1 = require("lodash");
+const processSecretsAsFiles = (values) => {
     if (!values.secretsAsFile || values.secretsAsFile.length === 0) {
         return values;
     }
     // the initial idea was that we "shadow" secrets that we mount as files,
     // but there is a weird kubernetes  issue with that (https://github.com/kubernetes/kubernetes/issues/46861),
     // so instead we rename the secrets and append _content, so that inside kuberentes, we can use the original name to contain the path and name+_content as the actual content
-    return __assign(__assign({}, values), { env: __assign(__assign({}, values.env), { secret: __assign(__assign({}, (0, lodash_1.omit)(values.env.secret, values.secretsAsFile)), Object.fromEntries(values.secretsAsFile.map(function (key) { return [
-                key + "_content",
-                values.env.secret[key],
-            ]; }))) }) });
+    return {
+        ...values,
+        env: {
+            ...values.env,
+            secret: {
+                ...(0, lodash_1.omit)(values.env.secret, values.secretsAsFile),
+                ...Object.fromEntries(values.secretsAsFile.map((key) => [
+                    key + "_content",
+                    values.env.secret[key],
+                ])),
+            },
+        },
+    };
 };
 exports.processSecretsAsFiles = processSecretsAsFiles;
 //# sourceMappingURL=processSecretsAsFiles.js.map

package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"processSecretsAsFiles.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/processSecretsAsFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iCAA8B;AAIvB,IAAM,qBAAqB,GAAG,UAOnC,MAAS;IAET,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,wEAAwE;IACxE,4GAA4G;IAC5G,4KAA4K;IAC5K,6BACK,MAAM,KACT,GAAG,wBACE,MAAM,CAAC,GAAG,KACb,MAAM,wBACD,IAAA,aAAI,EAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,GAC7C,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA;gBAChC,GAAG,GAAG,UAAU;gBAChB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;aACvB,EAHiC,CAGjC,CAAC,CACH,QAGL;AACJ,CAAC,CAAC;AA9BW,QAAA,qBAAqB,yBA8BhC"}
+{"version":3,"file":"processSecretsAsFiles.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/kubernetes/processSecretsAsFiles.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAIvB,MAAM,qBAAqB,GAAG,CAOnC,MAAS,EACN,EAAE;IACL,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,wEAAwE;IACxE,4GAA4G;IAC5G,4KAA4K;IAC5K,OAAO;QACL,GAAG,MAAM;QACT,GAAG,EAAE;YACH,GAAG,MAAM,CAAC,GAAG;YACb,MAAM,EAAE;gBACN,GAAG,IAAA,aAAI,EAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC;gBAChD,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;oBAChC,GAAG,GAAG,UAAU;oBAChB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;iBACvB,CAAC,CACH;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,qBAAqB,yBA8BhC"}

package/dist/pipeline/src/deploy/sbom.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentContext } from "../types/context";
+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/pipeline/src/deploy/sbom.js

@@ -1,27 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
-};
+const sbom_1 = require("../build/sbom");
+const context_1 = require("../types/context");
+const sbomDeactivated = (context) => (0, context_1.componentContextIsStandaloneBuild)(context) &&
+    context.build.config.type === "custom" &&
+    context.build.config.sbom === false;
 exports.sbomDeactivated = sbomDeactivated;
-var getDependencyTrackUploadScript = function (context) {
+const getDependencyTrackUploadScript = (context) => {
     return (0, exports.sbomDeactivated)(context)
         ? []
         : [
-            "echo Uploading SBOM to Dependency Track",
-            "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true"),
+            "echo 'Uploading SBOM to Dependency Track'",
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" "${sbom_1.SBOM_FILE}" vex.json || true`,
         ];
 };
 exports.getDependencyTrackUploadScript = getDependencyTrackUploadScript;
-var getDependencyTrackDeleteScript = function (context) {
+const getDependencyTrackDeleteScript = (context) => {
     return (0, exports.sbomDeactivated)(context)
         ? []
         : [
-            "echo Disabling component in Dependency Track",
-            "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" || true"),
+            "echo 'Disabling component in Dependency Track'",
+            `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" || true`,
         ];
 };
 exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;

package/dist/pipeline/src/deploy/sbom.js.map

@@ -1 +1 @@
-{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AACA,sCAA0C;AAEnC,IAAM,eAAe,GAAG,UAAC,OAAyB;IACvD,OAAA,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC/C,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK;AAD5C,CAC4C,CAAC;AAFlC,QAAA,eAAe,mBAEmB;AAExC,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;IAEzB,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,yCAAyC;YACzC,8EAAoE,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,aAAa,kBAAM,OAAO,CAAC,WAAW,CAAC,GAAG,kBAAM,gBAAS,wBAAoB;SAC3N,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC;AAEK,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;IAEzB,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,8CAA8C;YAC9C,+EAAqE,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,aAAa,kBAAM,OAAO,CAAC,WAAW,CAAC,GAAG,eAAW;SACpM,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC"}
+{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/sbom.ts"],"names":[],"mappings":";;;AAAA,wCAA0C;AAC1C,8CAG0B;AAEnB,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC3D,IAAA,2CAAiC,EAAC,OAAO,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ;IACtC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;AAHzB,QAAA,eAAe,mBAGU;AAE/B,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,2CAA2C;YAC3C,oEAAoE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,gBAAS,oBAAoB;SAClN,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC;AAEK,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACf,EAAE;IACZ,OAAO,IAAA,uBAAe,EAAC,OAAO,CAAC;QAC7B,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC;YACE,gDAAgD;YAChD,qEAAqE,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW;SAC3L,CAAC;AACR,CAAC,CAAC;AATW,QAAA,8BAA8B,kCASzC"}

package/dist/pipeline/src/deploy/types/custom.d.ts

@@ -1,5 +1,5 @@
+import type { WithCacheConfig } from "../../build";
 import type { GitlabJobImage } from "../../types";
-import type { CatladderJob } from "../../types/jobs";
 import type { DeployConfigBase } from "./base";
 export type DeployConfigCustom = {
     /**
@@ -26,8 +26,4 @@ export type DeployConfigCustom = {
      * image to use
      */
     jobImage?: GitlabJobImage;
-    /**
-     * customize cache for the job
-     */
-    jobCache?: CatladderJob["cache"];
-} & DeployConfigBase;
+} & DeployConfigBase & WithCacheConfig;

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

@@ -89,6 +89,14 @@ export type DeployConfigCloudRunService = {
      * memory limit. Defaults to 512MB
      */
     memory?: Memory;
+    /**
+     * timeout of the service, defaults to 5 minutes.
+     *
+     * you can specify something like 10m30s. if its just a number, it will be interpreted as seconds
+     *
+     * max supported is 60min
+     */
+    timeout?: string;
     /**
      *
      * set the execution environment.
@@ -98,6 +106,24 @@ export type DeployConfigCloudRunService = {
      * defaults to gen1 according to gcloud
      */
     executionEnvironment?: "gen2" | "gen1";
+    /**
+     * vpc connector,
+     */
+    vpcConnector?: string;
+    /**
+     * vpc egress, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--vpc-egress
+     */
+    vpcEgress?: "all-traffic" | "private-ranges-only";
+    /**
+     * Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
+     *
+     * Defaults to false.
+     *
+     * Your service needs to be able to handle http2 requests.
+     * Its recommended to use http2 without tls, since cloud run handles the encryption for you. (so called "h2c" (http2 cleartext))
+     *
+     */
+    http2?: boolean;
 } & DeployConfigCloudRunWithVolumes;
 export type DeployConfigCloudRunJobBase = {
     /**

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

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

package/dist/pipeline/src/deploy/types/index.js

@@ -19,12 +19,8 @@ __exportStar(require("./custom"), exports);
 __exportStar(require("./googleCloudRun"), exports);
 __exportStar(require("./kubernetes"), exports);
 __exportStar(require("./dockerTag"), exports);
-var isOfDeployType = function (t) {
-    var types = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        types[_i - 1] = arguments[_i];
-    }
-    return t && types.includes(t.type);
+const isOfDeployType = (t, ...types) => {
+    return t && types.includes(t.type) ? true : false;
 };
 exports.isOfDeployType = isOfDeployType;
 //# sourceMappingURL=index.js.map

package/dist/pipeline/src/deploy/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAKA,2CAAyB;AACzB,mDAAiC;AACjC,+CAA6B;AAC7B,8CAA4B;AAcrB,IAAM,cAAc,GAAG,UAC5B,CAAuB;IACvB,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAKA,2CAAyB;AACzB,mDAAiC;AACjC,+CAA6B;AAC7B,8CAA4B;AAcrB,MAAM,cAAc,GAAG,CAC5B,CAA0C,EAC1C,GAAG,KAAQ,EACsC,EAAE;IACnD,OAAO,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AACpD,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB"}

package/dist/pipeline/src/deploy/utils.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contextIsStoppable = exports.getKubernetesNamespace = exports.getFullKubernetesClusterName = void 0;
-var types_1 = require("./types");
-var getFullKubernetesClusterName = function (cluster) {
+const types_1 = require("./types");
+const getFullKubernetesClusterName = (cluster) => {
     if (cluster.type === "gcloud") {
-        return "gke_".concat(cluster.projectId, "_").concat(cluster.region, "_").concat(cluster.name);
+        return `gke_${cluster.projectId}_${cluster.region}_${cluster.name}`;
     }
 };
 exports.getFullKubernetesClusterName = getFullKubernetesClusterName;
-var getKubernetesNamespace = function (config, env) {
-    return "".concat(config.customerName, "-").concat(config.appName, "-").concat(env);
+const getKubernetesNamespace = (config, env) => {
+    return `${config.customerName}-${config.appName}-${env}`;
 };
 exports.getKubernetesNamespace = getKubernetesNamespace;
-var contextIsStoppable = function (context) {
-    var deployConfig = context.componentConfig.deploy;
+const contextIsStoppable = (context) => {
+    var _a;
+    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if ((0, types_1.isOfDeployType)(deployConfig, "kubernetes")) {
         return true;
     }

package/dist/pipeline/src/deploy/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/utils.ts"],"names":[],"mappings":";;;AAEA,iCAAyC;AAElC,IAAM,4BAA4B,GAAG,UAC1C,OAAsC;IAEtC,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,cAAO,OAAO,CAAC,SAAS,cAAI,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,CAAE,CAAC;IACtE,CAAC;AACH,CAAC,CAAC;AANW,QAAA,4BAA4B,gCAMvC;AAEK,IAAM,sBAAsB,GAAG,UACpC,MAAgD,EAChD,GAAW;IAEX,OAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,CAAC;AAC3D,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAyB;IAC1D,IAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IACpD,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,kBAAkB,sBAc7B"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/utils.ts"],"names":[],"mappings":";;;AAEA,mCAAyC;AAElC,MAAM,4BAA4B,GAAG,CAC1C,OAAsC,EACtC,EAAE;IACF,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,OAAO,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IACtE,CAAC;AACH,CAAC,CAAC;AANW,QAAA,4BAA4B,gCAMvC;AAEK,MAAM,sBAAsB,GAAG,CACpC,MAAgD,EAChD,GAAW,EACX,EAAE;IACF,OAAO,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,IAAI,GAAG,EAAE,CAAC;AAC3D,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IAC9D,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,kBAAkB,sBAc7B"}

package/dist/pipeline/src/packageInfos.d.ts

@@ -1,2 +1,4 @@
-declare const ownPkg: any;
+declare let ownPkg: {
+    version: string;
+};
 export default ownPkg;

package/dist/pipeline/src/packageInfos.js

@@ -1,12 +1,17 @@
 "use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
 // we can't import the package.json directly, because the bundling process will inline it
 // but the version is only set during deployement, when its already bundled
 // instead we need to use require.main.path to get the path of the main module, which is actually the file in the bin
 // this will point to the root package.json
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-var path = ((_a = require.main) === null || _a === void 0 ? void 0 : _a.path) + "/../package.json";
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-var ownPkg = require(path);
+let ownPkg = { version: "0.0.0" };
+try {
+    const path = ((_a = require.main) === null || _a === void 0 ? void 0 : _a.path) + "/../package.json";
+    ownPkg = require(path);
+}
+catch (e) {
+    // ignore, currently in the gitlab-includes, this doesn't work
+}
 exports.default = ownPkg;
 //# sourceMappingURL=packageInfos.js.map

package/dist/pipeline/src/packageInfos.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageInfos.js","sourceRoot":"","sources":["../../../../pipeline/src/packageInfos.ts"],"names":[],"mappings":";AAAA,yFAAyF;AACzF,2EAA2E;AAC3E,qHAAqH;AACrH,2CAA2C;;;AAE3C,IAAM,IAAI,GAAG,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,IAAG,kBAAkB,CAAC;AACrD,8DAA8D;AAC9D,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE7B,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"packageInfos.js","sourceRoot":"","sources":["../../../../pipeline/src/packageInfos.ts"],"names":[],"mappings":";;;AAAA,yFAAyF;AACzF,2EAA2E;AAC3E,qHAAqH;AACrH,2CAA2C;AAC3C,IAAI,MAAM,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAClC,IAAI,CAAC;IACH,MAAM,IAAI,GAAG,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,IAAI,IAAG,kBAAkB,CAAC;IAErD,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,8DAA8D;AAChE,CAAC;AAED,kBAAe,MAAM,CAAC"}

package/dist/pipeline/src/pipeline/createAllJobs.d.ts

@@ -1,12 +1,14 @@
-import type { CatladderJobWithContext, Config, PipelineTrigger, PipelineType } from "../types";
+import type { CreateAllComponentsContextProps } from "../context/createAllComponentsContext";
+import type { ComponentContext, WorkspaceContext } from "../types";
+import type { CatladderJob } from "../types/jobs";
 export type AllCatladderJobs = {
-    [componentName: string]: {
-        [env: string]: Array<CatladderJobWithContext>;
-    };
+    workspaces: Array<{
+        context: WorkspaceContext;
+        jobs: Array<CatladderJob>;
+    }>;
+    components: Array<{
+        context: ComponentContext;
+        jobs: Array<CatladderJob>;
+    }>;
 };
-export type AllJobsContext = {
-    config: Config;
-    trigger: PipelineTrigger;
-    pipelineType: PipelineType;
-};
-export declare const createAllJobs: ({ config, trigger, pipelineType, }: AllJobsContext) => Promise<AllCatladderJobs>;
+export declare const createAllJobs: ({ config, trigger, pipelineType, }: CreateAllComponentsContextProps) => Promise<AllCatladderJobs>;

package/dist/pipeline/src/pipeline/createAllJobs.js

@@ -1,87 +1,45 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAllJobs = void 0;
-var config_1 = require("../config");
-var createJobsForComponent_1 = require("./createJobsForComponent");
-var createAllJobs = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var _c, _d;
-    var config = _b.config, trigger = _b.trigger, pipelineType = _b.pipelineType;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
-            case 0:
-                _d = (_c = Object).fromEntries;
-                return [4 /*yield*/, Promise.all(Object.keys(config.components).map(function (componentName) { return __awaiter(void 0, void 0, void 0, function () {
-                        var envs, _a, _b, _c;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0:
-                                    envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
-                                    _a = [componentName];
-                                    _c = (_b = Object).fromEntries;
-                                    return [4 /*yield*/, Promise.all(envs.map(function (env) { return __awaiter(void 0, void 0, void 0, function () {
-                                            var _a;
-                                            return __generator(this, function (_b) {
-                                                switch (_b.label) {
-                                                    case 0:
-                                                        _a = [env];
-                                                        return [4 /*yield*/, (0, createJobsForComponent_1.createJobsForComponent)({
-                                                                config: config,
-                                                                componentName: componentName,
-                                                                env: env,
-                                                                trigger: trigger,
-                                                                pipelineType: pipelineType,
-                                                            })];
-                                                    case 1: return [2 /*return*/, _a.concat([
-                                                            _b.sent()
-                                                        ])];
-                                                }
-                                            });
-                                        }); }))];
-                                case 1: return [2 /*return*/, _a.concat([
-                                        _c.apply(_b, [_d.sent()])
-                                    ])];
-                            }
-                        });
-                    }); }))];
-            case 1: return [2 /*return*/, _d.apply(_c, [_e.sent()])];
-        }
+const createAllComponentsContext_1 = require("../context/createAllComponentsContext");
+const createWorkspaceContext_1 = require("../context/createWorkspaceContext");
+const types_1 = require("../types");
+const createJobsForComponent_1 = require("./createJobsForComponent");
+const createJobsForWorkspace_1 = require("./createJobsForWorkspace");
+const createAllJobs = async ({ config, trigger, pipelineType, }) => {
+    var _a;
+    const allComponentsContext = await (0, createAllComponentsContext_1.createAllComponentsContext)({
+        config,
+        trigger,
+        pipelineType,
     });
-}); };
+    return {
+        workspaces: await Promise.all(Object.keys((_a = config.builds) !== null && _a !== void 0 ? _a : {}).map(async (workspaceName) => {
+            const componentsInAllEnvs = allComponentsContext.filter((context) => (0, types_1.componentContextHasWorkspaceBuild)(context) &&
+                context.build.workspaceName === workspaceName);
+            const allEnvs = [...new Set(componentsInAllEnvs.map(({ env }) => env))];
+            return await Promise.all(allEnvs.map(async (env) => {
+                const workspaceContext = await (0, createWorkspaceContext_1.createWorkspaceContext)({
+                    components: componentsInAllEnvs.filter(({ env: componentEnv }) => componentEnv === env),
+                    workspaceName,
+                    config,
+                    trigger,
+                    pipelineType,
+                    env,
+                });
+                return {
+                    context: workspaceContext,
+                    jobs: (0, createJobsForWorkspace_1.createJobsForWorkspace)(workspaceContext),
+                };
+            }));
+        })).then((f) => f.flat()),
+        components: allComponentsContext.map((context) => {
+            return {
+                context,
+                jobs: (0, createJobsForComponent_1.createJobsForComponentContext)(context),
+            };
+        }),
+    };
+};
 exports.createAllJobs = createAllJobs;
 //# sourceMappingURL=createAllJobs.js.map