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

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentContext } from "../../../../types/context";
+import type { DeployConfigCloudRunExecuteOnDeploy } from "../../../types/googleCloudRun";
+export declare const getOnDeployExecuteScript: (context: ComponentContext, when: DeployConfigCloudRunExecuteOnDeploy["when"]) => string[];

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getOnDeployExecuteScript = void 0;
+const utils_1 = require("../../../../utils");
+const createArgsString_1 = require("../../utils/createArgsString");
+const getJobOrServiceArgs_1 = require("../../utils/getJobOrServiceArgs");
+const jobName_1 = require("../../utils/jobName");
+const cloudRunJobs_1 = require("../cloudRunJobs");
+const common_1 = require("../common");
+const getOnDeployExecuteScript = (context, when) => {
+  const executes = getExecutes(context);
+  return executes.filter(config => config.when === when).flatMap(execute => {
+    return getJobRunScriptForExecute(context, execute);
+  });
+};
+exports.getOnDeployExecuteScript = getOnDeployExecuteScript;
+const getExecutes = context => {
+  var _a;
+  const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return [...getLegacyExecutes(context), ...Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
+    // remove all schedule executes
+    if (!value) {
+      return [];
+    }
+    return [value];
+  })];
+};
+const getLegacyExecutes = context => {
+  const jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+  return jobsWithNames.flatMap(({
+    jobName,
+    job
+  }) => {
+    if (!job.when || !["preDeploy", "postDeploy", "preStop", "postStop"].includes(job.when)) {
+      return [];
+    }
+    return [{
+      job: jobName,
+      type: "job",
+      when: job.when,
+      ...(job.when === "preDeploy" || job.when === "postDeploy" ? {
+        waitForCompletion: job.waitForCompletion
+      } : {})
+    }];
+  });
+};
+const getJobRunScriptForExecute = (context, config) => {
+  var _a;
+  const type = config.type;
+  if (type === "script") {
+    return (0, utils_1.ensureArray)(config.script);
+  } else if (type === "job") {
+    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+    // always wait for completion for preStop and postStop jobs
+    // since stop will delete the jobs afterwards, so they will fail
+    const waitForCompletion = ["preStop", "postStop"].includes(config.when) ? true // always
+    : "waitForCompletion" in config ? (_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false // depends on config
+    : false;
+    const argString = (0, createArgsString_1.createArgsString)({
+      ...commonArgs,
+      wait: waitForCompletion === true ? true : undefined,
+      args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args)
+    });
+    const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
+    return [`${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`];
+  }
+  throw new Error(`unsupported execute type: ${type}`);
+};

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js.map

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

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentContext } from "../../../../types/context";
+export declare const getDeleteSchedulesScript: (context: ComponentContext) => string[];
+export declare const getCreateScheduleScript: (context: ComponentContext) => string[];

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.js

