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

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

@@ -1,64 +1,32 @@
 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
-var types_1 = require("../../types");
-var artifactsRegistry_1 = require("../artifactsRegistry");
-var gcloudCmd = function (version) {
-    return version ? "gcloud ".concat(version) : "gcloud";
+const types_1 = require("../../types");
+const artifactsRegistry_1 = require("../artifactsRegistry");
+const gcloudCmd = (version) => {
+    return version ? `gcloud ${version}` : "gcloud";
 };
 exports.gcloudCmd = gcloudCmd;
-var gcloudRunCmd = function (version) {
-    return "".concat((0, exports.gcloudCmd)(version), " run");
+const gcloudRunCmd = (version) => {
+    return `${(0, exports.gcloudCmd)(version)} run`;
 };
 exports.gcloudRunCmd = gcloudRunCmd;
-var gcloudSchedulerCmd = function (version) {
-    return "".concat((0, exports.gcloudCmd)(version), " scheduler");
+const gcloudSchedulerCmd = (version) => {
+    return `${(0, exports.gcloudCmd)(version)} scheduler`;
 };
 exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
-var setGoogleProjectNumberScript = function (deployConfig) { return [
-    "export GCLOUD_PROJECT_NUMBER=$(".concat((0, exports.gcloudCmd)(), " projects describe ").concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"),
-    "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\"",
-]; };
+const setGoogleProjectNumberScript = (deployConfig) => [
+    `export GCLOUD_PROJECT_NUMBER=$(${(0, exports.gcloudCmd)()} projects describe ${deployConfig.projectId} --format="value(projectNumber)")`,
+    'echo "GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER"',
+];
 exports.setGoogleProjectNumberScript = setGoogleProjectNumberScript;
-var makeLabelString = function (obj) {
-    return Object.entries(obj)
-        .map(function (_a) {
-        var _b = __read(_a, 2), key = _b[0], value = _b[1];
-        return "".concat(key, "=").concat(value);
-    })
-        .join(",");
-};
+const makeLabelString = (obj) => Object.entries(obj)
+    .map(([key, value]) => `${key}=${value}`)
+    .join(",");
 exports.makeLabelString = makeLabelString;
-var getCloudRunDeployConfig = function (context) {
+const getCloudRunDeployConfig = (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, "google-cloudrun")) {
         // should not happen
         throw new Error("deploy config is wrong");
@@ -67,7 +35,7 @@ var getCloudRunDeployConfig = function (context) {
 };
 exports.getCloudRunDeployConfig = getCloudRunDeployConfig;
 function getCommonCloudRunArgs(context) {
-    var deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+    const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
     return {
         project: deployConfig.projectId,
         region: deployConfig.region,
@@ -75,11 +43,15 @@ function getCommonCloudRunArgs(context) {
 }
 exports.getCommonCloudRunArgs = getCommonCloudRunArgs;
 function getCommonDeployArgs(context) {
-    var commonArgs = getCommonCloudRunArgs(context);
-    var deployConfig = (0, exports.getCloudRunDeployConfig)(context);
-    return __assign(__assign({ image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context) }, commonArgs), { "set-cloudsql-instances": deployConfig.cloudSql
+    const commonArgs = getCommonCloudRunArgs(context);
+    const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+    return {
+        image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context),
+        ...commonArgs,
+        "set-cloudsql-instances": deployConfig.cloudSql
             ? deployConfig.cloudSql.instanceConnectionName
-            : undefined });
+            : undefined,
+    };
 }
 exports.getCommonDeployArgs = getCommonDeployArgs;
 //# sourceMappingURL=common.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAA6C;AAE7C,0DAAiE;AAE1D,IAAM,SAAS,GAAG,UAAC,OAAgB;IACxC,OAAO,OAAO,CAAC,CAAC,CAAC,iBAAU,OAAO,CAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,IAAM,YAAY,GAAG,UAAC,OAAgB;IAC3C,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,SAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,IAAM,kBAAkB,GAAG,UAAC,OAAgB;IACjD,OAAO,UAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,eAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,IAAM,4BAA4B,GAAG,UAC1C,YAAkC,IAC/B,OAAA;IACH,yCAAkC,IAAA,iBAAS,GAAE,gCAC3C,YAAY,CAAC,SAAS,wCACW;IACnC,wDAAsD;CACvD,EALI,CAKJ,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,IAAM,eAAe,GAAG,UAAC,GAA4B;IAC1D,OAAA,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,GAAG,CAAC,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,CAAE;IAAjB,CAAiB,CAAC;SACxC,IAAI,CAAC,GAAG,CAAC;AAFZ,CAEY,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,IAAM,uBAAuB,GAAG,UAAC,OAAgB;;IACtD,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEF,SAAgB,qBAAqB,CAAC,OAAgB;IACpD,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,OAAgB;IAClD,IAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,2BACE,KAAK,EAAE,IAAA,6CAAyB,EAAC,OAAO,CAAC,IACtC,UAAU,KACb,wBAAwB,EAAE,YAAY,CAAC,QAAQ;YAC7C,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB;YAC9C,CAAC,CAAC,SAAS,IACb;AACJ,CAAC;AAVD,kDAUC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/common.ts"],"names":[],"mappings":";;;AAEA,uCAA6C;AAE7C,4DAAiE;AAE1D,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC5C,OAAO,OAAO,CAAC,CAAC,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClD,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AACK,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC/C,OAAO,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,MAAM,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACrD,OAAO,GAAG,IAAA,iBAAS,EAAC,OAAO,CAAC,YAAY,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,MAAM,4BAA4B,GAAG,CAC1C,YAAkC,EAClC,EAAE,CAAC;IACH,kCAAkC,IAAA,iBAAS,GAAE,sBAC3C,YAAY,CAAC,SACf,mCAAmC;IACnC,sDAAsD;CACvD,CAAC;AAPW,QAAA,4BAA4B,gCAOvC;AAEK,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAE,EAAE,CAC9D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;KAChB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;KACxC,IAAI,CAAC,GAAG,CAAC,CAAC;AAHF,QAAA,eAAe,mBAGb;AAER,MAAM,uBAAuB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACnE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAEF,SAAgB,qBAAqB,CAAC,OAAyB;IAC7D,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC;AAND,sDAMC;AAED,SAAgB,mBAAmB,CAAC,OAAyB;IAC3D,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,IAAA,+BAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,KAAK,EAAE,IAAA,6CAAyB,EAAC,OAAO,CAAC;QACzC,GAAG,UAAU;QACb,wBAAwB,EAAE,YAAY,CAAC,QAAQ;YAC7C,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,sBAAsB;YAC9C,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC;AAVD,kDAUC"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js

@@ -1,55 +1,44 @@
 "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.getCloudRunDeployScripts = void 0;
-var lodash_1 = require("lodash");
-var gitlab_1 = require("../../../utils/gitlab");
-var sbom_1 = require("../../sbom");
-var cleanup_1 = require("../cleanup");
-var database_1 = require("../utils/database");
-var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
-var cloudRunJobs_1 = require("./cloudRunJobs");
-var cloudRunServices_1 = require("./cloudRunServices");
-var common_1 = require("./common");
-var __1 = require("..");
-var constants_1 = require("./constants");
-var bashYaml_1 = require("../../../bash/bashYaml");
+const lodash_1 = require("lodash");
+const gitlab_1 = require("../../../utils/gitlab");
+const sbom_1 = require("../../sbom");
+const cleanup_1 = require("../cleanup");
+const database_1 = require("../utils/database");
+const gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
+const cloudRunJobs_1 = require("./cloudRunJobs");
+const cloudRunServices_1 = require("./cloudRunServices");
+const common_1 = require("./common");
+const __1 = require("..");
+const constants_1 = require("./constants");
+const bashYaml_1 = require("../../../bash/bashYaml");
 function getCloudRunDeployScripts(context) {
     var _a;
-    var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-    return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((deployConfig.cloudSql
-        ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
-        : [])), false), __read((0, cloudRunJobs_1.getCreateScheduleScripts)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy")), false), __read((deployConfig.service !== false
-        ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)]
-        : [])), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
-        var _b = __read(_a, 2), name = _b[0], service = _b[1];
-        return (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name);
-    })), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    const allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+    return [
+        ...(0, gitlab_1.collapseableSection)("prepare", "Prepare...")([
+            ...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context),
+            ...(0, common_1.setGoogleProjectNumberScript)(deployConfig),
+        ]),
+        ...(0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME)),
+        ...(0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")([
+            ...(deployConfig.cloudSql
+                ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+                : []),
+            ...(0, cloudRunJobs_1.getCreateScheduleScripts)(context),
+            ...(0, cloudRunJobs_1.getJobCreateScripts)(context),
+            ...(0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy"),
+            ...(deployConfig.service !== false
+                ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)]
+                : []),
+            ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(([name, service]) => (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name)),
+            ...(0, cloudRunJobs_1.getJobRunScripts)(context, "postDeploy"),
+        ]),
+        ...(0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy")),
+        ...(0, sbom_1.getDependencyTrackUploadScript)(context),
+    ];
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;
 //# sourceMappingURL=getCloudRunDeployScripts.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAqC;AAKrC,gDAA4D;AAC5D,mCAA4D;AAE5D,sCAAmE;AACnE,8CAA4D;AAC5D,gGAA+F;AAC/F,+CAIwB;AACxB,uDAA4D;AAC5D,mCAGkB;AAClB,wBAAmD;AAGnD,yCAAgD;AAChD,mDAGgC;AAEhC,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,IAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,IAAM,UAAU,GAAG,IAAA,aAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,wFACK,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,wCACI,IAAA,qEAAiC,EAAC,OAAO,CAAC,kBAC1C,IAAA,qCAA4B,EAAC,YAAY,CAAC,UAC7C,kBACC,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC,kBAExD,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,8GACI,CAAC,YAAY,CAAC,QAAQ;QACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;QAC9G,CAAC,CAAC,EAAE,CAAC,kBACJ,IAAA,uCAAwB,EAAC,OAAO,CAAC,kBACjC,IAAA,kCAAmB,EAAC,OAAO,CAAC,kBAC5B,IAAA,+BAAgB,EAAC,OAAO,EAAE,WAAW,CAAC,kBAEtC,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;QAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC,CAAC,EAAE,CAAC,kBACJ,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,GAAG,CAC1D,UAAC,EAAe;YAAf,KAAA,aAAe,EAAd,IAAI,QAAA,EAAE,OAAO,QAAA;QACb,OAAA,IAAA,yCAAsB,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IAApD,CAAoD,CACvD,kBACE,IAAA,+BAAgB,EAAC,OAAO,EAAE,YAAY,CAAC,UAC1C,kBACC,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D,kBACE,IAAA,qCAA8B,EAAC,OAAO,CAAC,UAC1C;AACJ,CAAC;AAhDD,4DAgDC"}
