@catladder/cli 1.164.0 → 1.165.0

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

@@ -1,182 +1,138 @@
 "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.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
-var gitlab_1 = require("../../../utils/gitlab");
-var createArgsString_1 = require("../utils/createArgsString");
-var jobName_1 = require("../utils/jobName");
-var common_1 = require("./common");
-var getLabels_1 = require("../../../context/getLabels");
-var volumes_1 = require("./volumes");
-var constants_1 = require("./constants");
-var getJobRunScriptForJob = function (context, jobName, wait) {
-    var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-    var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-    return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(jobName.toString(), " ").concat(commonArgsString).concat(wait ? " --wait" : "");
+const gitlab_1 = require("../../../utils/gitlab");
+const createArgsString_1 = require("../utils/createArgsString");
+const jobName_1 = require("../utils/jobName");
+const common_1 = require("./common");
+const getLabels_1 = require("../../../context/getLabels");
+const volumes_1 = require("./volumes");
+const constants_1 = require("./constants");
+const getJobRunScriptForJob = (context, jobName, wait) => {
+    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+    const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+    return `${(0, common_1.gcloudRunCmd)()} jobs execute ${jobName.toString()} ${commonArgsString}${wait ? " --wait" : ""}`;
 };
-var getDeleteSchedulesScripts = function (context) {
-    var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
-    var argsString = (0, createArgsString_1.createArgsString)({
+const getDeleteSchedulesScripts = (context) => {
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    const jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+    const argsString = (0, createArgsString_1.createArgsString)({
         project: deployConfig.projectId,
         location: deployConfig.region,
     });
     return jobsWithSchedule
-        .map(function (_a) {
-        var schedulerName = _a.schedulerName;
+        .map(({ schedulerName }) => {
         return [
-            "".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(schedulerName, " ").concat(argsString),
+            `${(0, common_1.gcloudSchedulerCmd)()} jobs delete ${schedulerName} ${argsString}`,
         ];
     })
         .flat();
 };
 exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
-var getDeleteJobsScripts = function (context) {
-    var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-    var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-    var jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames.flatMap(function (_a) {
-        var jobName = _a.jobName;
-        return [
-            // first delete all job executions. Otherwise delete might fail if one of those is still running
-            "".concat((0, common_1.gcloudRunCmd)(), " jobs executions list ").concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} ").concat((0, common_1.gcloudRunCmd)(), " jobs executions delete {}  --quiet ").concat(commonArgsString),
-            "".concat((0, common_1.gcloudRunCmd)(), " jobs delete ").concat(jobName, " ").concat(commonArgsString),
-        ];
-    });
+const getDeleteJobsScripts = (context) => {
+    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+    const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+    const jobsWithNames = getCloudRunJobsWithNames(context);
+    return jobsWithNames.flatMap(({ jobName }) => [
+        // first delete all job executions. Otherwise delete might fail if one of those is still running
+        `${(0, common_1.gcloudRunCmd)()} jobs executions list ${commonArgsString} --job ${jobName} --format="value(name)" | xargs -I {} ${(0, common_1.gcloudRunCmd)()} jobs executions delete {}  --quiet ${commonArgsString}`,
+        `${(0, common_1.gcloudRunCmd)()} jobs delete ${jobName} ${commonArgsString}`,
+    ]);
 };
 exports.getDeleteJobsScripts = getDeleteJobsScripts;
-var getJobRunScripts = function (context, when) {
-    var jobsWithNames = getCloudRunJobsWithNames(context);
+const getJobRunScripts = (context, when) => {
+    const jobsWithNames = getCloudRunJobsWithNames(context);
     return jobsWithNames
-        .filter(function (_a) {
-        var job = _a.job;
-        return job.when === when;
-    })
-        .map(function (_a) {
-        var jobName = _a.jobName;
-        return getJobRunScriptForJob(context, jobName, 
-        // wait for completin on stop jobs, since stop will delete the jobs afterwards, so they will fail
-        ["preStop", "postStop"].includes(when));
-    });
+        .filter(({ job }) => job.when === when)
+        .map(({ jobName }) => getJobRunScriptForJob(context, jobName, 
+    // wait for completin on stop jobs, since stop will delete the jobs afterwards, so they will fail
+    ["preStop", "postStop"].includes(when)));
 };
 exports.getJobRunScripts = getJobRunScripts;
-var getJobCreateScripts = function (context) {
-    var jobsWithNames = getCloudRunJobsWithNames(context);
+const getJobCreateScripts = (context) => {
+    const jobsWithNames = getCloudRunJobsWithNames(context);
     return jobsWithNames
-        .map(function (_a) {
-        var job = _a.job, jobName = _a.jobName;
-        return getJobCreateScriptsForJob(context, jobName, job);
-    })
+        .map(({ job, jobName }) => getJobCreateScriptsForJob(context, jobName, job))
         .flat();
 };
 exports.getJobCreateScripts = getJobCreateScripts;
-var getJobCreateScriptsForJob = function (context, jobName, job) {
-    var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
+const getJobCreateScriptsForJob = (context, jobName, job) => {
+    const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
     // due to some oversight from google, jobs create does not yet accept `--add-volume` 🤦
     // lucky, update on the other hand accepts it... so let's just imediatly update it
     // we cannot upsert a job, so we have to create it and catch the error and then update
-    var commandArray = Array.isArray(job.command)
+    const commandArray = Array.isArray(job.command)
         ? job.command
         : job.command.split(" ");
-    var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({ command: '"' + commandArray.join(",") + '"' }, commonDeployArgs), { labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), { "cloud-run-job-name": jobName.toString() })), image: job.image || commonDeployArgs.image, cpu: job === null || job === void 0 ? void 0 : job.cpu, memory: job.memory || "512Mi", "task-timeout": job.timeout || "10m", parallelism: job.parallelism || 1, "env-vars-file": constants_1.ENV_VARS_FILENAME, "max-retries": 0 }));
-    var requiresBeta = (job === null || job === void 0 ? void 0 : job.volumes) && Object.keys(job === null || job === void 0 ? void 0 : job.volumes).length > 0;
-    var argsString = "".concat(jobName, " ").concat(commonDeployArgsString);
-    return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)(["".concat((0, common_1.gcloudRunCmd)(), " jobs create ").concat(argsString)])), false), [
-        "".concat((0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined), " jobs update ").concat(argsString, " ").concat(createArgsString_1.createArgsString.apply(void 0, __spreadArray([], __read((0, volumes_1.createVolumeConfig)(job === null || job === void 0 ? void 0 : job.volumes, "job")), false))),
-    ], false);
+    const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
+        command: '"' + commandArray.join(",") + '"',
+        ...commonDeployArgs,
+        labels: (0, common_1.makeLabelString)({
+            ...(0, getLabels_1.getLabels)(context),
+            "cloud-run-job-name": jobName.toString(),
+        }),
+        image: job.image || commonDeployArgs.image,
+        cpu: job === null || job === void 0 ? void 0 : job.cpu,
+        memory: job.memory || "512Mi",
+        "task-timeout": job.timeout || "10m",
+        parallelism: job.parallelism || 1,
+        "env-vars-file": constants_1.ENV_VARS_FILENAME,
+        "max-retries": 0,
+    });
+    const requiresBeta = (job === null || job === void 0 ? void 0 : job.volumes) && Object.keys(job === null || job === void 0 ? void 0 : job.volumes).length > 0;
+    const argsString = `${jobName} ${commonDeployArgsString}`;
+    return [
+        ...(0, gitlab_1.allowFailureInScripts)([`${(0, common_1.gcloudRunCmd)()} jobs create ${argsString}`]),
+        `${(0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined)} jobs update ${argsString} ${(0, createArgsString_1.createArgsString)(...(0, volumes_1.createVolumeConfig)(job === null || job === void 0 ? void 0 : job.volumes, "job"))}`,
+    ];
 };