@@ -0,0 +1,133 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCreateScheduleScript = exports.getDeleteSchedulesScript = void 0;
+const bash_1 = require("../../../../bash");
+const utils_1 = require("../../../../utils");
+const cloudRunExecutionUrl_1 = require("../../utils/cloudRunExecutionUrl");
+const createArgsString_1 = require("../../utils/createArgsString");
+const jobName_1 = require("../../utils/jobName");
+const cloudRunJobs_1 = require("../cloudRunJobs");
+const common_1 = require("../common");
+const getDeleteSchedulesScript = context => {
+  const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  const schedules = getSchedules(context);
+  const argsString = (0, createArgsString_1.createArgsString)({
+    project: deployConfig.projectId,
+    location: deployConfig.region
+  });
+  return schedules.map(({
+    fullName
+  }) => {
+    return [`${(0, common_1.gcloudSchedulerCmd)()} jobs delete ${fullName} ${argsString}`];
+  }).flat();
+};
+exports.getDeleteSchedulesScript = getDeleteSchedulesScript;
+const getCreateScheduleScript = context => {
+  const schedules = getSchedules(context);
+  const {
+    region: location,
+    projectId: project
+  } = (0, common_1.getCloudRunDeployConfig)(context);
+  return schedules.map(({
+    fullName,
+    config
+  }, jobIndex) => {
+    var _a;
+    const {
+      uri,
+      ...args
+    } = getSchedulerArgs(config, context);
+    const argsString = (0, createArgsString_1.createArgsString)({
+      project,
+      location,
+      uri: `"$current_job_uri"`,
+      ...args,
+      schedule: `"${config.schedule}"`,
+      "max-retry-attempts": (_a = config.maxRetryAttempts) !== null && _a !== void 0 ? _a : 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="${uri}"`, `current_scheduler_name="${fullName}"`, `if echo "$exist_scheduler_names" | grep -Fx "$current_scheduler_name" >/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.getCreateScheduleScript = getCreateScheduleScript;
+const getSchedulerArgs = (scheduler, context) => {
+  var _a;
+  if (scheduler.type === "job") {
+    const {
+      projectId,
+      region
+    } = (0, common_1.getCloudRunDeployConfig)(context);
+    const body = scheduler.args !== undefined ? {
+      overrides: {
+        containerOverrides: [((_a = scheduler.args) === null || _a === void 0 ? void 0 : _a.length) > 0 ? {
+          args: scheduler.args
+        } : {
+          args: [],
+          clearArgs: true // not sure why this is neeeded, but it is
+        }]
+      }
+    } : null;
+    return {
+      uri: (0, cloudRunExecutionUrl_1.getCloudRunJobExecuteUrl)(scheduler.job, {
+        appFullName: context.environment.fullName,
+        projectId,
+        region
+      }),
+      "message-body": body ? '"' + (0, bash_1.bashEscape)(JSON.stringify(body)) + '"' : undefined,
+      "http-method": "POST",
+      "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`
+    };
+  }
+  if (scheduler.type === "http") {
+    return {
+      uri: scheduler.url,
+      "message-body": scheduler.body,
+      "http-method": scheduler.method,
+      "oidc-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`
+    };
+  }
+  throw new Error(`Unknown scheduler type: ${scheduler.type}`);
+};
+const getSchedules = context => {
+  const legacyScheduleJobs = getLegacyJobSchedules(context);
+  const schedules = getScheduledExecutes(context);
+  return Object.entries({
+    ...legacyScheduleJobs,
+    ...schedules
+  }).map(([name, config]) => ({
+    name,
+    fullName: (0, jobName_1.getFullSchedulerName)(context, name),
+    config
+  }));
+};
+const getLegacyJobSchedules = context => {
+  const jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+  return Object.fromEntries(jobsWithNames.filter(entry => entry.job.when === "schedule").map(({
+    job: {
+      maxRetryAttempts,
+      schedule
+    },
+    jobName
+  }) => {
+    const schedulerName = jobName.concat("-scheduler");
+    return [schedulerName, {
+      type: "job",
+      job: jobName,
+      maxRetryAttempts,
+      schedule,
+      when: "schedule"
+    }];
+  }));
+};
+const getScheduledExecutes = context => {
+  var _a;
+  const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return Object.fromEntries(Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
+    if (!value || value.when !== "schedule") {
+      return [];
+    }
+    return [[key, value]];
+  }));
+};

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.js.map

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

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

@@ -1,2 +1,2 @@
 import type { ComponentContext } from "../../../types/context";
-export declare function getCloudRunDeployScripts(context: ComponentContext): string[];
+export declare function getCloudRunDeployScripts(context: ComponentContext): string[];

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

@@ -1,44 +1,28 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCloudRunDeployScripts = void 0;
-const lodash_1 = require("lodash");
+const lodash_es_1 = require("lodash-es");
 const gitlab_1 = require("../../../utils/gitlab");
-const sbom_1 = require("../../sbom");
 const __1 = require("..");
 const bashYaml_1 = require("../../../bash/bashYaml");
 const cleanup_1 = require("../cleanup");
 const database_1 = require("../utils/database");
 const gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
 const cloudRunJobs_1 = require("./cloudRunJobs");
+const onDeploy_1 = require("./execute/onDeploy");
 const cloudRunServices_1 = require("./cloudRunServices");
+const cloudRunWorkerPools_1 = require("./cloudRunWorkerPools");
 const common_1 = require("./common");
 const constants_1 = require("./constants");
+const schedules_1 = require("./execute/schedules");
 function getCloudRunDeployScripts(context) {
-    var _a;
-    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    const allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-    return [
-        ...(0, gitlab_1.collapseableSection)("prepare", "Prepare...")([
-            ...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context),
-            ...(0, common_1.setGoogleProjectNumberScript)(deployConfig),
-        ]),
-        ...(0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME)),
-        ...(0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")([
-            ...(deployConfig.cloudSql
-                ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
-                : []),
-            ...(0, cloudRunJobs_1.getCreateScheduleScripts)(context),
-            ...(0, cloudRunJobs_1.getJobCreateScripts)(context),
-            ...(0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy"),
-            ...(deployConfig.service !== false
-                ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)]
-                : []),
-            ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(([name, service]) => (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name)),
-            ...(0, cloudRunJobs_1.getJobRunScripts)(context, "postDeploy"),
-        ]),
-        ...(0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy")),
-        ...(0, sbom_1.getDependencyTrackUploadScript)(context),
-    ];
+  var _a, _b;
+  const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  const allEnvVars = (0, lodash_es_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+  return [...(0, gitlab_1.collapseableSection)("prepare", "Prepare...")([...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context), ...(0, common_1.setGoogleProjectNumberScript)(deployConfig)]), ...(0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME)), ...(0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")([...(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  : []), ...(0, schedules_1.getCreateScheduleScript)(context), ...(0, cloudRunJobs_1.getJobCreateScripts)(context), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "preDeploy"), ...(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(([_, service]) => service !== false && service !== null).map(([name, service]) => (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name)), ...Object.entries((_b = deployConfig.workerPools) !== null && _b !== void 0 ? _b : {}).filter(([_, workerPool]) => workerPool !== false && workerPool !== null).map(([name, workerPool]) => (0, cloudRunWorkerPools_1.getWorkerPoolDeployScript)(context, workerPool, name)), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")]), ...(0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))];
 }