+{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAKrC,kDAA4D;AAC5D,qCAA4D;AAE5D,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAIwB;AACxB,yDAA4D;AAC5D,qCAGkB;AAClB,0BAAmD;AAGnD,2CAAgD;AAChD,qDAGgC;AAEhC,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,aAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,OAAO;QACL,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,CAAC;YACA,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;YAC7C,GAAG,IAAA,qCAA4B,EAAC,YAAY,CAAC;SAC9C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC;QAE3D,GAAG,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACA,GAAG,CAAC,YAAY,CAAC,QAAQ;gBACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;gBAC9G,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,IAAA,uCAAwB,EAAC,OAAO,CAAC;YACpC,GAAG,IAAA,kCAAmB,EAAC,OAAO,CAAC;YAC/B,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,WAAW,CAAC;YAEzC,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;gBAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;gBACzD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,GAAG,CAC1D,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAClB,IAAA,yCAAsB,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC,CACvD;YACD,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,YAAY,CAAC;SAC3C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D;QACD,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AAhDD,4DAgDC"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.js

@@ -1,47 +1,30 @@
 "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.getCloudRunStopScripts = void 0;
-var sbom_1 = require("../../sbom");
-var cleanup_1 = require("../cleanup");
-var database_1 = require("../utils/database");
-var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
-var cloudRunJobs_1 = require("./cloudRunJobs");
-var cloudRunServices_1 = require("./cloudRunServices");
-var common_1 = require("./common");
+const sbom_1 = require("../../sbom");
+const cleanup_1 = require("../cleanup");
+const database_1 = require("../utils/database");
+const gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
+const cloudRunJobs_1 = require("./cloudRunJobs");
+const cloudRunServices_1 = require("./cloudRunServices");
+const common_1 = require("./common");
 function getCloudRunStopScripts(context) {
     var _a;
-    var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preStop")), false), __read((deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : [])), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).flatMap(function (_a) {
-        var _b = __read(_a, 1), name = _b[0];
-        return (0, cloudRunServices_1.getServiceDeleteScript)(context, name);
-    })), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "postStop")), false), __read((0, cloudRunJobs_1.getDeleteSchedulesScripts)(context)), false), __read((0, cloudRunJobs_1.getDeleteJobsScripts)(context)), false), __read((deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop
-        ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig)
-        : [])), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    return [
+        ...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context),
+        ...(0, cloudRunJobs_1.getJobRunScripts)(context, "preStop"),
+        ...(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []),
+        ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).flatMap(([name]) => (0, cloudRunServices_1.getServiceDeleteScript)(context, name)),
+        ...(0, cloudRunJobs_1.getJobRunScripts)(context, "postStop"),
+        ...(0, cloudRunJobs_1.getDeleteSchedulesScripts)(context),
+        ...(0, cloudRunJobs_1.getDeleteJobsScripts)(context),
+        ...(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop
+            ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig)
+            : []),
+        ...(0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop"), // we cleanup inactive images both on deploy and stop
+        ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
+    ];
 }
 exports.getCloudRunStopScripts = getCloudRunStopScripts;
 //# sourceMappingURL=getCloudRunStopScripts.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA4D;AAE5D,sCAAmE;AACnE,8CAA4D;AAC5D,gGAA+F;AAC/F,+CAIwB;AACxB,uDAA4D;AAC5D,mCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,OAAyB;;IAC9D,IAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,8JACK,IAAA,qEAAiC,EAAC,OAAO,CAAC,kBAC1C,IAAA,+BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC,kBACpC,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBACvE,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,IAAI,QAAA;QACrE,OAAA,IAAA,yCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC;IAArC,CAAqC,CACtC,kBACE,IAAA,+BAAgB,EAAC,OAAO,EAAE,UAAU,CAAC,kBACrC,IAAA,wCAAyB,EAAC,OAAO,CAAC,kBAClC,IAAA,mCAAoB,EAAC,OAAO,CAAC,kBAC7B,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB;QACrE,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC;QAChD,CAAC,CAAC,EAAE,CAAC,kBAEJ,IAAA,+CAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,kBACxD,IAAA,qCAA8B,EAAC,OAAO,CAAC,UAC1C;AACJ,CAAC;AAnBD,wDAmBC"}
