@catladder/cli 0.0.0-refactor-docker-45f6e733 → 0.0.0-refactor-cache-61f8abb0

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

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

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

@@ -1,23 +1,7 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createArgsString = void 0;
-var lodash_1 = require("lodash");
+const lodash_1 = require("lodash");
 /**
  * creates arguments string:
  *
@@ -28,31 +12,19 @@ var lodash_1 = require("lodash");
  * @param args args record
  * @returns
  */
-var createArgsString = function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
+const createArgsString = (...args) => args
+    .map((argObj) => Object.entries(argObj)
+    .filter(([, value]) => !(0, lodash_1.isNil)(value))
+    .map(([key, value]) => {
+    if (value === true) {
+        return `--${key}`;
+    }
+    else if (value === false) {
+        return `--no-${key}`;
     }
-    return args
-        .map(function (argObj) {
-        return Object.entries(argObj)
-            .filter(function (_a) {
-            var _b = __read(_a, 2), value = _b[1];
-            return !(0, lodash_1.isNil)(value);
-        })
-            .map(function (_a) {
-            var _b = __read(_a, 2), key = _b[0], value = _b[1];
-            if (value === true) {
-                return "--".concat(key);
-            }
-            else if (value === false) {
-                return "--no-".concat(key);
-            }
-            return "--".concat(key, "=").concat(value);
-        });
-    })
-        .flat()
-        .join(" ");
-};
+    return `--${key}=${value}`;
+}))
+    .flat()
+    .join(" ");
 exports.createArgsString = createArgsString;
 //# sourceMappingURL=createArgsString.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"createArgsString.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/createArgsString.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAG/B;;;;;;;;;GASG;AACI,IAAM,gBAAgB,GAAG;IAAC,cAAuB;SAAvB,UAAuB,EAAvB,qBAAuB,EAAvB,IAAuB;QAAvB,yBAAuB;;IACtD,OAAA,IAAI;SACD,GAAG,CAAC,UAAC,MAAM;QACV,OAAA,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;aACnB,MAAM,CAAC,UAAC,EAAS;gBAAT,KAAA,aAAS,EAAN,KAAK,QAAA;YAAM,OAAA,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC;QAAb,CAAa,CAAC;aACpC,GAAG,CAAC,UAAC,EAAY;gBAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YACf,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,OAAO,YAAK,GAAG,CAAE,CAAC;YACpB,CAAC;iBAAM,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC3B,OAAO,eAAQ,GAAG,CAAE,CAAC;YACvB,CAAC;YACD,OAAO,YAAK,GAAG,cAAI,KAAK,CAAE,CAAC;QAC7B,CAAC,CAAC;IATJ,CASI,CACL;SACA,IAAI,EAAE;SACN,IAAI,CAAC,GAAG,CAAC;AAdZ,CAcY,CAAC;AAfF,QAAA,gBAAgB,oBAed"}
+{"version":3,"file":"createArgsString.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/createArgsString.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAG/B;;;;;;;;;GASG;AACI,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAoB,EAAE,EAAE,CAC1D,IAAI;KACD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACd,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KACnB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC,CAAC;KACpC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;IACpB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,KAAK,GAAG,EAAE,CAAC;IACpB,CAAC;SAAM,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,QAAQ,GAAG,EAAE,CAAC;IACvB,CAAC;IACD,OAAO,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;AAC7B,CAAC,CAAC,CACL;KACA,IAAI,EAAE;KACN,IAAI,CAAC,GAAG,CAAC,CAAC;AAfF,QAAA,gBAAgB,oBAed"}

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