-exports.getCloudRunDeployScripts = getCloudRunDeployScripts;
-//# sourceMappingURL=getCloudRunDeployScripts.js.map
+exports.getCloudRunDeployScripts = getCloudRunDeployScripts;

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

@@ -1 +1 @@
-{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAE9B,kDAA4D;AAC5D,qCAA4D;AAE5D,0BAAmD;AACnD,qDAAmE;AACnE,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAIwB;AACxB,yDAA4D;AAC5D,qCAGkB;AAClB,2CAAgD;AAEhD,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,aAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,OAAO;QACL,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,CAAC;YACA,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;YAC7C,GAAG,IAAA,qCAA4B,EAAC,YAAY,CAAC;SAC9C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC;QAE3D,GAAG,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACA,GAAG,CAAC,YAAY,CAAC,QAAQ;gBACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;gBAC9G,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,IAAA,uCAAwB,EAAC,OAAO,CAAC;YACpC,GAAG,IAAA,kCAAmB,EAAC,OAAO,CAAC;YAC/B,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,WAAW,CAAC;YAEzC,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;gBAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;gBACzD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,GAAG,CAC1D,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAClB,IAAA,yCAAsB,EAAC,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC,CACvD;YACD,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,YAAY,CAAC;SAC3C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D;QACD,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AAhDD,4DAgDC"}
+{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AAEjC,kDAA4D;AAE5D,0BAAmD;AACnD,qDAAmE;AACnE,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAAqD;AACrD,iDAA8D;AAC9D,yDAA4D;AAC5D,+DAAkE;AAClE,qCAGkB;AAClB,2CAAgD;AAChD,mDAA8D;AAM9D,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,gBAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,OAAO;QACL,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,CAAC;YACA,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;YAC7C,GAAG,IAAA,qCAA4B,EAAC,YAAY,CAAC;SAC9C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC;QAE3D,GAAG,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACA,GAAG,CAAC,YAAY,CAAC,QAAQ;gBACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;gBAC9G,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,IAAA,mCAAuB,EAAC,OAAO,CAAC;YACnC,GAAG,IAAA,kCAAmB,EAAC,OAAO,CAAC;YAC/B,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,WAAW,CAAC;YAEjD,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;gBAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;gBACzD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;iBACrD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,IAAI,CAAC;iBAC/D,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CACvB,IAAA,yCAAsB,EACpB,OAAO,EACP,OAAsC,EACtC,GAAG,GAAG,IAAI,CACX,CACF;YACH,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,WAAW,mCAAI,EAAE,CAAC;iBAC9C,MAAM,CACL,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,CACjE;iBACA,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAC1B,IAAA,+CAAyB,EACvB,OAAO,EACP,UAA4C,EAC5C,IAAI,CACL,CACF;YACH,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,YAAY,CAAC;SACnD,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D;KACF,CAAC;AACJ,CAAC;AA/DD,4DA+DC"}

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

@@ -1,2 +1,2 @@
 import type { ComponentContext } from "../../../types/context";
-export declare function getCloudRunStopScripts(context: ComponentContext): string[];
+export declare function getCloudRunStopScripts(context: ComponentContext): string[];

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

@@ -1,30 +1,22 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCloudRunStopScripts = void 0;
-const sbom_1 = require("../../sbom");
 const cleanup_1 = require("../cleanup");
 const database_1 = require("../utils/database");
 const gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
 const cloudRunJobs_1 = require("./cloudRunJobs");
+const onDeploy_1 = require("./execute/onDeploy");
+const schedules_1 = require("./execute/schedules");
 const cloudRunServices_1 = require("./cloudRunServices");
+const cloudRunWorkerPools_1 = require("./cloudRunWorkerPools");
 const common_1 = require("./common");
 function getCloudRunStopScripts(context) {
-    var _a;
-    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    return [
-        ...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context),
-        ...(0, cloudRunJobs_1.getJobRunScripts)(context, "preStop"),
-        ...(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []),
-        ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).flatMap(([name]) => (0, cloudRunServices_1.getServiceDeleteScript)(context, name)),
-        ...(0, cloudRunJobs_1.getJobRunScripts)(context, "postStop"),
-        ...(0, cloudRunJobs_1.getDeleteSchedulesScripts)(context),
-        ...(0, cloudRunJobs_1.getDeleteJobsScripts)(context),
-        ...(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop
-            ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig)
-            : []),
-        ...(0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop"), // we cleanup inactive images both on deploy and stop
-        ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
-    ];
+  var _a, _b;
+  const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return [...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "preStop"), ...(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(([_, service]) => service !== false && service !== null).flatMap(([name]) => (0, cloudRunServices_1.getServiceDeleteScript)(context, name)), ...Object.entries((_b = deployConfig.workerPools) !== null && _b !== void 0 ? _b : {}).filter(([_, workerPool]) => workerPool !== false && workerPool !== null).flatMap(([name]) => (0, cloudRunWorkerPools_1.getWorkerPoolDeleteScript)(context, name)), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "postStop"), ...(0, schedules_1.getDeleteSchedulesScript)(context), ...(0, cloudRunJobs_1.getDeleteJobsScripts)(context), ...(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), ...(0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop") // we cleanup inactive images both on deploy and stop
+  ];
 }