+{"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;AACA,qCAA4D;AAE5D,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAIwB;AACxB,yDAA4D;AAC5D,qCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,OAAyB;;IAC9D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;QAC7C,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC;QACvC,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAC1E,IAAA,yCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CACtC;QACD,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,UAAU,CAAC;QACxC,GAAG,IAAA,wCAAyB,EAAC,OAAO,CAAC;QACrC,GAAG,IAAA,mCAAoB,EAAC,OAAO,CAAC;QAChC,GAAG,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB;YACrE,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QAEP,GAAG,IAAA,+CAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,qDAAqD;QAClH,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AAnBD,wDAmBC"}

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

@@ -1,46 +1,40 @@
 "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.createGoogleCloudRunDeployJobs = void 0;
-var runner_1 = require("../../../runner");
-var gitlab_1 = require("../../../utils/gitlab");
-var base_1 = require("../../base");
-var types_1 = require("../../types");
-var constants_1 = require("./constants");
-var getCloudRunDeployScripts_1 = require("./getCloudRunDeployScripts");
-var getCloudRunStopScripts_1 = require("./getCloudRunStopScripts");
-var createGoogleCloudRunDeployJobs = function (context) {
+const runner_1 = require("../../../runner");
+const gitlab_1 = require("../../../utils/gitlab");
+const base_1 = require("../../base");
+const types_1 = require("../../types");
+const constants_1 = require("./constants");
+const getCloudRunDeployScripts_1 = require("./getCloudRunDeployScripts");
+const getCloudRunStopScripts_1 = require("./getCloudRunStopScripts");
+const createGoogleCloudRunDeployJobs = (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, "google-cloudrun")) {
         // should not happen
         throw new Error("deploy config is wrong");
     }