-var getCreateScheduleScripts = function (context) {
-    var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
-    var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+const getCreateScheduleScripts = (context) => {
+    const jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
     return jobsWithSchedule
-        .map(function (_a) {
-        var _b;
-        var job = _a.job, jobName = _a.jobName, schedulerName = _a.schedulerName;
-        var argsString = (0, createArgsString_1.createArgsString)({
+        .map(({ job, jobName, schedulerName }) => {
+        var _a;
+        const argsString = (0, createArgsString_1.createArgsString)({
             project: deployConfig.projectId,
             location: deployConfig.region,
-            schedule: "\"".concat(job.schedule, "\""),
-            "max-retry-attempts": (_b = job.maxRetryAttempts) !== null && _b !== void 0 ? _b : 0,
-            uri: "\"https://".concat(deployConfig.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfig.projectId, "/jobs/").concat(jobName, ":run\""),
+            schedule: `"${job.schedule}"`,
+            "max-retry-attempts": (_a = job.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0,
+            uri: `"https://${deployConfig.region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${deployConfig.projectId}/jobs/${jobName}:run"`,
             "http-method": "POST",
             "oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
         });
-        var commonArgs = "http ".concat(schedulerName, " ").concat(argsString);
-        return __spreadArray(__spreadArray([], __read((0, gitlab_1.allowFailureInScripts)([
-            "".concat((0, common_1.gcloudSchedulerCmd)(), " jobs create ").concat(commonArgs),
-        ])), false), [
-            "".concat((0, common_1.gcloudSchedulerCmd)(), " jobs update ").concat(commonArgs),
-        ], false);
+        const commonArgs = `http ${schedulerName} ${argsString}`;
+        return [
+            ...(0, gitlab_1.allowFailureInScripts)([
+                `${(0, common_1.gcloudSchedulerCmd)()} jobs create ${commonArgs}`,
+            ]),
+            `${(0, common_1.gcloudSchedulerCmd)()} jobs update ${commonArgs}`,
+        ];
     })
         .flat();
 };
 exports.getCreateScheduleScripts = getCreateScheduleScripts;
-var getCloudRunJobsWithSchedule = function (context) {
-    var jobsWithNames = getCloudRunJobsWithNames(context);
+const getCloudRunJobsWithSchedule = (context) => {
+    const jobsWithNames = getCloudRunJobsWithNames(context);
     return jobsWithNames
-        .filter(function (entry) { return entry.job.when === "schedule"; })
-        .map(function (_a) {
-        var job = _a.job, jobName = _a.jobName;
-        return ({
-            job: job,
-            jobName: jobName,
-            schedulerName: jobName.concat("-scheduler"),
-        });
-    });
+        .filter((entry) => entry.job.when === "schedule")
+        .map(({ job, jobName }) => ({
+        job,
+        jobName,
+        schedulerName: jobName.concat("-scheduler"),
+    }));
 };
-var getCloudRunJobsWithNames = function (context) {
+const getCloudRunJobsWithNames = (context) => {
     var _a;
-    var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    var getFullJobName = function (name) {
-        return (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
-    };
-    var jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    const getFullJobName = (name) => (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
+    const jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
         // filter out disabled jobs
-        .filter(function (entry) {
-        return Boolean(entry[1]);
-    })
-        .map(function (_a) {
-        var _b = __read(_a, 2), name = _b[0], job = _b[1];
-        return ({
-            jobName: getFullJobName(name),
-            job: job,
-        });
-    });
+        .filter((entry) => Boolean(entry[1]))
+        .map(([name, job]) => ({
+        jobName: getFullJobName(name),
+        job,
+    }));
     return jobsWithNames;
 };
 //# sourceMappingURL=cloudRunJobs.js.map

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

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

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

@@ -1,79 +1,62 @@
 "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.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
-var getLabels_1 = require("../../../context/getLabels");
-var createArgsString_1 = require("../utils/createArgsString");
-var getServiceName_1 = require("../utils/getServiceName");
-var common_1 = require("./common");
-var constants_1 = require("./constants");
-var volumes_1 = require("./volumes");
-var getServiceDeployScript = function (context, service, nameSuffix) {
+const getLabels_1 = require("../../../context/getLabels");
+const createArgsString_1 = require("../utils/createArgsString");
+const getServiceName_1 = require("../utils/getServiceName");
+const common_1 = require("./common");
+const constants_1 = require("./constants");
+const volumes_1 = require("./volumes");
+const getServiceDeployScript = (context, service, nameSuffix) => {
     var _a, _b, _c, _d, _e;
-    var commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
-    var serviceName = (0, getServiceName_1.getServiceName)(context);
-    var customConfig = service !== true ? service : undefined;
-    var command = service !== true
+    const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
+    const serviceName = (0, getServiceName_1.getServiceName)(context);
+    const customConfig = service !== true ? service : undefined;
+    const command = service !== true
         ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.config.startCommand
         : undefined;
-    var commandArray = command
+    const commandArray = command
         ? Array.isArray(command)
             ? command
             : command.split(" ")
         : undefined;
-    var fullServiceName = serviceName.concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
-    var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({ 
-            // command as empty string resets it to default (uses the image's entrypoint)
-            command: commandArray ? '"' + commandArray.join(",") + '"' : '""' }, commonDeployArgs), { labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), { "cloud-run-service-name": fullServiceName })), "env-vars-file": constants_1.ENV_VARS_FILENAME, "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0, "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100, "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true, cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu, memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory, timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout, "vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector, "vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress, "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true, ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all", "cpu-boost": true, "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment })], __read((0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service")), false));
+    const fullServiceName = serviceName.concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
+    const argsString = (0, createArgsString_1.createArgsString)({
+        // command as empty string resets it to default (uses the image's entrypoint)
+        command: commandArray ? '"' + commandArray.join(",") + '"' : '""',
+        ...commonDeployArgs,
+        labels: (0, common_1.makeLabelString)({
+            ...(0, getLabels_1.getLabels)(context),
+            "cloud-run-service-name": fullServiceName,
+        }),
+        "env-vars-file": constants_1.ENV_VARS_FILENAME,
+        "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
+        "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
+        "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
+        cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu,
+        memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
+        timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
+        "vpc-connector": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcConnector,
+        "vpc-egress": customConfig === null || customConfig === void 0 ? void 0 : customConfig.vpcEgress,
+        "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
+        ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
+        "cpu-boost": true,
+        "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
+    }, ...(0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service"));
     // volumes require beta
-    var requiresBeta = (customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes) && Object.keys(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes).length > 0;
-    return "".concat((0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined), " deploy ").concat(fullServiceName, " ").concat(argsString);
+    const requiresBeta = (customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes) && Object.keys(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes).length > 0;
+    return `${(0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined)} deploy ${fullServiceName} ${argsString}`;
 };
 exports.getServiceDeployScript = getServiceDeployScript;
-var getServiceDeleteScript = function (context, serviceSuffix) {
-    var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-    var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-    var serviceName = (0, getServiceName_1.getServiceName)(context);
-    var fullServiceName = serviceSuffix
-        ? "".concat(serviceName, "-").concat(serviceSuffix)
+const getServiceDeleteScript = (context, serviceSuffix) => {
+    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+    const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+    const serviceName = (0, getServiceName_1.getServiceName)(context);
+    const fullServiceName = serviceSuffix
+        ? `${serviceName}-${serviceSuffix}`
         : serviceName;
     return [
-        "".concat((0, common_1.gcloudRunCmd)(), " services delete ").concat(fullServiceName, " ").concat(commonArgsString),
+        `${(0, common_1.gcloudRunCmd)()} services delete ${fullServiceName} ${commonArgsString}`,
     ];
 };
 exports.getServiceDeleteScript = getServiceDeleteScript;

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

@@ -1 +1 @@
-{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":";;;AAAA,0DAAuD;AAIvD,gEAA6D;AAC7D,4DAAyD;AACzD,qCAKkB;AAClB,2CAAgD;AAChD,uCAA+C;AAExC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACzB,OAAuD,EACvD,UAAmB,EACnB,EAAE;;IACF,MAAM,gBAAgB,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,YAAY,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5D,MAAM,OAAO,GACX,OAAO,KAAK,IAAI;QACd,CAAC,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,mCAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY;QACvD,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,YAAY,GAAG,OAAO;QAC1B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;QACtB,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,IAAA,mCAAgB,EACjC;QACE,6EAA6E;QAC7E,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI;QACjE,GAAG,gBAAgB;QACnB,MAAM,EAAE,IAAA,wBAAe,EAAC;YACtB,GAAG,IAAA,qBAAS,EAAC,OAAO,CAAC;YACrB,wBAAwB,EAAE,eAAe;SAC1C,CAAC;QACF,eAAe,EAAE,6BAAiB;QAClC,eAAe,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,CAAC;QAChD,eAAe,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,GAAG;QAClD,gBAAgB,EAAE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,eAAe,MAAK,IAAI;QACxD,GAAG,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG;QACtB,MAAM,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM;QAC5B,OAAO,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO;QAC9B,eAAe,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY;QAC3C,YAAY,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS;QACrC,uBAAuB,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB,mCAAI,IAAI;QACnE,OAAO,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,mCAAI,KAAK;QACvC,WAAW,EAAE,IAAI;QACjB,uBAAuB,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,oBAAoB;KAC5D,EACD,GAAG,IAAA,4BAAkB,EAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAAE,SAAS,CAAC,CACxD,CAAC;IACF,uBAAuB;IACvB,MAAM,YAAY,GAChB,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,KAAI,MAAM,CAAC,IAAI,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAEzE,OAAO,GAAG,IAAA,qBAAY,EACpB,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAClC,WAAW,eAAe,IAAI,UAAU,EAAE,CAAC;AAC9C,CAAC,CAAC;AArDW,QAAA,sBAAsB,0BAqDjC;AAEK,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACzB,aAAsB,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,gBAAgB,GAAG,IAAA,mCAAgB,EAAC,UAAU,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,eAAe,GAAG,aAAa;QACnC,CAAC,CAAC,GAAG,WAAW,IAAI,aAAa,EAAE;QACnC,CAAC,CAAC,WAAW,CAAC;IAEhB,OAAO;QACL,GAAG,IAAA,qBAAY,GAAE,oBAAoB,eAAe,IAAI,gBAAgB,EAAE;KAC3E,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,sBAAsB,0BAiBjC"}

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)\")"),
+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,sDAAsD;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,OAAyB;;IAC/D,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,OAAyB;IAC7D,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,OAAyB;IAC3D,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"}