@catladder/cli 0.0.0-next-e9e5af68 → 0.0.0-next-aea5d3ad

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

@@ -1,31 +1,28 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDeleteUnusedImagesCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryBuildCacheImage = exports.getArtifactsRegistryImageName = exports.getArtifactsRegistryDockerUrl = exports.getArtifactsRegistryHost = void 0;
 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 `${context.deploy.config.region}-docker.pkg.dev`;
+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 `${context.deploy.config.region}-docker.pkg.dev`;
 };
 exports.getArtifactsRegistryHost = getArtifactsRegistryHost;
-const getArtifactsRegistryDockerUrl = 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");
-  }
-  const fullAppName = `${context.fullConfig.customerName}-${context.fullConfig.appName}`;
-  return `${(0, exports.getArtifactsRegistryHost)(context)}/${deployConfig.projectId}/catladder-deploy/${fullAppName}`;
+const getArtifactsRegistryDockerUrl = (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");
+    }
+    const fullAppName = `${context.fullConfig.customerName}-${context.fullConfig.appName}`;
+    return `${(0, exports.getArtifactsRegistryHost)(context)}/${deployConfig.projectId}/catladder-deploy/${fullAppName}`;
 };
 exports.getArtifactsRegistryDockerUrl = getArtifactsRegistryDockerUrl;
 /**
@@ -33,34 +30,43 @@ 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
  */
 const getArtifactsRegistryImageName = (context, lecacyReviewImageName = false) => {
-  if (lecacyReviewImageName && context.environment.envType !== "review") {
-    throw new Error("lecacyReviewImageName is only allowed for review app");
-  }
-  const dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
-  const gcloudImagePath = [dockerUrl, context.env, context.name, ...(context.environment.reviewSlug && !lecacyReviewImageName ? [context.environment.reviewSlug] : [])];
-  return (0, BashExpression_1.joinBashExpressions)(gcloudImagePath, "/");
+    if (lecacyReviewImageName && context.environment.envType !== "review") {
+        throw new Error("lecacyReviewImageName is only allowed for review app");
+    }
+    const dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
+    const gcloudImagePath = [
+        dockerUrl,
+        context.env,
+        context.name,
+        ...(context.environment.reviewSlug && !lecacyReviewImageName
+            ? [context.environment.reviewSlug]
+            : []),
+    ];
+    return (0, BashExpression_1.joinBashExpressions)(gcloudImagePath, "/");
 };
 exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
-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)
-  const gcloudImagePath = [dockerUrl, "caches", context.name];
-  return gcloudImagePath.join("/");
+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)
+    const gcloudImagePath = [dockerUrl, "caches", context.name];
+    return gcloudImagePath.join("/");
 };
 exports.getArtifactsRegistryBuildCacheImage = getArtifactsRegistryBuildCacheImage;
-const getArtifactsRegistryImage = context => `${(0, exports.getArtifactsRegistryImageName)(context)}:$DOCKER_IMAGE_TAG`;
+const getArtifactsRegistryImage = (context) => `${(0, exports.getArtifactsRegistryImageName)(context)}:$DOCKER_IMAGE_TAG`;
 exports.getArtifactsRegistryImage = getArtifactsRegistryImage;
 const getDeleteImageCommands = (fullImageName, keepNewest = 0) => {
-  if (keepNewest === 0) {
-    // no need to list tags, we delete the whole thing
-    return [`gcloud artifacts docker images delete ${fullImageName} --quiet --delete-tags`];
-  }
-  // delete unused tags
-  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];
+    if (keepNewest === 0) {
+        // no need to list tags, we delete the whole thing
+        return [
+            `gcloud artifacts docker images delete ${fullImageName} --quiet --delete-tags`,
+        ];
+    }
+    // delete unused tags
+    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];
 };
 /**
  * commands to delete unused images.
@@ -70,17 +76,23 @@ const getDeleteImageCommands = (fullImageName, keepNewest = 0) => {
  * @returns
  */
 const getDeleteUnusedImagesCommands = (context, keep = 0) => {
-  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");
-  }
-  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)) : [])];
+    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");
+    }
+    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;
+exports.getDeleteUnusedImagesCommands = getDeleteUnusedImagesCommands;
+//# sourceMappingURL=artifactsRegistry.js.map

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

@@ -1,2 +1,2 @@
 import type { ComponentContext } from "../../types/context";
-export declare const getRemoveOldRevisionsAndImagesCommand: (context: ComponentContext, when: "postDeploy" | "onStop") => string[];
+export declare const getRemoveOldRevisionsAndImagesCommand: (context: ComponentContext, when: "postDeploy" | "onStop") => string[];

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

@@ -1,23 +1,24 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRemoveOldRevisionsAndImagesCommand = void 0;
 const gitlab_1 = require("../../utils/gitlab");
 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
