@catladder/cli 0.0.0-new-release-a895e12e → 0.0.0-new-cli-80ac360a

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

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCreateScheduleScript = exports.getDeleteSchedulesScript = void 0;
 const bash_1 = require("../../../../bash");
 const utils_1 = require("../../../../utils");
@@ -8,129 +11,123 @@ 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();
+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");
+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}`);
+  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 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 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]];
-    }));
-};
-//# sourceMappingURL=schedules.js.map
+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/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,9 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCloudRunDeployScripts = void 0;
 const lodash_1 = require("lodash");
 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");
@@ -12,37 +14,15 @@ const gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccou
 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, 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)),
-            ...(0, onDeploy_1.getOnDeployExecuteScript)(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_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,iDAAqD;AACrD,iDAA8D;AAC9D,yDAA4D;AAC5D,qCAGkB;AAClB,2CAAgD;AAChD,mDAA8D;AAG9D,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,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,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;QACD,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC;AArDD,4DAqDC"}
+{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,mCAA8B;AAE9B,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,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,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,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,CAAC;iBACxE,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;AA7DD,4DA6DC"}

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,7 +1,9 @@
 "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");
@@ -9,26 +11,12 @@ 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, 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)),
-        ...(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
-        ...(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,iDAAsD;AACtD,iDAA8D;AAC9D,mDAA+D;AAC/D,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,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,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;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

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

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

@@ -1,51 +1,48 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+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)),
-        };
-    }
+  const shouldNotSetHealthCheck = healthCheck === undefined;
+  if (shouldNotSetHealthCheck) {
+    return undefined;
+  }
+  const shouldUseDefaultProbe = healthCheck === true;
+  if (shouldUseDefaultProbe) {
     return {
-        "startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
-        "liveness-probe": healthCheck.livenessProbe
-            ? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe))
-            : "", // NOTE: empty string ("") removes liveness probe
+      "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 [];
-    }
+  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(",");
-}
-//# sourceMappingURL=healthCheck.js.map
+  return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
+}

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"}