@@ -1,66 +1,50 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatabaseConnectionString = exports.DATABASE_JDBC_URL = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
-var gitlab_1 = require("../../../utils/gitlab");
-var getDatabaseDeleteScript = function (context, deployConfig) {
+const gitlab_1 = require("../../../utils/gitlab");
+const getDatabaseDeleteScript = (context, deployConfig) => {
     if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
         throw new Error("not possible");
     }
-    var DB_NAME = context.environment.envVars["DB_NAME"];
+    const DB_NAME = context.environment.envVars["DB_NAME"];
     if (!DB_NAME) {
         throw new Error("error: env vars did not specify DB_NAME");
     }
-    var _a = __read(deployConfig.cloudSql.instanceConnectionName.split(":"), 3), projectId = _a[0], region = _a[1], instanceId = _a[2];
+    const [projectId, region, instanceId] = deployConfig.cloudSql.instanceConnectionName.split(":");
     // unfortunatly the database cannot be deleted right after the service has stopped, as it might still have connections
     // we have to repeate this process
     return [
-        "echo \"deleting database ".concat(DB_NAME, "...\""),
-        "echo \"\uD83D\uDC46 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down\"",
-        (0, gitlab_1.repeatOnFailure)("gcloud sql databases delete ".concat(DB_NAME, " --instance=").concat(instanceId, " --project ").concat(projectId), {
+        `echo "deleting database ${DB_NAME}..."`,
+        `echo "👆 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down"`,
+        (0, gitlab_1.repeatOnFailure)(`gcloud sql databases delete ${DB_NAME} --instance=${instanceId} --project ${projectId}`, {
             pauseInSeconds: 10,
         }),
     ];
 };
 exports.getDatabaseDeleteScript = getDatabaseDeleteScript;
-var getDatabaseCreateScript = function (context, deployConfig) {
+const getDatabaseCreateScript = (context, deployConfig) => {
     if (!deployConfig.cloudSql) {
         throw new Error("not possible");
     }
-    var DB_NAME = context.environment.envVars["DB_NAME"];
+    const DB_NAME = context.environment.envVars["DB_NAME"];
     if (!DB_NAME) {
         throw new Error("error: env vars did not specify DB_NAME");
     }
-    var _a = __read(deployConfig.cloudSql.instanceConnectionName.split(":"), 3), projectId = _a[0], region = _a[1], instanceId = _a[2];
+    const [projectId, region, instanceId] = deployConfig.cloudSql.instanceConnectionName.split(":");
     // may fail if it already exists
     return (0, gitlab_1.allowFailureInScripts)([
-        "echo \"ensuring Database...\"",
-        "gcloud sql databases create ".concat(DB_NAME, " --instance=").concat(instanceId, " --project ").concat(projectId),
+        `echo "ensuring Database..."`,
+        `gcloud sql databases create ${DB_NAME} --instance=${instanceId} --project ${projectId}`,
     ]);
 };
 exports.getDatabaseCreateScript = getDatabaseCreateScript;
 exports.DATABASE_JDBC_URL = "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD";
-var getDatabaseConnectionString = function (config) {
+const getDatabaseConnectionString = (config) => {
     switch (config.dbConnectionStringFormat) {
         case "jdbc":
             return exports.DATABASE_JDBC_URL;
         case "rails":
-            return "postgresql://$DB_USER:$DB_PASSWORD@".concat(encodeURIComponent("/cloudsql/".concat(config.instanceConnectionName)), "/$DB_NAME?");
+            return `postgresql://$DB_USER:$DB_PASSWORD@${encodeURIComponent(`/cloudsql/${config.instanceConnectionName}`)}/$DB_NAME?`;
         default:
             // prisma
             return "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";

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

@@ -1 +1 @@
-{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/database.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AACA,gDAA+E;AAMxE,IAAM,uBAAuB,GAAG,UACrC,OAAyB,EACzB,YAAkC;IAElC,IAAI,CAAC,YAAY,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IACD,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAEK,IAAA,KAAA,OACJ,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EADlD,SAAS,QAAA,EAAE,MAAM,QAAA,EAAE,UAAU,QACqB,CAAC;IAC1D,sHAAsH;IACtH,kCAAkC;IAClC,OAAO;QACL,mCAA2B,OAAO,UAAM;QACxC,8KAAkK;QAClK,IAAA,wBAAe,EACb,sCAA+B,OAAO,yBAAe,UAAU,wBAAc,SAAS,CAAE,EACxF;YACE,cAAc,EAAE,EAAE;SACnB,CACF;KACF,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,uBAAuB,2BA2BlC;AAEK,IAAM,uBAAuB,GAAG,UACrC,OAAyB,EACzB,YAAkC;IAElC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAEK,IAAA,KAAA,OACJ,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EADlD,SAAS,QAAA,EAAE,MAAM,QAAA,EAAE,UAAU,QACqB,CAAC;IAC1D,gCAAgC;IAChC,OAAO,IAAA,8BAAqB,EAAC;QAC3B,+BAA6B;QAC7B,sCAA+B,OAAO,yBAAe,UAAU,wBAAc,SAAS,CAAE;KACzF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC;AAEW,QAAA,iBAAiB,GAC5B,gLAAgL,CAAC;AAE5K,IAAM,2BAA2B,GAAG,UACzC,MAAoC;IAEpC,QAAQ,MAAM,CAAC,wBAAwB,EAAE,CAAC;QACxC,KAAK,MAAM;YACT,OAAO,yBAAiB,CAAC;QAC3B,KAAK,OAAO;YACV,OAAO,6CAAsC,kBAAkB,CAC7D,oBAAa,MAAM,CAAC,sBAAsB,CAAE,CAC7C,eAAY,CAAC;QAChB;YACE,SAAS;YACT,OAAO,0GAA0G,CAAC;IACtH,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,2BAA2B,+BActC"}
+{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/database.ts"],"names":[],"mappings":";;;AACA,kDAA+E;AAMxE,MAAM,uBAAuB,GAAG,CACrC,OAAyB,EACzB,YAAkC,EACxB,EAAE;IACZ,IAAI,CAAC,YAAY,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,GACnC,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1D,sHAAsH;IACtH,kCAAkC;IAClC,OAAO;QACL,2BAA2B,OAAO,MAAM;QACxC,kKAAkK;QAClK,IAAA,wBAAe,EACb,+BAA+B,OAAO,eAAe,UAAU,cAAc,SAAS,EAAE,EACxF;YACE,cAAc,EAAE,EAAE;SACnB,CACF;KACF,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,uBAAuB,2BA2BlC;AAEK,MAAM,uBAAuB,GAAG,CACrC,OAAyB,EACzB,YAAkC,EACxB,EAAE;IACZ,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,GACnC,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1D,gCAAgC;IAChC,OAAO,IAAA,8BAAqB,EAAC;QAC3B,6BAA6B;QAC7B,+BAA+B,OAAO,eAAe,UAAU,cAAc,SAAS,EAAE;KACzF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,uBAAuB,2BAqBlC;AAEW,QAAA,iBAAiB,GAC5B,gLAAgL,CAAC;AAE5K,MAAM,2BAA2B,GAAG,CACzC,MAAoC,EAC5B,EAAE;IACV,QAAQ,MAAM,CAAC,wBAAwB,EAAE,CAAC;QACxC,KAAK,MAAM;YACT,OAAO,yBAAiB,CAAC;QAC3B,KAAK,OAAO;YACV,OAAO,sCAAsC,kBAAkB,CAC7D,aAAa,MAAM,CAAC,sBAAsB,EAAE,CAC7C,YAAY,CAAC;QAChB;YACE,SAAS;YACT,OAAO,0GAA0G,CAAC;IACtH,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,2BAA2B,+BActC"}

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gcloudServiceAccountLoginCommands = void 0;
-var __1 = require("..");
-var context_1 = require("../../../context");
-var gcloudServiceAccountLoginCommands = function (context) { return [
-    "gcloud auth activate-service-account --key-file=<(echo \"$".concat((0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY), "\")"),
-]; };
+const __1 = require("..");
+const context_1 = require("../../../context");
+const gcloudServiceAccountLoginCommands = (context) => [
+    `gcloud auth activate-service-account --key-file=<(echo "$${(0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY)}")`,
+];
 exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 //# sourceMappingURL=gcloudServiceAccountLoginCommands.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"gcloudServiceAccountLoginCommands.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts"],"names":[],"mappings":";;;AAAA,wBAAmD;AACnD,4CAA8D;AAGvD,IAAM,iCAAiC,GAAG,UAC/C,OAAyB,IACtB,OAAA;IACH,oEAA4D,IAAA,oCAA0B,EACpF,OAAO,EACP,iCAA6B,CAC9B,QAAI;CACN,EALI,CAKJ,CAAC;AAPW,QAAA,iCAAiC,qCAO5C"}
+{"version":3,"file":"gcloudServiceAccountLoginCommands.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts"],"names":[],"mappings":";;;AAAA,0BAAmD;AACnD,8CAA8D;AAGvD,MAAM,iCAAiC,GAAG,CAC/C,OAAyB,EACzB,EAAE,CAAC;IACH,4DAA4D,IAAA,oCAA0B,EACpF,OAAO,EACP,iCAA6B,CAC9B,IAAI;CACN,CAAC;AAPW,QAAA,iCAAiC,qCAO5C"}

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

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServiceName = void 0;
-var getServiceName = function (context) {
-    return context.environment.fullName.toLowerCase();
-};
+const getServiceName = (context) => context.environment.fullName.toLowerCase();
 exports.getServiceName = getServiceName;
 //# sourceMappingURL=getServiceName.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":";;;AACO,IAAM,cAAc,GAAG,UAAC,OAAyB;IACtD,OAAA,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE;AAA1C,CAA0C,CAAC;AADhC,QAAA,cAAc,kBACkB"}
+{"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":";;;AACO,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC1D,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;AADhC,QAAA,cAAc,kBACkB"}

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

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCloudRunJobName = void 0;
-var getCloudRunJobName = function (fullAppName, jobName) {
-    return fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());
-};
+const getCloudRunJobName = (fullAppName, jobName) => fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());
 exports.getCloudRunJobName = getCloudRunJobName;
 //# sourceMappingURL=jobName.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"jobName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/jobName.ts"],"names":[],"mappings":";;;AAEO,IAAM,kBAAkB,GAAG,UAChC,WAAmC,EACnC,OAAe;IAEf,OAAA,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;AAA7D,CAA6D,CAAC;AAJnD,QAAA,kBAAkB,sBAIiC"}
+{"version":3,"file":"jobName.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/jobName.ts"],"names":[],"mappings":";;;AAEO,MAAM,kBAAkB,GAAG,CAChC,WAAmC,EACnC,OAAe,EACS,EAAE,CAC1B,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;AAJnD,QAAA,kBAAkB,sBAIiC"}

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

@@ -9,6 +9,6 @@ exports.removeFirstLinesFromCommandOutput = void 0;
  * @param removeFirstN how many lines to remove at the start of the command
  * @returns
  */
-var removeFirstLinesFromCommandOutput = function (cmd, removeFirstN) { return (removeFirstN === 0 ? cmd : "".concat(cmd, " | tail -n +").concat(removeFirstN + 1)); };
+const removeFirstLinesFromCommandOutput = (cmd, removeFirstN) => (removeFirstN === 0 ? cmd : `${cmd} | tail -n +${removeFirstN + 1}`);
 exports.removeFirstLinesFromCommandOutput = removeFirstLinesFromCommandOutput;
 //# sourceMappingURL=removeFirstLinesFromCommandOutput.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"removeFirstLinesFromCommandOutput.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACI,IAAM,iCAAiC,GAAG,UAC/C,GAAW,EACX,YAAoB,IACjB,OAAA,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAG,GAAG,yBAAe,YAAY,GAAG,CAAC,CAAE,CAAC,EAApE,CAAoE,CAAC;AAH7D,QAAA,iCAAiC,qCAG4B"}
+{"version":3,"file":"removeFirstLinesFromCommandOutput.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.ts"],"names":[],"mappings":";;;AAAA;;;;;;;GAOG;AACI,MAAM,iCAAiC,GAAG,CAC/C,GAAW,EACX,YAAoB,EACpB,EAAE,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,eAAe,YAAY,GAAG,CAAC,EAAE,CAAC,CAAC;AAH7D,QAAA,iCAAiC,qCAG4B"}

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFullDbName = void 0;
-var BashExpression_1 = require("../../bash/BashExpression");
-var getFullDbName = function (cloudSqlConfig, fullConfig, environmentSlugPrefix, componentName) {
+const BashExpression_1 = require("../../bash/BashExpression");
+const getFullDbName = (cloudSqlConfig, fullConfig, environmentSlugPrefix, componentName) => {
     var _a, _b;
     return (0, BashExpression_1.joinBashExpressions)([
-        (_a = cloudSqlConfig.dbNamePrefix) !== null && _a !== void 0 ? _a : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName),
+        (_a = cloudSqlConfig.dbNamePrefix) !== null && _a !== void 0 ? _a : `${fullConfig.customerName}-${fullConfig.appName}`,
         environmentSlugPrefix,
         (_b = cloudSqlConfig.dbBaseName) !== null && _b !== void 0 ? _b : componentName,
-    ].flatMap(function (part) { return (part ? [part] : []); }), "-");
+    ].flatMap((part) => (part ? [part] : [])), "-");
 };
 exports.getFullDbName = getFullDbName;
 //# sourceMappingURL=utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudSql/utils.ts"],"names":[],"mappings":";;;AAEA,4DAAgE;AAMzD,IAAM,aAAa,GAAG,UAC3B,cAEiD,EACjD,UAAyB,EACzB,qBAA6C,EAC7C,aAAqB;;IAErB,OAAO,IAAA,oCAAmB,EACxB;QACE,MAAA,cAAc,CAAC,YAAY,mCACzB,UAAG,UAAU,CAAC,YAAY,cAAI,UAAU,CAAC,OAAO,CAAE;QACpD,qBAAqB;QACrB,MAAA,cAAc,CAAC,UAAU,mCAAI,aAAa;KAC3C,CAAC,OAAO,CAAC,UAAC,IAAI,IAAK,OAAA,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAApB,CAAoB,CAAC,EACzC,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,aAAa,iBAiBxB"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudSql/utils.ts"],"names":[],"mappings":";;;AAEA,8DAAgE;AAMzD,MAAM,aAAa,GAAG,CAC3B,cAEiD,EACjD,UAAyB,EACzB,qBAA6C,EAC7C,aAAqB,EACrB,EAAE;;IACF,OAAO,IAAA,oCAAmB,EACxB;QACE,MAAA,cAAc,CAAC,YAAY,mCACzB,GAAG,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,OAAO,EAAE;QACpD,qBAAqB;QACrB,MAAA,cAAc,CAAC,UAAU,mCAAI,aAAa;KAC3C,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EACzC,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,aAAa,iBAiBxB"}

package/dist/pipeline/src/deploy/custom/deployJob.js

@@ -1,64 +1,47 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCustomDeployJobs = void 0;
-var yarn_1 = require("../../build/node/yarn");
-var runner_1 = require("../../runner");
-var base_1 = require("../base");
-var sbom_1 = require("../sbom");
-var types_1 = require("../types");
-var createCustomDeployJobs = function (context) {
-    var _a, _b, _c, _d;
-    var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+const getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfigsFromConfig");
+const yarn_1 = require("../../build/node/yarn");
+const runner_1 = require("../../runner");
+const base_1 = require("../base");
+const sbom_1 = require("../sbom");
+const types_1 = require("../types");
+const createCustomDeployJobs = (context) => {
+    var _a, _b, _c;
+    const 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.build, {
+    const yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
-    return (0, base_1.createDeployementJobs)(context, {
+    const result = (0, base_1.createDeployementJobs)(context, {
         deploy: {
             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),
+            cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
+            script: [
+                `cd ${context.build.dir}`,
+                ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
+                ...deployConfig.script,
+                ...(0, sbom_1.getDependencyTrackUploadScript)(context),
+            ],
             variables: {},
         },
         stop: deployConfig.stopScript
             ? {
-                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),
+                image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
+                script: [
+                    ...deployConfig.stopScript,
+                    ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
+                ],
                 variables: {},
             }
             : undefined,
     });
+    return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
 //# sourceMappingURL=deployJob.js.map

package/dist/pipeline/src/deploy/custom/deployJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuD;AACvD,uCAA8C;AAG9C,gCAAgD;AAChD,gCAGiB;AACjB,kCAA0C;AAEnC,IAAM,sBAAsB,GAAG,UACpC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,EAAE;QAChD,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IACH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,EAAE;YAClC,MAAM;gBACJ,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;sBACtB,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,kBACrD,YAAY,CAAC,MAAM,kBACnB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,yCACD,YAAY,CAAC,UAAU,kBACvB,IAAA,qCAA8B,EAAC,OAAO,CAAC,SAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
+{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,gDAAuD;AACvD,yCAA8C;AAG9C,kCAAgD;AAChD,kCAGiB;AACjB,oCAA0C;AAEnC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACT,EAAE;;IAClB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE;QAC1C,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAAC,OAAO,EAAE;QAC5C,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,YAAY,CAAC,MAAM;gBACtB,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;aAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,EAAE;oBACN,GAAG,YAAY,CAAC,UAAU;oBAC1B,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;iBAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC"}

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

@@ -1,2 +1,2 @@
-import type { DeployTypeDefinition } from "..";
-export declare const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<"custom">;
+import type { DeployConfigCustom, DeployTypeDefinition } from "..";
+export declare const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCustom>;

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CUSTOM_DEPLOY_TYPE = void 0;
-var deployJob_1 = require("./deployJob");
+const deployJob_1 = require("./deployJob");
 exports.CUSTOM_DEPLOY_TYPE = {
     jobs: deployJob_1.createCustomDeployJobs,
-    defaults: function () { return ({}); },
-    additionalSecretKeys: function () { return []; },
-    getAdditionalEnvVars: function () { return ({}); },
+    defaults: () => ({}),
+    additionalSecretKeys: () => [],
+    getAdditionalEnvVars: () => ({}),
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/index.ts"],"names":[],"mappings":";;;AACA,yCAAqD;AAExC,QAAA,kBAAkB,GAAmC;IAChE,IAAI,EAAE,kCAAsB;IAC5B,QAAQ,EAAE,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI;IACpB,oBAAoB,EAAE,cAAM,OAAA,EAAE,EAAF,CAAE;IAC9B,oBAAoB,EAAE,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI;CACjC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/index.ts"],"names":[],"mappings":";;;AACA,2CAAqD;AAExC,QAAA,kBAAkB,GAA6C;IAC1E,IAAI,EAAE,kCAAsB;IAC5B,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACpB,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;IAC9B,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;CACjC,CAAC"}

package/dist/pipeline/src/deploy/dockerTag/deployJob.js

@@ -1,60 +1,28 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDockerTagDeployJobs = void 0;
-var docker_1 = require("../../build/docker");
-var base_1 = require("../base");
-var types_1 = require("../types");
-var createDockerTagDeployJobs = function (context) {
+const docker_1 = require("../../build/docker");
+const base_1 = require("../base");
+const types_1 = require("../types");
+const createDockerTagDeployJobs = (context) => {
     var _a;
-    var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    const 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;
+    const tag = deployConfig.tag;
     return (0, base_1.createDeployementJobs)(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) }),
+        deploy: {
+            ...(0, docker_1.getDockerJobBaseProps)(),
+            script: [
+                ...(0, docker_1.gitlabDockerLogin)(context),
+                `docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG`,
+                `docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:${tag}`,
+                `docker push $DOCKER_IMAGE:${tag}`,
+                `echo "pushed as $DOCKER_IMAGE:${tag}"`,
+            ],
+        },
     });
 };
 exports.createDockerTagDeployJobs = createDockerTagDeployJobs;

package/dist/pipeline/src/deploy/dockerTag/deployJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/deployJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8E;AAI9E,gCAAgD;AAChD,kCAA0C;AAEnC,IAAM,yBAAyB,GAAG,UACvC,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC;QAC/C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,IAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAC7B,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,wBACD,IAAA,8BAAqB,GAAE,KAC1B,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,6CAA6C;gBAC7C,mEAA4D,GAAG,CAAE;gBACjE,oCAA6B,GAAG,CAAE;gBAClC,yCAAiC,GAAG,OAAG;wBAE1C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,yBAAyB,6BAqBpC"}
+{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/deployJob.ts"],"names":[],"mappings":";;;AAAA,+CAA8E;AAI9E,kCAAgD;AAChD,oCAA0C;AAEnC,MAAM,yBAAyB,GAAG,CACvC,OAAyB,EACT,EAAE;;IAClB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,WAAW,CAAC,EAAE,CAAC;QAC/C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;IAC7B,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,GAAG,IAAA,8BAAqB,GAAE;YAC1B,MAAM,EAAE;gBACN,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,6CAA6C;gBAC7C,4DAA4D,GAAG,EAAE;gBACjE,6BAA6B,GAAG,EAAE;gBAClC,iCAAiC,GAAG,GAAG;aACxC;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,yBAAyB,6BAqBpC"}

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

@@ -1,2 +1,2 @@
-import type { DeployTypeDefinition } from "..";
-export declare const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<"dockerTag">;
+import type { DeployConfigDockerTag, DeployTypeDefinition } from "..";
+export declare const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigDockerTag>;

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DOCKER_TAG_DEPLOY_TYPE = void 0;
-var deployJob_1 = require("./deployJob");
+const deployJob_1 = require("./deployJob");
 exports.DOCKER_TAG_DEPLOY_TYPE = {
     jobs: deployJob_1.createDockerTagDeployJobs,
-    defaults: function () { return ({}); },
-    additionalSecretKeys: function () { return []; },
-    getAdditionalEnvVars: function () { return ({}); },
+    defaults: () => ({}),
+    additionalSecretKeys: () => [],
+    getAdditionalEnvVars: () => ({}),
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/index.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AAE3C,QAAA,sBAAsB,GAAsC;IACvE,IAAI,EAAE,qCAAyB;IAC/B,QAAQ,EAAE,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI;IACpB,oBAAoB,EAAE,cAAM,OAAA,EAAE,EAAF,CAAE;IAC9B,oBAAoB,EAAE,cAAM,OAAA,CAAC,EAAE,CAAC,EAAJ,CAAI;CACjC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/dockerTag/index.ts"],"names":[],"mappings":";;;AACA,2CAAwD;AAE3C,QAAA,sBAAsB,GACjC;IACE,IAAI,EAAE,qCAAyB;IAC/B,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACpB,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;IAC9B,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;CACjC,CAAC"}

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

@@ -1,21 +1,21 @@
-import type { SecretEnvVar } from "..";
+import type { BuildConfig, SecretEnvVar } from "..";
 import type { BashExpression } from "../bash/BashExpression";
 import type { ComponentContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { PartialDeep } from "../types/utils";
-import type { DeployConfigGeneric, DeployConfigType } from "./types";
+import type { DeployConfig, DeployConfigGeneric, DeployConfigType } from "./types";
 export * from "./cloudRun";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
-export type DeployTypeDefinition<T extends DeployConfigType> = {
+export type DeployTypeDefinition<D extends DeployConfig> = {
     jobs: (context: ComponentContext) => CatladderJob[];
-    defaults: (envContext: EnvironmentContext<any, T>) => PartialDeep<DeployConfigGeneric<T>>;
-    additionalSecretKeys: (envContext: EnvironmentContext<any, T>) => SecretEnvVar[];
-    getAdditionalEnvVars: (envContext: EnvironmentContext<any, T>) => Record<string, string | BashExpression | undefined | null>;
+    defaults: (envContext: EnvironmentContext<BuildConfig, D>) => PartialDeep<D>;
+    additionalSecretKeys: (envContext: EnvironmentContext<BuildConfig, D>) => SecretEnvVar[];
+    getAdditionalEnvVars: (envContext: EnvironmentContext<BuildConfig, D>) => Record<string, string | BashExpression | undefined | null>;
 };
 export type DeployTypes = {
-    [T in DeployConfigType]: DeployTypeDefinition<T>;
+    [T in DeployConfigType]: DeployTypeDefinition<DeployConfigGeneric<T>>;
 };
 export declare const DEPLOY_TYPES: DeployTypes;

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

@@ -15,10 +15,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEPLOY_TYPES = void 0;
-var cloudRun_1 = require("./cloudRun");
-var custom_1 = require("./custom");
-var dockerTag_1 = require("./dockerTag");
-var kubernetes_1 = require("./kubernetes");
+const cloudRun_1 = require("./cloudRun");
+const custom_1 = require("./custom");
+const dockerTag_1 = require("./dockerTag");
+const kubernetes_1 = require("./kubernetes");
 __exportStar(require("./cloudRun"), exports);
 __exportStar(require("./kubernetes"), exports);
 __exportStar(require("./types"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAMA,uCAAoD;AACpD,mCAA8C;AAC9C,yCAAqD;AACrD,2CAAsD;AAEtD,6CAA2B;AAC3B,+CAA6B;AAC7B,0CAAwB;AACxB,0CAAwB;AAkBX,QAAA,YAAY,GAAgB;IACvC,UAAU,EAAE,mCAAsB;IAClC,MAAM,EAAE,2BAAkB;IAC1B,SAAS,EAAE,kCAAsB;IACjC,iBAAiB,EAAE,iCAAsB;CAC1C,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/deploy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAMA,yCAAoD;AACpD,qCAA8C;AAC9C,2CAAqD;AACrD,6CAAsD;AAMtD,6CAA2B;AAC3B,+CAA6B;AAC7B,0CAAwB;AACxB,0CAAwB;AAgBX,QAAA,YAAY,GAAgB;IACvC,UAAU,EAAE,mCAAsB;IAClC,MAAM,EAAE,2BAAkB;IAC1B,SAAS,EAAE,kCAAsB;IACjC,iBAAiB,EAAE,iCAAsB;CAC1C,CAAC"}

package/dist/pipeline/src/deploy/kubernetes/additionalSecretKeys.d.ts

@@ -1,4 +1,6 @@
+import type { BuildConfig } from "../../build";
 import type { EnvironmentContext } from "../../types/environmentContext";
-export declare const additionalKubernetesSecretKeys: ({ deployConfigRaw, }: EnvironmentContext<any, "kubernetes">) => {
+import type { DeployConfigKubernetes } from "../types";
+export declare const additionalKubernetesSecretKeys: ({ deployConfigRaw, }: EnvironmentContext<BuildConfig, DeployConfigKubernetes>) => {
     key: any;
 }[];