-  const revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
-  // this number needs to be higher than inactive after deploy, so we add one
-  const imagesToKeep = revisionsToKeep + 1;
-  const deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);
-  const deleteOldImagesCommands = (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context, imagesToKeep);
-  return (0, gitlab_1.allowFailureInScripts)([...deleteOldRevisionsCommands, ...deleteOldImagesCommands]);
+    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
+    const revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
+    // this number needs to be higher than inactive after deploy, so we add one
+    const imagesToKeep = revisionsToKeep + 1;
+    const deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);
+    const deleteOldImagesCommands = (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context, imagesToKeep);
+    return (0, gitlab_1.allowFailureInScripts)([
+        ...deleteOldRevisionsCommands,
+        ...deleteOldImagesCommands,
+    ]);
 };
-exports.getRemoveOldRevisionsAndImagesCommand = getRemoveOldRevisionsAndImagesCommand;
+exports.getRemoveOldRevisionsAndImagesCommand = getRemoveOldRevisionsAndImagesCommand;
+//# sourceMappingURL=cleanup.js.map

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

@@ -1,2 +1,2 @@
 import type { ComponentContext } from "../../types/context";
-export declare const getDeleteUnusedRevisionsCommands: (context: ComponentContext, keep: number) => string[];
+export declare const getDeleteUnusedRevisionsCommands: (context: ComponentContext, keep: number) => string[];

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

@@ -1,54 +1,51 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDeleteUnusedRevisionsCommands = void 0;
 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;
-  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");
-  }
-  const filterRevisionArgs = {
-    project: deployConfig.projectId,
-    region: deployConfig.region,
-    // only show inactive revisions
-    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 ${(0, createArgsString_1.createArgsString)(filterRevisionArgs)}`;
+    var _a;
+    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");
+    }
+    const filterRevisionArgs = {
+        project: deployConfig.projectId,
+        region: deployConfig.region,
+        // only show inactive revisions
+        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 ${(0, createArgsString_1.createArgsString)(filterRevisionArgs)}`;
 };
 const getDeleteUnusedRevisionsCommands = (context, keep) => {
-  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");
-  }
-  // this prints out all inactive images of the given app
-  const listAllInactiveRevisionsCmd = getListRevisionsCommand(context, {
-    format: `"value(name)"`,
-    filter: `'(status.conditions.status=False OR status.conditions.status=Unknown)'`
-  });
-  // this removes the newest `revisionsToKeep` images
-  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 `;
-  const deleteRevisionsCmd = `${listRevisionsToDeleteCmd} | while read -r revisionname; do ${deleteRevisionCmd}; done`;
-  return [deleteRevisionsCmd];
+    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");
+    }
+    // this prints out all inactive images of the given app
+    const listAllInactiveRevisionsCmd = getListRevisionsCommand(context, {
+        format: `"value(name)"`,
+        filter: `'(status.conditions.status=False OR status.conditions.status=Unknown)'`,
+    });
+    // this removes the newest `revisionsToKeep` images
+    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 `;
+    const deleteRevisionsCmd = `${listRevisionsToDeleteCmd} | while read -r revisionname; do ${deleteRevisionCmd}; done`;
+    return [deleteRevisionsCmd];
 };
-exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
+exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
+//# sourceMappingURL=cloudRunRevisions.js.map

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

@@ -3,7 +3,7 @@ import type { DeployConfigCloudRunJob } from "../../types/googleCloudRun";
 export declare const getDeleteJobsScripts: (context: ComponentContext) => string[];
 export declare const getJobCreateScripts: (context: ComponentContext) => string[];
 export declare const getCloudRunJobsWithNames: (context: ComponentContext) => {
-  fullJobName: import("../../..").StringOrBashExpression;
-  job: DeployConfigCloudRunJob;
-  jobName: string;
-}[];
+    fullJobName: import("../../..").StringOrBashExpression;
+    job: DeployConfigCloudRunJob;
+    jobName: string;
+}[];

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

@@ -1,8 +1,5 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+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");
@@ -12,62 +9,70 @@ const common_1 = require("./common");
 const constants_1 = require("./constants");
 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}`]);
+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 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");
+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 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;
+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;
 };
-exports.getCloudRunJobsWithNames = getCloudRunJobsWithNames;
+exports.getCloudRunJobsWithNames = getCloudRunJobsWithNames;
+//# sourceMappingURL=cloudRunJobs.js.map

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,8 +1,5 @@
 "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");
@@ -13,68 +10,81 @@ 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, _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}`;
+    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;
-const requiresBeta = config => {
-  if (!config) {
+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;
-  }
-  if (config.gpuType) {
-    return true;
-  }
-  if (config.gpu && config.gpu > 0) {
-    return true;
-  }
-  if (config.healthCheck !== undefined) {
-    return true;
-  }
-  return false;
-};
+};
+//# sourceMappingURL=cloudRunServices.js.map