-exports.getCloudRunStopScripts = getCloudRunStopScripts;
-//# sourceMappingURL=getCloudRunStopScripts.js.map
+exports.getCloudRunStopScripts = getCloudRunStopScripts;

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

@@ -1 +1 @@
-{"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;AACA,qCAA4D;AAE5D,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAIwB;AACxB,yDAA4D;AAC5D,qCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,OAAyB;;IAC9D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;QAC7C,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC;QACvC,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAC1E,IAAA,yCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CACtC;QACD,GAAG,IAAA,+BAAgB,EAAC,OAAO,EAAE,UAAU,CAAC;QACxC,GAAG,IAAA,wCAAyB,EAAC,OAAO,CAAC;QACrC,GAAG,IAAA,mCAAoB,EAAC,OAAO,CAAC;QAChC,GAAG,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB;YACrE,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QAEP,GAAG,IAAA,+CAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,qDAAqD;QAClH,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AAnBD,wDAmBC"}
+{"version":3,"file":"getCloudRunStopScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunStopScripts.ts"],"names":[],"mappings":";;;AAEA,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAAsD;AACtD,iDAA8D;AAC9D,mDAA+D;AAC/D,yDAA4D;AAC5D,+DAAkE;AAClE,qCAAmD;AAEnD,SAAgB,sBAAsB,CAAC,OAAyB;;IAC9D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;QAC7C,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,SAAS,CAAC;QAC/C,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;aACrD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,IAAI,CAAC;aAC/D,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7D,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,WAAW,mCAAI,EAAE,CAAC;aAC9C,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,CAAC;aACxE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAA,+CAAyB,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAChE,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,UAAU,CAAC;QAChD,GAAG,IAAA,oCAAwB,EAAC,OAAO,CAAC;QACpC,GAAG,IAAA,mCAAoB,EAAC,OAAO,CAAC;QAChC,GAAG,CAAC,YAAY,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB;YACrE,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC;YAChD,CAAC,CAAC,EAAE,CAAC;QAEP,GAAG,IAAA,+CAAqC,EAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,qDAAqD;KACnH,CAAC;AACJ,CAAC;AArBD,wDAqBC"}

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