-    var deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
-    var stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
+    const deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
+    const stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
     return (0, base_1.createDeployementJobs)(context, {
-        deploy: __assign(__assign({ variables: {
+        deploy: {
+            variables: {
                 CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
-            } }, (deployConfig.debug
-            ? {
-                artifacts: {
-                    paths: [
-                        constants_1.ENV_VARS_FILENAME, // debug
-                    ],
-                    when: "always",
-                },
-            }
-            : {})), { image: (0, runner_1.getRunnerImage)("gcloud"), script: deployScripts }),
+            },
+            ...(deployConfig.debug
+                ? {
+                    artifacts: {
+                        paths: [
+                            constants_1.ENV_VARS_FILENAME, // debug
+                        ],
+                        when: "always",
+                    },
+                }
+                : {}),
+            image: (0, runner_1.getRunnerImage)("gcloud"),
+            script: deployScripts,
+        },
         stop: {
             image: (0, runner_1.getRunnerImage)("gcloud"),
             variables: {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0CAAiD;AAGjD,gDAA8D;AAC9D,mCAAmD;AAEnD,qCAA6C;AAC7C,yCAAgD;AAChD,uEAAsE;AACtE,mEAAkE;AAE3D,IAAM,8BAA8B,GAAG,UAC5C,OAAyB;;IAEzB,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAM,aAAa,GAAG,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC;IACxD,IAAM,WAAW,GAAG,IAAA,+CAAsB,EAAC,OAAO,CAAC,CAAC;IAEpD,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,sBACJ,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC,IACE,CAAC,YAAY,CAAC,KAAK;YACpB,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,6BAAiB,EAAE,QAAQ;qBAC5B;oBACD,IAAI,EAAE,QAAQ;iBACf;aACF;YACH,CAAC,CAAC,EAAE,CAAC,KAEP,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC,EAC/B,MAAM,EAAE,aAAa,GACtB;QACD,IAAI,EAAE;YACJ,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC;YAC/B,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC;YACD,MAAM,EAAE,IAAA,8BAAqB,EAAC,WAAW,CAAC;SAC3C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,8BAA8B,kCAuCzC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/index.ts"],"names":[],"mappings":";;;AAAA,4CAAiD;AAGjD,kDAA8D;AAC9D,qCAAmD;AAEnD,uCAA6C;AAC7C,2CAAgD;AAChD,yEAAsE;AACtE,qEAAkE;AAE3D,MAAM,8BAA8B,GAAG,CAC5C,OAAyB,EACT,EAAE;;IAClB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,mDAAwB,EAAC,OAAO,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,IAAA,+CAAsB,EAAC,OAAO,CAAC,CAAC;IAEpD,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC;YACD,GAAG,CAAC,YAAY,CAAC,KAAK;gBACpB,CAAC,CAAC;oBACE,SAAS,EAAE;wBACT,KAAK,EAAE;4BACL,6BAAiB,EAAE,QAAQ;yBAC5B;wBACD,IAAI,EAAE,QAAQ;qBACf;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;YAEP,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC;YAC/B,MAAM,EAAE,aAAa;SACtB;QACD,IAAI,EAAE;YACJ,KAAK,EAAE,IAAA,uBAAc,EAAC,QAAQ,CAAC;YAC/B,SAAS,EAAE;gBACT,6BAA6B,EAAE,GAAG;aACnC;YACD,MAAM,EAAE,IAAA,8BAAqB,EAAC,WAAW,CAAC;SAC3C;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,8BAA8B,kCAuCzC"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/volumes.js

@@ -1,44 +1,17 @@
 "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.createVolumeConfig = void 0;
-var createVolumeConfig = function (volumes, type) {
+const createVolumeConfig = (volumes, type) => {
     if (!volumes) {
         return [];
     }
-    return __spreadArray(__spreadArray([], __read(Object.entries(volumes).map(function (_a) {
-        var _b = __read(_a, 2), volumeName = _b[0], _c = _b[1], type = _c.type, bucket = _c.bucket, mountPath = _c.mountPath, readonly = _c.readonly;
-        return ({
-            "add-volume": "name=".concat(volumeName, ",type=").concat(type, ",bucket=").concat(bucket).concat(readonly ? ",readonly=true" : ""),
-            "add-volume-mount": "volume=".concat(volumeName, ",mount-path=").concat(mountPath),
-        });
-    })), false), [
+    return [
+        ...Object.entries(volumes).map(([volumeName, { type, bucket, mountPath, readonly }]) => ({
+            "add-volume": `name=${volumeName},type=${type},bucket=${bucket}${readonly ? ",readonly=true" : ""}`,
+            "add-volume-mount": `volume=${volumeName},mount-path=${mountPath}`,
+        })),
         type === "service" ? { "execution-environment": "gen2" } : {},
-    ], false);
+    ];
 };
 exports.createVolumeConfig = createVolumeConfig;
 //# sourceMappingURL=volumes.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/volumes.js.map

@@ -1 +1 @@
-{"version":3,"file":"volumes.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/volumes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGO,IAAM,kBAAkB,GAAG,UAChC,OAAgD,EAChD,IAAuB;IAEvB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,8CACK,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC5B,UAAC,EAAmD;YAAnD,KAAA,aAAmD,EAAlD,UAAU,QAAA,EAAE,UAAqC,EAAnC,IAAI,UAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA;QAAQ,OAAA,CAAC;YACxD,YAAY,EAAE,eAAQ,UAAU,mBAAS,IAAI,qBAAW,MAAM,SAC5D,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAChC;YACF,kBAAkB,EAAE,iBAAU,UAAU,yBAAe,SAAS,CAAE;SACnE,CAAC;IALuD,CAKvD,CACH;QACD,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;cAC7D;AACJ,CAAC,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B"}
+{"version":3,"file":"volumes.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/volumes.ts"],"names":[],"mappings":";;;AAGO,MAAM,kBAAkB,GAAG,CAChC,OAAgD,EAChD,IAAuB,EACP,EAAE;IAClB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO;QACL,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC5B,CAAC,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACxD,YAAY,EAAE,QAAQ,UAAU,SAAS,IAAI,WAAW,MAAM,GAC5D,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAChC,EAAE;YACF,kBAAkB,EAAE,UAAU,UAAU,eAAe,SAAS,EAAE;SACnE,CAAC,CACH;QACD,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;KAC9D,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B"}

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

@@ -1,4 +1,4 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigCloudRun, DeployTypeDefinition } from "..";
 export declare const GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 export declare const GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
-export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun">;
+export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCloudRun>;

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

@@ -1,69 +1,29 @@
 "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.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
-var BashExpression_1 = require("../../bash/BashExpression");
-var context_1 = require("../../context");
-var gitlab_1 = require("../../utils/gitlab");
-var utils_1 = require("../cloudSql/utils");
-var createJobs_1 = require("./createJobs");
-var database_1 = require("./utils/database");
-var jobName_1 = require("./utils/jobName");
+const BashExpression_1 = require("../../bash/BashExpression");
+const context_1 = require("../../context");
+const gitlab_1 = require("../../utils/gitlab");
+const utils_1 = require("../cloudSql/utils");
+const createJobs_1 = require("./createJobs");
+const database_1 = require("./utils/database");
+const jobName_1 = require("./utils/jobName");
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 // FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
-var getCloudSqlVariables = function (_a) {
-    var _b, _c;
-    var deployConfigRaw = _a.deployConfigRaw, environmentSlugPrefix = _a.environmentSlugPrefix, env = _a.env, componentName = _a.componentName, fullConfig = _a.fullConfig;
+const getCloudSqlVariables = ({ deployConfigRaw, environmentSlugPrefix, env, componentName, fullConfig, }) => {
+    var _a, _b;
     if (deployConfigRaw && deployConfigRaw.cloudSql) {
-        var DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
-        var additionalQueryParamsString = Object.entries((_b = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _b !== void 0 ? _b : {})
-            .map(function (_a) {
-            var _b = __read(_a, 2), key = _b[0], value = _b[1];
-            return "&".concat(key, "=").concat(value);
-        })
+        const DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
+        const additionalQueryParamsString = Object.entries((_a = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _a !== void 0 ? _a : {})
+            .map(([key, value]) => `&${key}=${value}`)
             .join("");
         return {
             CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
             DB_NAME: DB_NAME,
-            DB_USER: (_c = deployConfigRaw.cloudSql.dbUser) !== null && _c !== void 0 ? _c : "postgres",
+            DB_USER: (_b = deployConfigRaw.cloudSql.dbUser) !== null && _b !== void 0 ? _b : "postgres",
             DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
-            DATABASE_URL: "".concat((0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql)).concat(additionalQueryParamsString),
+            DATABASE_URL: `${(0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql)}${additionalQueryParamsString}`,
             DATABASE_JDBC_URL: database_1.DATABASE_JDBC_URL,
         };
     }
@@ -71,8 +31,7 @@ var getCloudSqlVariables = function (_a) {
 };
 exports.GCLOUD_RUN_DEPLOY_TYPE = {
     jobs: createJobs_1.createGoogleCloudRunDeployJobs,
-    defaults: function (_a) {
-        var deployConfigRaw = _a.deployConfigRaw, envType = _a.envType;
+    defaults: ({ deployConfigRaw, envType }) => {
         if (deployConfigRaw && deployConfigRaw.cloudSql) {
             return {
                 cloudSql: {
@@ -82,7 +41,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
         }
         return {};
     },
-    additionalSecretKeys: function (ctx) { return __spreadArray([
+    additionalSecretKeys: (ctx) => [
         {
             key: exports.GCLOUD_DEPLOY_CREDENTIALS_KEY,
             hidden: true,
@@ -90,30 +49,34 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
         {
             key: exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
             hidden: true,
-        }
-    ], __read((ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql
-        ? [{ key: "DB_PASSWORD" }]
-        : [])), false); },
-    getAdditionalEnvVars: function (ctx) {
-        var fullName = ctx.fullName, env = ctx.env, componentName = ctx.componentName, deployConfigRaw = ctx.deployConfigRaw;
-        var HOST_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
+        },
+        ...(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql
+            ? [{ key: "DB_PASSWORD" }]
+            : []),
+    ],
+    getAdditionalEnvVars: (ctx) => {
+        const { fullName, env, componentName, deployConfigRaw } = ctx;
+        const HOST_INTERNAL = (0, BashExpression_1.joinBashExpressions)([
             fullName,
             (0, BashExpression_1.getBashVariable)((0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)),
         ], "-").toLowerCase();
-        var jobTriggers = deployConfigRaw && deployConfigRaw.jobs
-            ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
-                var _b = __read(_a, 2), name = _b[0], job = _b[1];
-                return [
-                    "CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name),
-                    "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat((0, jobName_1.getCloudRunJobName)(fullName, name), ":run"),
-                ];
-            }))
+        const jobTriggers = deployConfigRaw && deployConfigRaw.jobs
+            ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(([name, job]) => [
+                "CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name),
+                `https://${deployConfigRaw.region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${deployConfigRaw.projectId}/jobs/${(0, jobName_1.getCloudRunJobName)(fullName, name)}:run`,
+            ]))
             : {};
-        return __assign(__assign(__assign({ HOST_INTERNAL: HOST_INTERNAL }, getCloudSqlVariables(ctx)), jobTriggers), { DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw
+        return {
+            HOST_INTERNAL,
+            ...getCloudSqlVariables(ctx),
+            ...jobTriggers,
+            DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw
                 ? deployConfigRaw.projectId
-                : undefined, DEPLOY_CLOUD_RUN_REGION: deployConfigRaw
+                : undefined,
+            DEPLOY_CLOUD_RUN_REGION: deployConfigRaw
                 ? deployConfigRaw.region
-                : undefined });
+                : undefined,
+        };
     },
 };
 //# sourceMappingURL=index.js.map