@catladder/cli 0.0.0-next-95928577 → 0.0.0-next-e7541a00

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

@@ -1,153 +1,73 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCloudRunJobsWithNames = exports.getJobCreateScripts = exports.getDeleteJobsScripts = void 0;
+const getLabels_1 = require("../../../context/getLabels");
+const utils_1 = require("../../../utils");
 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 utils_1 = require("../../../utils");
-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" : ""}`;
-};
-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(({ schedulerName }) => {
-        return [
-            `${(0, common_1.gcloudSchedulerCmd)()} jobs delete ${schedulerName} ${argsString}`,
-        ];
-    })
-        .flat();
-};
-exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
-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}`,
-    ]);
+const volumes_1 = require("./volumes");
+const getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
+const getDeleteJobsScripts = context => {
+  const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+  const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+  const jobsWithNames = (0, exports.getCloudRunJobsWithNames)(context);
+  return jobsWithNames.flatMap(({
+    fullJobName
+  }) => [
+  // 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 ${fullJobName} --format="value(name)" | xargs -I {} ${(0, common_1.gcloudRunCmd)()} jobs executions delete {}  --quiet ${commonArgsString}`, `${(0, common_1.gcloudRunCmd)()} jobs delete ${fullJobName} ${commonArgsString}`]);
 };
 exports.getDeleteJobsScripts = getDeleteJobsScripts;
-const getJobRunScripts = (context, when) => {
-    const jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames
-        .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;
-const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map(({ job: { command, image, cpu, memory = "512Mi", timeout = "10m", parallelism = 1, volumes, }, jobName, }, jobIndex) => {
-    const commandArray = Array.isArray(command)
-        ? command
-        : command.split(" ");
-    const { image: commonImage, project, region, ...deployArgs } = (0, common_1.getCommonDeployArgs)(context);
-    const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
-        command: `"${commandArray.join(",")}"`,
-        labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
-        image: `"${image !== null && image !== void 0 ? image : commonImage}"`,
-        project,
-        region,
-        cpu,
-        memory,
-        parallelism,
-        "task-timeout": timeout,
-        "env-vars-file": constants_1.ENV_VARS_FILENAME,
-        "max-retries": 0,
-        ...deployArgs,
-    });
-    // 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
-    const hasVolumes = Object.keys(volumes || {}).length > 0;
-    const needsBeta = hasVolumes ? "beta" : undefined;
-    const volumeArgs = hasVolumes
-        ? (0, createArgsString_1.createArgsString)(...(0, volumes_1.createVolumeConfig)(volumes, "job"))
-        : "";
-    return [
-        jobIndex === 0
-            ? `exist_job_names="$(\n  ${(0, common_1.gcloudRunCmd)()} jobs list --filter='metadata.name ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --project='${project}' --region='${region}'\n)"`
-            : null,
-        `current_job_name="${jobName}"`,
-        'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then',
-        `  ${(0, common_1.gcloudRunCmd)(needsBeta)} jobs update "$current_job_name" ${commonDeployArgsString} ${volumeArgs}`,
-        "else",
-        `  ${(0, common_1.gcloudRunCmd)()} jobs create "$current_job_name" ${commonDeployArgsString}`,
-        "fi",
-    ]
-        .filter(utils_1.notNil)
-        .join("\n");
+const getJobCreateScripts = context => (0, exports.getCloudRunJobsWithNames)(context).map(({
+  job,
+  fullJobName
+}, jobIndex) => {
+  var _a, _b, _c, _d, _e;
+  const commandArray = Array.isArray(job.command) ? job.command : job.command.split(" ");
+  const {
+    image: commonImage,
+    project,
+    region,
+    ...deployArgs
+  } = (0, common_1.getCommonDeployArgs)(context);
+  const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
+    command: `"${commandArray.join(",")}"`,
+    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(job.args),
+    labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
+    image: `"${(_a = job.image) !== null && _a !== void 0 ? _a : commonImage}"`,
+    project,
+    region,
+    cpu: job.cpu,
+    memory: (_b = job.memory) !== null && _b !== void 0 ? _b : "512Mi",
+    parallelism: (_c = job.parallelism) !== null && _c !== void 0 ? _c : 1,
+    "task-timeout": (_d = job.timeout) !== null && _d !== void 0 ? _d : "10m",
+    "env-vars-file": constants_1.ENV_VARS_FILENAME,
+    "max-retries": (_e = job.maxRetries) !== null && _e !== void 0 ? _e : 0,
+    ...deployArgs,
+    // network
+    "vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
+    "vpc-egress": job === null || job === void 0 ? void 0 : job.vpcEgress,
+    network: job === null || job === void 0 ? void 0 : job.network,
+    subnet: job === null || job === void 0 ? void 0 : job.subnet
+  }, ...(0, volumes_1.createVolumeConfig)(job.volumes, "job"));
+  return [jobIndex === 0 ? `exist_job_names="$(\n  ${(0, common_1.gcloudRunCmd)()} jobs list --filter='metadata.name ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --project='${project}' --region='${region}'\n)"` : null, `current_job_name="${fullJobName}"`, 'if echo "$exist_job_names" | grep -Fx "$current_job_name" >/dev/null; then', `  ${(0, common_1.gcloudRunCmd)()} jobs update "$current_job_name" ${commonDeployArgsString}`, "else", `  ${(0, common_1.gcloudRunCmd)()} jobs create "$current_job_name" ${commonDeployArgsString}`, "fi"].filter(utils_1.notNil).join("\n");
 });
 exports.getJobCreateScripts = getJobCreateScripts;