@@ -0,0 +1,5 @@
+import { type DeployConfigCloudRunService } from "../../types";
+export declare function healthCheckCliArgs(healthCheck: DeployConfigCloudRunService["healthCheck"]): {
+  "startup-probe": string;
+  "liveness-probe": string;
+};

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

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.healthCheckCliArgs = void 0;
+const types_1 = require("../../types");
+const PORT = 8080;
+function healthCheckCliArgs(healthCheck) {
+  const shouldNotSetHealthCheck = healthCheck === undefined;
+  if (shouldNotSetHealthCheck) {
+    return undefined;
+  }
+  const shouldUseDefaultProbe = healthCheck === true;
+  if (shouldUseDefaultProbe) {
+    return {
+      "startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
+      "liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe))
+    };
+  }
+  return {
+    "startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
+    "liveness-probe": healthCheck.livenessProbe ? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe)) : "" // NOTE: empty string ("") removes liveness probe
+  };
+}
+exports.healthCheckCliArgs = healthCheckCliArgs;
+function probeToKeyValuePairs(probe) {
+  const sharedArgs = Object.entries({
+    initialDelaySeconds: probe.initialDelaySeconds,
+    timeoutSeconds: probe.timeoutSeconds,
+    periodSeconds: probe.periodSeconds,
+    failureThreshold: probe.failureThreshold
+  });
+  switch (probe.type) {
+    case "tcp":
+      return [...sharedArgs, ["tcpSocket.port", PORT]];
+    case "http1":
+      return [...sharedArgs, ["httpGet.port", PORT], ["httpGet.path", probe.path]
+      // NOTE: headers are not supported by "gcloud beta" at the moment
+      ];
+    default:
+      probe;
+      return [];
+  }
+}
+function toArgValue(keyValues) {
+  return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
+}

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

@@ -0,0 +1 @@
+{"version":3,"file":"healthCheck.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/healthCheck.ts"],"names":[],"mappings":";;;AACA,uCAKqB;AAErB,MAAM,IAAI,GAAG,IAAI,CAAC;AAElB,SAAgB,kBAAkB,CAChC,WAAuD;IAEvD,MAAM,uBAAuB,GAAG,WAAW,KAAK,SAAS,CAAC;IAC1D,IAAI,uBAAuB,EAAE,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,qBAAqB,GAAG,WAAW,KAAK,IAAI,CAAC;IAEnD,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO;YACL,eAAe,EAAE,UAAU,CAAC,oBAAoB,CAAC,2BAAmB,CAAC,CAAC;YACtE,gBAAgB,EAAE,UAAU,CAAC,oBAAoB,CAAC,4BAAoB,CAAC,CAAC;SACzE,CAAC;IACJ,CAAC;IAED,OAAO;QACL,eAAe,EAAE,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC3E,gBAAgB,EAAE,WAAW,CAAC,aAAa;YACzC,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAC7D,CAAC,CAAC,EAAE,EAAE,iDAAiD;KAC1D,CAAC;AACJ,CAAC;AAvBD,gDAuBC;AAED,SAAS,oBAAoB,CAC3B,KAAgC;IAEhC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACC,CAAC,CAAC;IAE7C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,KAAK;YACR,OAAO,CAAC,GAAG,UAAU,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;QACnD,KAAK,OAAO;YACV,OAAO;gBACL,GAAG,UAAU;gBACb,CAAC,cAAc,EAAE,IAAI,CAAC;gBACtB,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC;gBAC5B,iEAAiE;aAClE,CAAC;QACJ;YACE,KAAqB,CAAC;YACtB,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,SAA8B;IAChD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACtE,CAAC"}

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

@@ -1,3 +1,3 @@
 import type { ComponentContext } from "../../../types/context";
 import type { CatladderJob } from "../../../types/jobs";
-export declare const createGoogleCloudRunDeployJobs: (context: ComponentContext) => CatladderJob[];
+export declare const createGoogleCloudRunDeployJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createGoogleCloudRunDeployJobs = void 0;
 const runner_1 = require("../../../runner");
 const gitlab_1 = require("../../../utils/gitlab");
@@ -8,41 +11,37 @@ const types_1 = require("../../types");
 const constants_1 = require("./constants");
 const getCloudRunDeployScripts_1 = require("./getCloudRunDeployScripts");
 const getCloudRunStopScripts_1 = require("./getCloudRunStopScripts");
