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

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

@@ -1,99 +1,71 @@
 "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.getDeleteUnusedImagesCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryBuildCacheImage = exports.getArtifactsRegistryImageName = exports.getArtifactsRegistryDockerUrl = exports.getArtifactsRegistryHost = void 0;
-var BashExpression_1 = require("../../bash/BashExpression");
-var gitlab_1 = require("../../utils/gitlab");
-var types_1 = require("../types");
-var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
-var getArtifactsRegistryHost = function (context) {
+const BashExpression_1 = require("../../bash/BashExpression");
+const gitlab_1 = require("../../utils/gitlab");
+const types_1 = require("../types");
+const removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
+const getArtifactsRegistryHost = (context) => {
     var _a;
     if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) {
         // should not happen
         throw new Error("deploy config is wrong");
     }
-    return "".concat(context.deploy.config.region, "-docker.pkg.dev");
+    return `${context.deploy.config.region}-docker.pkg.dev`;
 };
 exports.getArtifactsRegistryHost = getArtifactsRegistryHost;
-var getArtifactsRegistryDockerUrl = function (context) {
+const getArtifactsRegistryDockerUrl = (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 fullAppName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
-    return "".concat((0, exports.getArtifactsRegistryHost)(context), "/").concat(deployConfig.projectId, "/catladder-deploy/").concat(fullAppName);
+    const fullAppName = `${context.fullConfig.customerName}-${context.fullConfig.appName}`;
+    return `${(0, exports.getArtifactsRegistryHost)(context)}/${deployConfig.projectId}/catladder-deploy/${fullAppName}`;
 };
 exports.getArtifactsRegistryDockerUrl = getArtifactsRegistryDockerUrl;
 /**
  *
  * lecacyReviewImageName is only temporary. In old versions the images had no reviewslug in review apps, which makes cleanup harder. We delete all those images now, but need the path
  */
-var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
-    if (lecacyReviewImageName === void 0) { lecacyReviewImageName = false; }
+const getArtifactsRegistryImageName = (context, lecacyReviewImageName = false) => {
     if (lecacyReviewImageName && context.environment.envType !== "review") {
         throw new Error("lecacyReviewImageName is only allowed for review app");
     }
-    var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
-    var gcloudImagePath = __spreadArray([
+    const dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
+    const gcloudImagePath = [
         dockerUrl,
-        context.environment.shortName,
-        context.componentName
-    ], __read((context.environment.reviewSlug && !lecacyReviewImageName
-        ? [context.environment.reviewSlug]
-        : [])), false);
+        context.env,
+        context.name,
+        ...(context.environment.reviewSlug && !lecacyReviewImageName
+            ? [context.environment.reviewSlug]
+            : []),
+    ];
     return (0, BashExpression_1.joinBashExpressions)(gcloudImagePath, "/");
 };
 exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
-var getArtifactsRegistryBuildCacheImage = function (context) {
-    var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
+const getArtifactsRegistryBuildCacheImage = (context) => {
+    const dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
     // does not include env, so that after merge, you might get more cache hits (review-->dev)
-    var gcloudImagePath = [dockerUrl, "caches", context.componentName];
+    const gcloudImagePath = [dockerUrl, "caches", context.name];
     return gcloudImagePath.join("/");
 };
 exports.getArtifactsRegistryBuildCacheImage = getArtifactsRegistryBuildCacheImage;
-var getArtifactsRegistryImage = function (context) {
-    return "".concat((0, exports.getArtifactsRegistryImageName)(context), ":$DOCKER_IMAGE_TAG");
-};
+const getArtifactsRegistryImage = (context) => `${(0, exports.getArtifactsRegistryImageName)(context)}:$DOCKER_IMAGE_TAG`;
 exports.getArtifactsRegistryImage = getArtifactsRegistryImage;
-var getDeleteImageCommands = function (fullImageName, keepNewest) {
-    if (keepNewest === void 0) { keepNewest = 0; }
+const getDeleteImageCommands = (fullImageName, keepNewest = 0) => {
     if (keepNewest === 0) {
         // no need to list tags, we delete the whole thing
         return [
-            "gcloud artifacts docker images delete ".concat(fullImageName, " --quiet --delete-tags"),
+            `gcloud artifacts docker images delete ${fullImageName} --quiet --delete-tags`,
         ];
     }
     // delete unused tags
-    var listAllImagesCommand = "gcloud artifacts docker images list ".concat(fullImageName, " --sort-by=~CREATE_TIME --format=\"value(version)\"");
-    var listImagesToDeletecommand = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllImagesCommand, keepNewest);
-    var deleteImageCommand = "gcloud artifacts docker images delete ".concat(fullImageName, "@$version --quiet --delete-tags");
-    var deleteImagesCommand = "".concat(listImagesToDeletecommand, " | while read -r version; do ").concat(deleteImageCommand, "; done");
+    const listAllImagesCommand = `gcloud artifacts docker images list ${fullImageName} --sort-by=~CREATE_TIME --format="value(version)"`;
+    const listImagesToDeletecommand = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllImagesCommand, keepNewest);
+    const deleteImageCommand = `gcloud artifacts docker images delete ${fullImageName}@$version --quiet --delete-tags`;
+    const deleteImagesCommand = `${listImagesToDeletecommand} | while read -r version; do ${deleteImageCommand}; done`;
     return [deleteImagesCommand];
 };
 /**
@@ -103,19 +75,24 @@ var getDeleteImageCommands = function (fullImageName, keepNewest) {
  * @param keep how many of the newest images to keep
  * @returns
  */
-var getDeleteUnusedImagesCommands = function (context, keep) {
+const getDeleteUnusedImagesCommands = (context, keep = 0) => {
     var _a;
-    if (keep === void 0) { keep = 0; }
-    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 fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
-    var buildCacheImageName = (0, exports.getArtifactsRegistryBuildCacheImage)(context);
-    return __spreadArray(__spreadArray(__spreadArray([], __read(getDeleteImageCommands(fullImageName, keep)), false), __read(getDeleteImageCommands(buildCacheImageName, 1)), false), __read((context.environment.envType === "review"
-        ? (0, gitlab_1.allowFailureInScripts)(getDeleteImageCommands((0, exports.getArtifactsRegistryImageName)(context, true), 0))
-        : [])), false);
+    const fullImageName = (0, exports.getArtifactsRegistryImageName)(context);
+    const buildCacheImageName = (0, exports.getArtifactsRegistryBuildCacheImage)(context);
+    return [
+        ...getDeleteImageCommands(fullImageName, keep),
+        ...getDeleteImageCommands(buildCacheImageName, 1),
+        // because a recent version of catladder had no review-slug in the image name, we have to delete those as well
+        // we can later remove this line in some months
+        ...(context.environment.envType === "review"
+            ? (0, gitlab_1.allowFailureInScripts)(getDeleteImageCommands((0, exports.getArtifactsRegistryImageName)(context, true), 0))
+            : []),
+    ];
 };
 exports.getDeleteUnusedImagesCommands = getDeleteUnusedImagesCommands;
 //# sourceMappingURL=artifactsRegistry.js.map

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

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

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

@@ -1,45 +1,20 @@
 "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.getRemoveOldRevisionsAndImagesCommand = void 0;
-var artifactsRegistry_1 = require("./artifactsRegistry");
-var cloudRunRevisions_1 = require("./cloudRunRevisions");
-var getRemoveOldRevisionsAndImagesCommand = function (context, when) {
+const artifactsRegistry_1 = require("./artifactsRegistry");
+const cloudRunRevisions_1 = require("./cloudRunRevisions");
+const getRemoveOldRevisionsAndImagesCommand = (context, when) => {
     if (when === "onStop") {
         // service is already deleted, so we don't need to delete old revisions, just delete all images
         return (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context);
     }
     // this number only targets inactive revisions
-    var revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
+    const revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
     // this number needs to be higher than inactive after deploy, so we add one
-    var imagesToKeep = revisionsToKeep + 1;
-    var deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);
-    var deleteOldImagesCommands = (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context, imagesToKeep);
-    return __spreadArray(__spreadArray([], __read(deleteOldRevisionsCommands), false), __read(deleteOldImagesCommands), false);
+    const imagesToKeep = revisionsToKeep + 1;
+    const deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);
+    const deleteOldImagesCommands = (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context, imagesToKeep);
+    return [...deleteOldRevisionsCommands, ...deleteOldImagesCommands];
 };
 exports.getRemoveOldRevisionsAndImagesCommand = getRemoveOldRevisionsAndImagesCommand;
 //# sourceMappingURL=cleanup.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cleanup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yDAAoE;AACpE,yDAAuE;AAEhE,IAAM,qCAAqC,GAAG,UACnD,OAAyB,EACzB,IAA6B;IAE7B,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,+FAA+F;QAC/F,OAAO,IAAA,iDAA6B,EAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,8CAA8C;IAC9C,IAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,2EAA2E;IAC3E,IAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;IAEzC,IAAM,0BAA0B,GAAG,IAAA,oDAAgC,EACjE,OAAO,EACP,eAAe,CAChB,CAAC;IACF,IAAM,uBAAuB,GAAG,IAAA,iDAA6B,EAC3D,OAAO,EACP,YAAY,CACb,CAAC;IAEF,8CAAW,0BAA0B,kBAAK,uBAAuB,UAAE;AACrE,CAAC,CAAC;AAzBW,QAAA,qCAAqC,yCAyBhD"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cleanup.ts"],"names":[],"mappings":";;;AACA,2DAAoE;AACpE,2DAAuE;AAEhE,MAAM,qCAAqC,GAAG,CACnD,OAAyB,EACzB,IAA6B,EAC7B,EAAE;IACF,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,+FAA+F;QAC/F,OAAO,IAAA,iDAA6B,EAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,8CAA8C;IAC9C,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,2EAA2E;IAC3E,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;IAEzC,MAAM,0BAA0B,GAAG,IAAA,oDAAgC,EACjE,OAAO,EACP,eAAe,CAChB,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,iDAA6B,EAC3D,OAAO,EACP,YAAY,CACb,CAAC;IAEF,OAAO,CAAC,GAAG,0BAA0B,EAAE,GAAG,uBAAuB,CAAC,CAAC;AACrE,CAAC,CAAC;AAzBW,QAAA,qCAAqC,yCAyBhD"}

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

@@ -1,55 +1,50 @@
 "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.getDeleteUnusedRevisionsCommands = void 0;
-var types_1 = require("../types");
-var createArgsString_1 = require("./utils/createArgsString");
-var getServiceName_1 = require("./utils/getServiceName");
-var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
-var getListRevisionsCommand = function (context, args) {
+const types_1 = require("../types");
+const createArgsString_1 = require("./utils/createArgsString");
+const getServiceName_1 = require("./utils/getServiceName");
+const removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
+const getListRevisionsCommand = (context, args) => {
     var _a;
-    var serviceName = (0, getServiceName_1.getServiceName)(context);
-    var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    const serviceName = (0, getServiceName_1.getServiceName)(context);
+    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
         // should not happen
         throw new Error("deploy config is wrong");
     }
-    var filterRevisionArgs = __assign({ project: deployConfig.projectId, region: deployConfig.region, 
+    const filterRevisionArgs = {
+        project: deployConfig.projectId,
+        region: deployConfig.region,
         // only show inactive revisions
-        service: serviceName, limit: "unlimited", "sort-by": "metadata.creationTimestamp" }, args);
+        service: serviceName,
+        limit: "unlimited", // is actualy the default
+        "sort-by": "metadata.creationTimestamp",
+        ...args,
+    };
     // this prints out all inactive images of the given app
-    return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
+    return `gcloud run revisions list ${(0, createArgsString_1.createArgsString)(filterRevisionArgs)}`;
 };
-var getDeleteUnusedRevisionsCommands = function (context, keep) {
+const getDeleteUnusedRevisionsCommands = (context, keep) => {
     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");
     }
     // this prints out all inactive images of the given app
-    var listAllInactiveRevisionsCmd = getListRevisionsCommand(context, {
-        format: "\"value(name)\"",
-        filter: "'(status.conditions.status=False OR status.conditions.status=Unknown)'",
+    const listAllInactiveRevisionsCmd = getListRevisionsCommand(context, {
+        format: `"value(name)"`,
+        filter: `'(status.conditions.status=False OR status.conditions.status=Unknown)'`,
     });
     // this removes the newest `revisionsToKeep` images
-    var listRevisionsToDeleteCmd = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllInactiveRevisionsCmd, keep);
-    var deleteRevisionCmd = "gcloud run revisions delete ".concat((0, createArgsString_1.createArgsString)({
+    const listRevisionsToDeleteCmd = (0, removeFirstLinesFromCommandOutput_1.removeFirstLinesFromCommandOutput)(listAllInactiveRevisionsCmd, keep);
+    const deleteRevisionCmd = `gcloud run revisions delete ${(0, createArgsString_1.createArgsString)({
         project: deployConfig.projectId,
         region: deployConfig.region,
         quiet: true,
-    }), " $revisionname ");
-    var deleteRevisionsCmd = "".concat(listRevisionsToDeleteCmd, " | while read -r revisionname; do ").concat(deleteRevisionCmd, "; done");
+    })} $revisionname `;
+    const deleteRevisionsCmd = `${listRevisionsToDeleteCmd} | while read -r revisionname; do ${deleteRevisionCmd}; done`;
     return [deleteRevisionsCmd];
 };
 exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;

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

@@ -1 +1 @@
-{"version":3,"file":"cloudRunRevisions.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cloudRunRevisions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kCAA0C;AAC1C,6DAA4D;AAC5D,yDAAwD;AACxD,+FAA8F;AAE9F,IAAM,uBAAuB,GAAG,UAC9B,OAAyB,EACzB,IAGC;;IAED,IAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,YAAY,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACtE,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,IAAM,kBAAkB,cACtB,OAAO,EAAE,YAAY,CAAC,SAAS,EAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,+BAA+B;QAC/B,OAAO,EAAE,WAAW,EAEpB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,4BAA4B,IACpC,IAAI,CACR,CAAC;IAEF,uDAAuD;IACvD,OAAO,oCAA6B,IAAA,mCAAgB,EAAC,kBAAkB,CAAC,CAAE,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,OAAyB,EACzB,IAAY;;IAEZ,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,uDAAuD;IACvD,IAAM,2BAA2B,GAAG,uBAAuB,CAAC,OAAO,EAAE;QACnE,MAAM,EAAE,iBAAe;QACvB,MAAM,EAAE,wEAAwE;KACjF,CAAC,CAAC;IACH,mDAAmD;IACnD,IAAM,wBAAwB,GAAG,IAAA,qEAAiC,EAChE,2BAA2B,EAC3B,IAAI,CACL,CAAC;IACF,IAAM,iBAAiB,GAAG,sCAA+B,IAAA,mCAAgB,EAAC;QACxE,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,KAAK,EAAE,IAAI;KACZ,CAAC,oBAAiB,CAAC;IAEpB,IAAM,kBAAkB,GAAG,UAAG,wBAAwB,+CAAqC,iBAAiB,WAAQ,CAAC;IACrH,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9B,CAAC,CAAC;AA5BW,QAAA,gCAAgC,oCA4B3C"}
+{"version":3,"file":"cloudRunRevisions.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cloudRunRevisions.ts"],"names":[],"mappings":";;;AACA,oCAA0C;AAC1C,+DAA4D;AAC5D,2DAAwD;AACxD,iGAA8F;AAE9F,MAAM,uBAAuB,GAAG,CAC9B,OAAyB,EACzB,IAGC,EACD,EAAE;;IACF,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,YAAY,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACtE,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,kBAAkB,GAAG;QACzB,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,+BAA+B;QAC/B,OAAO,EAAE,WAAW;QAEpB,KAAK,EAAE,WAAW,EAAE,yBAAyB;QAC7C,SAAS,EAAE,4BAA4B;QACvC,GAAG,IAAI;KACR,CAAC;IAEF,uDAAuD;IACvD,OAAO,6BAA6B,IAAA,mCAAgB,EAAC,kBAAkB,CAAC,EAAE,CAAC;AAC7E,CAAC,CAAC;AAEK,MAAM,gCAAgC,GAAG,CAC9C,OAAyB,EACzB,IAAY,EACZ,EAAE;;IACF,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,uDAAuD;IACvD,MAAM,2BAA2B,GAAG,uBAAuB,CAAC,OAAO,EAAE;QACnE,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,wEAAwE;KACjF,CAAC,CAAC;IACH,mDAAmD;IACnD,MAAM,wBAAwB,GAAG,IAAA,qEAAiC,EAChE,2BAA2B,EAC3B,IAAI,CACL,CAAC;IACF,MAAM,iBAAiB,GAAG,+BAA+B,IAAA,mCAAgB,EAAC;QACxE,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,KAAK,EAAE,IAAI;KACZ,CAAC,iBAAiB,CAAC;IAEpB,MAAM,kBAAkB,GAAG,GAAG,wBAAwB,qCAAqC,iBAAiB,QAAQ,CAAC;IACrH,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9B,CAAC,CAAC;AA5BW,QAAA,gCAAgC,oCA4B3C"}