-const getCreateScheduleScripts = (context) => {
-    const jobsWithSchedule = getCloudRunJobsWithSchedule(context);
-    const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
-    const uriBase = `https://${location}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${project}/jobs`;
-    const gcloudArgs = {
-        project,
-        location,
-        uri: `"$current_job_uri"`,
-        "http-method": "POST",
-        "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
-    };
-    return jobsWithSchedule.map(({ job: { maxRetryAttempts, schedule }, jobName, schedulerName }, jobIndex) => {
-        const argsString = (0, createArgsString_1.createArgsString)({
-            ...gcloudArgs,
-            schedule: `"${schedule}"`,
-            "max-retry-attempts": maxRetryAttempts !== null && maxRetryAttempts !== void 0 ? maxRetryAttempts : 0,
-        });
-        return [
-            jobIndex === 0
-                ? `exist_scheduler_names="$(\n  ${(0, common_1.gcloudSchedulerCmd)()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
-                : null,
-            `current_job_uri="${uriBase}/${jobName}:run"`,
-            `current_scheduler_name="${schedulerName}"`,
-            `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
-            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs update http "$current_scheduler_name" ${argsString}`,
-            `else`,
-            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs create http "$current_scheduler_name" ${argsString}`,
-            `fi`,
-        ]
-            .filter(utils_1.notNil)
-            .join("\n");
-    });
-};
-exports.getCreateScheduleScripts = getCreateScheduleScripts;
-const getCloudRunJobsWithSchedule = (context) => {
-    const jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames
-        .filter((entry) => entry.job.when === "schedule")
-        .map(({ job, jobName, jobKey }) => ({
-        job,
-        jobName,
-        jobKey,
-        schedulerName: jobName.concat("-scheduler"),
-    }));
-};
-const getCloudRunJobsWithNames = (context) => {
-    var _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((entry) => Boolean(entry[1]))
-        .map(([jobKey, job]) => ({
-        jobName: getFullJobName(jobKey),
-        job,
-        jobKey,
-    }));
-    return jobsWithNames;
+const getCloudRunJobsWithNames = context => {
+  var _a;
+  const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  const jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
+  // filter out disabled jobs
+  .filter(entry => Boolean(entry[1])).map(([jobName, job]) => ({
+    fullJobName: (0, jobName_1.getFullJobName)(context, jobName),
+    job,
+    jobName
+  }));
+  return jobsWithNames;
 };
-//# sourceMappingURL=cloudRunJobs.js.map
+exports.getCloudRunJobsWithNames = getCloudRunJobsWithNames;

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":";;;AAMA,gEAA6D;AAC7D,8CAAsD;AACtD,qCAOkB;AAClB,0DAAuD;AACvD,uCAA+C;AAK/C,2CAAgD;AAChD,0CAAwC;AAExC,MAAM,qBAAqB,GAAG,CAC5B,OAAyB,EACzB,OAA+B,EAC/B,IAAa,EACb,EAAE;IACF,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAElD,MAAM,gBAAgB,GAAG,IAAA,mCAAgB,EAAC,UAAU,CAAC,CAAC;IACtD,OAAO,GAAG,IAAA,qBAAY,GAAE,iBAAiB,OAAO,CAAC,QAAQ,EAAE,IAAI,gBAAgB,GAC7E,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACrB,EAAE,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,yBAAyB,GAAG,CAAC,OAAyB,EAAE,EAAE;IACrE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAG,IAAA,mCAAgB,EAAC;QAClC,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,QAAQ,EAAE,YAAY,CAAC,MAAM;KAC9B,CAAC,CAAC;IACH,OAAO,gBAAgB;SACpB,GAAG,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;QACzB,OAAO;YACL,GAAG,IAAA,2BAAkB,GAAE,gBAAgB,aAAa,IAAI,UAAU,EAAE;SACrE,CAAC;IACJ,CAAC,CAAC;SACD,IAAI,EAAE,CAAC;AACZ,CAAC,CAAC;AAdW,QAAA,yBAAyB,6BAcpC;AAEK,MAAM,oBAAoB,GAAG,CAAC,OAAyB,EAAE,EAAE;IAChE,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAClD,MAAM,gBAAgB,GAAG,IAAA,mCAAgB,EAAC,UAAU,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAExD,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAC5C,gGAAgG;QAChG,GAAG,IAAA,qBAAY,GAAE,yBAAyB,gBAAgB,UAAU,OAAO,yCAAyC,IAAA,qBAAY,GAAE,uCAAuC,gBAAgB,EAAE;QAC3L,GAAG,IAAA,qBAAY,GAAE,gBAAgB,OAAO,IAAI,gBAAgB,EAAE;KAC/D,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,oBAAoB,wBAU/B;AAEK,MAAM,gBAAgB,GAAG,CAC9B,OAAyB,EACzB,IAAqC,EACrC,EAAE;IACF,MAAM,aAAa,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACxD,OAAO,aAAa;SACjB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC;SACtC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACnB,qBAAqB,CACnB,OAAO,EACP,OAAO;IACP,iGAAiG;IACjG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CACvC,CACF,CAAC;AACN,CAAC,CAAC;AAfW,QAAA,gBAAgB,oBAe3B;AAEK,MAAM,mBAAmB,GAAG,CAAC,OAAyB,EAAY,EAAE,CACzE,wBAAwB,CAAC,OAAO,CAAC,CAAC,GAAG,CACnC,CACE,EACE,GAAG,EAAE,EACH,OAAO,EACP,KAAK,EACL,GAAG,EACH,MAAM,GAAG,OAAO,EAChB,OAAO,GAAG,KAAK,EACf,WAAW,GAAG,CAAC,EACf,OAAO,GACR,EACD,OAAO,GACR,EACD,QAAQ,EACA,EAAE;IACV,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QACzC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEvB,MAAM,EACJ,KAAK,EAAE,WAAW,EAClB,OAAO,EACP,MAAM,EACN,GAAG,UAAU,EACd,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IACjC,MAAM,sBAAsB,GAAG,IAAA,mCAAgB,EAAC;QAC9C,OAAO,EAAE,IAAI,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;QACtC,MAAM,EAAE,IAAI,IAAA,wBAAe,EAAC,IAAA,qBAAS,EAAC,OAAO,CAAC,CAAC,wCAAwC;QACvF,KAAK,EAAE,IAAI,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,WAAW,GAAG;QAClC,OAAO;QACP,MAAM;QACN,GAAG;QACH,MAAM;QACN,WAAW;QACX,cAAc,EAAE,OAAO;QACvB,eAAe,EAAE,6BAAiB;QAClC,aAAa,EAAE,CAAC;QAChB,GAAG,UAAU;KACd,CAAC,CAAC;IAEH,uFAAuF;IACvF,kFAAkF;IAClF,sFAAsF;IACtF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAClD,MAAM,UAAU,GAAG,UAAU;QAC3B,CAAC,CAAC,IAAA,mCAAgB,EAAC,GAAG,IAAA,4BAAkB,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC,CAAC,EAAE,CAAC;IAEP,OAAO;QACL,QAAQ,KAAK,CAAC;YACZ,CAAC,CAAC,0BAA0B,IAAA,qBAAY,GAAE,wCAAwC,OAAO,CAAC,GAAG,KAAK,OAAO,CAAC,IAAI,mDAAmD,OAAO,eAAe,MAAM,OAAO;YACpM,CAAC,CAAC,IAAI;QACR,qBAAqB,OAAO,GAAG;QAC/B,oEAAoE;QACpE,KAAK,IAAA,qBAAY,EAAC,SAAS,CAAC,oCAAoC,sBAAsB,IAAI,UAAU,EAAE;QACtG,MAAM;QACN,KAAK,IAAA,qBAAY,GAAE,oCAAoC,sBAAsB,EAAE;QAC/E,IAAI;KACL;SACE,MAAM,CAAC,cAAM,CAAC;SACd,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CACF,CAAC;AAjES,QAAA,mBAAmB,uBAiE5B;AAEG,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACf,EAAE;IACZ,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAC5C,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IAEnC,MAAM,OAAO,GAAG,WAAW,QAAQ,6DAA6D,OAAO,OAAO,CAAC;IAC/G,MAAM,UAAU,GAAG;QACjB,OAAO;QACP,QAAQ;QACR,GAAG,EAAE,oBAAoB;QACzB,aAAa,EAAE,MAAM;QACrB,6BAA6B,EAAE,gEAAgE;KAChG,CAAC;IAEF,OAAO,gBAAgB,CAAC,GAAG,CACzB,CACE,EAAE,GAAG,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAC/D,QAAQ,EACA,EAAE;QACV,MAAM,UAAU,GAAG,IAAA,mCAAgB,EAAC;YAClC,GAAG,UAAU;YACb,QAAQ,EAAE,IAAI,QAAQ,GAAG;YACzB,oBAAoB,EAAE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,CAAC;SAC5C,CAAC,CAAC;QACH,OAAO;YACL,QAAQ,KAAK,CAAC;gBACZ,CAAC,CAAC,gCAAgC,IAAA,2BAAkB,GAAE,yCAAyC,OAAO,CAAC,GAAG,KAAK,OAAO,CAAC,IAAI,oDAAoD,QAAQ,gBAAgB,OAAO,OAAO;gBACrN,CAAC,CAAC,IAAI;YACR,oBAAoB,OAAO,IAAI,OAAO,OAAO;YAC7C,2BAA2B,aAAa,GAAG;YAC3C,gFAAgF;YAChF,KAAK,IAAA,2BAAkB,GAAE,+CAA+C,UAAU,EAAE;YACpF,MAAM;YACN,KAAK,IAAA,2BAAkB,GAAE,+CAA+C,UAAU,EAAE;YACpF,IAAI;SACL;aACE,MAAM,CAAC,cAAM,CAAC;aACd,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AA1CW,QAAA,wBAAwB,4BA0CnC;AAEF,MAAM,2BAA2B,GAAG,CAAC,OAAyB,EAAE,EAAE;IAChE,MAAM,aAAa,GAAG,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAExD,OAAO,aAAa;SACjB,MAAM,CACL,CACE,KAAK,EAKL,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,UAAU,CACnC;SACA,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QAClC,GAAG;QACH,OAAO;QACP,MAAM;QACN,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC,CAAC;AACR,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IAC7D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IAEtD,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE,CACtC,IAAA,4BAAkB,EAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAEzD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,IAAI,mCAAI,EAAE,CAAC;QAC3D,2BAA2B;SAC1B,MAAM,CAAC,CAAC,KAAK,EAA8C,EAAE,CAC5D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAClB;SACA,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC;QAC/B,GAAG;QACH,MAAM;KACP,CAAC,CAAC,CAAC;IACN,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}
+{"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.d.ts

@@ -1,4 +1,4 @@
 import type { ComponentContext } from "../../../types/context";
 import type { DeployConfigCloudRunService } from "../../types/googleCloudRun";
 export declare const getServiceDeployScript: (context: ComponentContext, service: DeployConfigCloudRunService | true | undefined, nameSuffix?: string) => string;
-export declare const getServiceDeleteScript: (context: ComponentContext, serviceSuffix?: string) => string[];
+export declare const getServiceDeleteScript: (context: ComponentContext, serviceSuffix?: string) => string[];

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

@@ -1,66 +1,80 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 const getLabels_1 = require("../../../context/getLabels");
 const createArgsString_1 = require("../utils/createArgsString");
+const getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
 const getServiceName_1 = require("../utils/getServiceName");
 const common_1 = require("./common");
 const constants_1 = require("./constants");
+const healthCheck_1 = require("./healthCheck");
 const volumes_1 = require("./volumes");
 const getServiceDeployScript = (context, service, nameSuffix) => {
-    var _a, _b, _c, _d, _e;
-    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;
-    const commandArray = command
-        ? Array.isArray(command)
-            ? command
-            : command.split(" ")
-        : undefined;
-    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,
-        network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
-        subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
-        "use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
-        "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
-    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}`;
+  var _a, _b, _c, _d, _e, _f;
+  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.type !== "disabled" ? context.build.config.startCommand : undefined : undefined;
+  const commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
+  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(",") + '"' : '""',
+    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.args),
+    ...commonDeployArgs,
+    image: (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.image) !== null && _b !== void 0 ? _b : commonDeployArgs.image,
+    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": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _c !== void 0 ? _c : 0,
+    "max-instances": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _d !== void 0 ? _d : 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,
+    network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
+    subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
+    "use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
+    "allow-unauthenticated": (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _e !== void 0 ? _e : true,
+    ingress: (_f = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _f !== void 0 ? _f : "all",
+    "session-affinity": customConfig === null || customConfig === void 0 ? void 0 : customConfig.sessionAffinity,
+    "cpu-boost": true,
+    "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
+    gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,
+    "gpu-type": customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpuType,
+    ...(0, healthCheck_1.healthCheckCliArgs)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.healthCheck)
+  }, ...(0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service"));
+  const version = requiresBeta(customConfig) ? "beta" : undefined;
+  return `${(0, common_1.gcloudRunCmd)(version)} deploy ${fullServiceName} ${argsString}`;
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 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 [
-        `${(0, common_1.gcloudRunCmd)()} services delete ${fullServiceName} ${commonArgsString}`,
-    ];
+  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 [`${(0, common_1.gcloudRunCmd)()} services delete ${fullServiceName} ${commonArgsString}`];
 };
 exports.getServiceDeleteScript = getServiceDeleteScript;
-//# sourceMappingURL=cloudRunServices.js.map
+const requiresBeta = config => {
+  if (!config) {
+    return false;
+  }
+  if (config.gpuType) {
+    return true;
+  }
+  if (config.gpu && config.gpu > 0) {
+    return true;
+  }
+  if (config.healthCheck !== undefined) {
+    return true;
+  }
+  return false;
+};

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":";;;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,OAAO,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO;QAC9B,MAAM,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM;QAC5B,WAAW,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK;QAChC,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;AAxDW,QAAA,sBAAsB,0BAwDjC;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"}
+{"version":3,"file":"cloudRunServices.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunWorkerPools.d.ts

@@ -0,0 +1,4 @@
+import type { ComponentContext } from "../../../types/context";
+import type { DeployConfigCloudRunWorkerPool } from "../../types/googleCloudRun";
+export declare const getWorkerPoolDeployScript: (context: ComponentContext, workerPool: DeployConfigCloudRunWorkerPool, nameSuffix: string) => string;
+export declare const getWorkerPoolDeleteScript: (context: ComponentContext, workerPoolSuffix: string) => string[];

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

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWorkerPoolDeleteScript = exports.getWorkerPoolDeployScript = void 0;
+const getLabels_1 = require("../../../context/getLabels");
+const createArgsString_1 = require("../utils/createArgsString");
+const getJobOrServiceArgs_1 = require("../utils/getJobOrServiceArgs");
+const getServiceName_1 = require("../utils/getServiceName");
+const common_1 = require("./common");
+const constants_1 = require("./constants");
+const volumes_1 = require("./volumes");
+const getWorkerPoolDeployScript = (context, workerPool, nameSuffix) => {
+  var _a, _b, _c, _d;
+  const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
+  const serviceName = (0, getServiceName_1.getServiceName)(context);
+  const command = workerPool.command;
+  const commandArray = Array.isArray(command) ? command : command.split(" ");
+  const fullWorkerPoolName = `${serviceName}-${nameSuffix}`;
+  const argsString = (0, createArgsString_1.createArgsString)({
+    command: '"' + commandArray.join(",") + '"',
+    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(workerPool.args),
+    ...commonDeployArgs,
+    image: (_a = workerPool.image) !== null && _a !== void 0 ? _a : commonDeployArgs.image,
+    labels: (0, common_1.makeLabelString)({
+      ...(0, getLabels_1.getLabels)(context),
+      "cloud-run-worker-pool-name": fullWorkerPoolName
+    }),
+    "env-vars-file": constants_1.ENV_VARS_FILENAME,
+    instances: (_b = workerPool.instances) !== null && _b !== void 0 ? _b : 1,
+    cpu: (_c = workerPool.cpu) !== null && _c !== void 0 ? _c : 1,
+    memory: (_d = workerPool.memory) !== null && _d !== void 0 ? _d : "512Mi",
+    "vpc-connector": workerPool.vpcConnector,
+    "vpc-egress": workerPool.vpcEgress,
+    network: workerPool.network,
+    subnet: workerPool.subnet,
+    gpu: workerPool.gpu,
+    "gpu-type": workerPool.gpuType
+  }, ...(0, volumes_1.createVolumeConfig)(workerPool.volumes, "worker-pool"));
+  // Worker pools are in beta and require the beta command
+  return `${(0, common_1.gcloudRunCmd)("beta")} worker-pools deploy ${fullWorkerPoolName} ${argsString}`;
+};
+exports.getWorkerPoolDeployScript = getWorkerPoolDeployScript;
+const getWorkerPoolDeleteScript = (context, workerPoolSuffix) => {
+  const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+  const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
+  const serviceName = (0, getServiceName_1.getServiceName)(context);
+  const fullWorkerPoolName = `${serviceName}-${workerPoolSuffix}`;
+  return [`${(0, common_1.gcloudRunCmd)("beta")} worker-pools delete ${fullWorkerPoolName} ${commonArgsString}`];
+};
+exports.getWorkerPoolDeleteScript = getWorkerPoolDeleteScript;

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

@@ -0,0 +1 @@
+{"version":3,"file":"cloudRunWorkerPools.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/cloudRunWorkerPools.ts"],"names":[],"mappings":";;;AAAA,0DAAuD;AAIvD,gEAA6D;AAC7D,sEAA8E;AAC9E,4DAAyD;AACzD,qCAKkB;AAClB,2CAAgD;AAChD,uCAA+C;AAExC,MAAM,yBAAyB,GAAG,CACvC,OAAyB,EACzB,UAA0C,EAC1C,UAAkB,EAClB,EAAE;;IACF,MAAM,gBAAgB,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE3E,MAAM,kBAAkB,GAAG,GAAG,WAAW,IAAI,UAAU,EAAE,CAAC;IAE1D,MAAM,UAAU,GAAG,IAAA,mCAAgB,EACjC;QACE,OAAO,EAAE,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG;QAC3C,IAAI,EAAE,IAAA,oDAA8B,EAAC,UAAU,CAAC,IAAI,CAAC;QACrD,GAAG,gBAAgB;QACnB,KAAK,EAAE,MAAA,UAAU,CAAC,KAAK,mCAAI,gBAAgB,CAAC,KAAK;QACjD,MAAM,EAAE,IAAA,wBAAe,EAAC;YACtB,GAAG,IAAA,qBAAS,EAAC,OAAO,CAAC;YACrB,4BAA4B,EAAE,kBAAkB;SACjD,CAAC;QACF,eAAe,EAAE,6BAAiB;QAClC,SAAS,EAAE,MAAA,UAAU,CAAC,SAAS,mCAAI,CAAC;QACpC,GAAG,EAAE,MAAA,UAAU,CAAC,GAAG,mCAAI,CAAC;QACxB,MAAM,EAAE,MAAA,UAAU,CAAC,MAAM,mCAAI,OAAO;QACpC,eAAe,EAAE,UAAU,CAAC,YAAY;QACxC,YAAY,EAAE,UAAU,CAAC,SAAS;QAClC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,GAAG,EAAE,UAAU,CAAC,GAAG;QACnB,UAAU,EAAE,UAAU,CAAC,OAAO;KAC/B,EACD,GAAG,IAAA,4BAAkB,EAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CACzD,CAAC;IAEF,wDAAwD;IACxD,OAAO,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,wBAAwB,kBAAkB,IAAI,UAAU,EAAE,CAAC;AAC3F,CAAC,CAAC;AAzCW,QAAA,yBAAyB,6BAyCpC;AAEK,MAAM,yBAAyB,GAAG,CACvC,OAAyB,EACzB,gBAAwB,EACxB,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,kBAAkB,GAAG,GAAG,WAAW,IAAI,gBAAgB,EAAE,CAAC;IAEhE,OAAO;QACL,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,wBAAwB,kBAAkB,IAAI,gBAAgB,EAAE;KACxF,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,yBAAyB,6BAepC"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts

@@ -7,12 +7,12 @@ export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCl
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
 export declare const getCloudRunDeployConfig: (context: ComponentContext) => DeployConfigCloudRun;
 export declare function getCommonCloudRunArgs(context: ComponentContext): {
-    project: string;
-    region: import("../../types").Gcloudregion;
+  project: string;
+  region: import("../../types").Gcloudregion;
 };
 export declare function getCommonDeployArgs(context: ComponentContext): {
-    "set-cloudsql-instances": string;
-    project: string;
-    region: import("../../types").Gcloudregion;
-    image: string;
-};
+  "set-cloudsql-instances": string;
+  project: string;
+  region: import("../../types").Gcloudregion;
+  image: string;
+};

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

@@ -1,57 +1,52 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
 const types_1 = require("../../types");
 const artifactsRegistry_1 = require("../artifactsRegistry");
-const gcloudCmd = (version) => {
-    return version ? `gcloud ${version}` : "gcloud";
+const gcloudCmd = version => {
+  return version ? `gcloud ${version}` : "gcloud";
 };
 exports.gcloudCmd = gcloudCmd;
-const gcloudRunCmd = (version) => {
-    return `${(0, exports.gcloudCmd)(version)} run`;
+const gcloudRunCmd = version => {
+  return `${(0, exports.gcloudCmd)(version)} run`;
 };
 exports.gcloudRunCmd = gcloudRunCmd;
-const gcloudSchedulerCmd = (version) => {
-    return `${(0, exports.gcloudCmd)(version)} scheduler`;
+const gcloudSchedulerCmd = version => {
+  return `${(0, exports.gcloudCmd)(version)} scheduler`;
 };
 exports.gcloudSchedulerCmd = gcloudSchedulerCmd;
-const setGoogleProjectNumberScript = (deployConfig) => [
-    `export GCLOUD_PROJECT_NUMBER=$(${(0, exports.gcloudCmd)()} projects describe ${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;
-const makeLabelString = (obj) => Object.entries(obj)
-    .map(([key, value]) => `${key}=${value}`)
-    .join(",");
+const makeLabelString = obj => Object.entries(obj).map(([key, value]) => `${key}=${value}`).join(",");
 exports.makeLabelString = makeLabelString;
-const getCloudRunDeployConfig = (context) => {
-    var _a;
-    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");
-    }
-    return deployConfig;
+const getCloudRunDeployConfig = context => {
+  var _a;
+  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");
+  }
+  return deployConfig;
 };
 exports.getCloudRunDeployConfig = getCloudRunDeployConfig;
 function getCommonCloudRunArgs(context) {
-    const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
-    return {
-        project: deployConfig.projectId,
-        region: deployConfig.region,
-    };
+  const deployConfig = (0, exports.getCloudRunDeployConfig)(context);
+  return {
+    project: deployConfig.projectId,
+    region: deployConfig.region
+  };
 }
 exports.getCommonCloudRunArgs = getCommonCloudRunArgs;
 function getCommonDeployArgs(context) {
-    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,
-    };
+  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
+  };
 }
-exports.getCommonDeployArgs = getCommonDeployArgs;
-//# sourceMappingURL=common.js.map
+exports.getCommonDeployArgs = getCommonDeployArgs;

package/dist/pipeline/src/deploy/cloudRun/createJobs/constants.d.ts

@@ -1 +1 @@
-export declare const ENV_VARS_FILENAME = "____envvars.yaml";
+export declare const ENV_VARS_FILENAME = "____envvars.yaml";

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

@@ -1,5 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.ENV_VARS_FILENAME = void 0;
-exports.ENV_VARS_FILENAME = "____envvars.yaml";
-//# sourceMappingURL=constants.js.map
+exports.ENV_VARS_FILENAME = "____envvars.yaml";