-const createGoogleCloudRunDeployJobs = (context) => {
-    var _a;
-    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 createGoogleCloudRunDeployJobs = 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 deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
+  const stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
+  return (0, base_1.createDeployementJobs)(context, {
+    deploy: {
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+      },
+      ...(deployConfig.debug ? {
+        artifacts: {
+          paths: [constants_1.ENV_VARS_FILENAME // debug
+          ],
+          when: "always"
+        }
+      } : {}),
+      image: (0, runner_1.getRunnerImage)("gcloud"),
+      script: deployScripts
+    },
+    stop: {
+      image: (0, runner_1.getRunnerImage)("gcloud"),
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+      },
+      script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
     }
-    const deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
-    const stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
-    return (0, base_1.createDeployementJobs)(context, {
-        deploy: {
-            variables: {
-                CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
-            },
-            ...(deployConfig.debug
-                ? {
-                    artifacts: {
-                        paths: [
-                            constants_1.ENV_VARS_FILENAME, // debug
-                        ],
-                        when: "always",
-                    },
-                }
-                : {}),
-            image: (0, runner_1.getRunnerImage)("gcloud"),
-            script: deployScripts,
-        },
-        stop: {
-            image: (0, runner_1.getRunnerImage)("gcloud"),
-            variables: {
-                CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
-            },
-            script: (0, gitlab_1.allowFailureInScripts)(stopScripts),
-        },
-    });
+  });
 };
-exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
-//# sourceMappingURL=index.js.map
+exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;

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

@@ -1,3 +1,3 @@
 import type { DeployConfigCloudRunVolumes } from "../../types";
 import type { keyValuesArg } from "../utils/createArgsString";
-export declare const createVolumeConfig: (volumes: DeployConfigCloudRunVolumes | undefined, type: "service" | "job") => keyValuesArg[];
+export declare const createVolumeConfig: (volumes: DeployConfigCloudRunVolumes | undefined, type: "service" | "job" | "worker-pool") => keyValuesArg[];

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

@@ -1,17 +1,23 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createVolumeConfig = void 0;
 const createVolumeConfig = (volumes, type) => {
-    if (!volumes) {
-        return [];
-    }
-    return [
-        ...Object.entries(volumes).map(([volumeName, { type, bucket, mountPath, readonly }]) => ({
-            "add-volume": `name=${volumeName},type=${type},bucket=${bucket}${readonly ? ",readonly=true" : ""}`,
-            "add-volume-mount": `volume=${volumeName},mount-path=${mountPath}`,
-        })),
-        type === "service" ? { "execution-environment": "gen2" } : {},
-    ];
+  if (!volumes) {
+    return [];
+  }
+  return [...Object.entries(volumes).map(([volumeName, {
+    type,
+    bucket,
+    mountPath,
+    readonly
+  }]) => ({
+    "add-volume": `name=${volumeName},type=${type},bucket=${bucket}${readonly ? ",readonly=true" : ""}`,
+    "add-volume-mount": `volume=${volumeName},mount-path=${mountPath}`
+  })), type === "service" ? {
+    "execution-environment": "gen2"
+  } : {}];
 };
-exports.createVolumeConfig = createVolumeConfig;
-//# sourceMappingURL=volumes.js.map
+exports.createVolumeConfig = createVolumeConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"volumes.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/volumes.ts"],"names":[],"mappings":";;;AAGO,MAAM,kBAAkB,GAAG,CAChC,OAAgD,EAChD,IAAuB,EACP,EAAE;IAClB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO;QACL,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC5B,CAAC,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACxD,YAAY,EAAE,QAAQ,UAAU,SAAS,IAAI,WAAW,MAAM,GAC5D,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAChC,EAAE;YACF,kBAAkB,EAAE,UAAU,UAAU,eAAe,SAAS,EAAE;SACnE,CAAC,CACH;QACD,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;KAC9D,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B"}
+{"version":3,"file":"volumes.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/volumes.ts"],"names":[],"mappings":";;;AAGO,MAAM,kBAAkB,GAAG,CAChC,OAAgD,EAChD,IAAuC,EACvB,EAAE;IAClB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO;QACL,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC5B,CAAC,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACxD,YAAY,EAAE,QAAQ,UAAU,SAAS,IAAI,WAAW,MAAM,GAC5D,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAChC,EAAE;YACF,kBAAkB,EAAE,UAAU,UAAU,eAAe,SAAS,EAAE;SACnE,CAAC,CACH;QACD,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,uBAAuB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;KAC9D,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B"}

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

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