@catladder/cli 0.0.0-main-c595e7af → 0.0.0-main-b38c122b

package/dist/bundles/catenv/index.js

@@ -1057,7 +1057,7 @@ const lodash_1 = __nccwpck_require__(3255);
 const __1 = __nccwpck_require__(603);
 const utils_1 = __nccwpck_require__(2497);
 const createBuildJobArtifact_1 = __nccwpck_require__(8774);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const yarn_1 = __nccwpck_require__(5043);
 const constants_1 = __nccwpck_require__(2786);
 const writeBuildInfo_1 = __nccwpck_require__(9578);
@@ -1296,7 +1296,7 @@ exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDot
 
 /***/ }),
 
-/***/ 4372:
+/***/ 340:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -1352,8 +1352,8 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
 };
 exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
 /** shortcut, used in some build types */
-const createJobCacheFromConfig = (context, buildConfig) => {
-    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+const createJobCacheFromConfig = (context, configWithCache) => {
+    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, configWithCache));
 };
 exports.createJobCacheFromConfig = createJobCacheFromConfig;
 //# sourceMappingURL=createJobCache.js.map
@@ -1369,15 +1369,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getAllCacheConfigsFromConfig = void 0;
 const index_1 = __nccwpck_require__(2497);
 const transformLegacyJobCache_1 = __nccwpck_require__(6673);
-const getAllCacheConfigsFromConfig = (context, buildConfig) => {
+const getAllCacheConfigsFromConfig = (context, configWithCache) => {
     return [
-        ...("jobCache" in buildConfig
-            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache)
+        ...("jobCache" in configWithCache
+            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(configWithCache.jobCache)
             : []),
-        ...(0, index_1.ensureArray)(buildConfig.cache).map((c) => ({
-            ...c,
-            context,
-        })),
+        ...(0, index_1.ensureArray)(configWithCache.cache),
         ...(context.type === "workspace"
             ? // also add cache configs of the components of that workspace
                 context.components.flatMap((componentContext) => {
@@ -1476,7 +1473,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomTestJobs = void 0;
 const utils_1 = __nccwpck_require__(2497);
 const createArtifactsConfig_1 = __nccwpck_require__(2820);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const types_1 = __nccwpck_require__(4466);
 const RUNNER_CUSTOM_TEST_VARIABLES = {
     KUBERNETES_CPU_REQUEST: "0.45",
@@ -1561,7 +1558,7 @@ const artifactsRegistry_1 = __nccwpck_require__(4963);
 const gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(6320);
 const runner_1 = __nccwpck_require__(4058);
 const gitlab_1 = __nccwpck_require__(8490);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.45",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -2070,7 +2067,7 @@ const createArtifactsConfig_1 = __nccwpck_require__(2820);
 const cache_1 = __nccwpck_require__(2026);
 const constants_1 = __nccwpck_require__(1765);
 const yarn_1 = __nccwpck_require__(5043);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const createNodeTestJobs = (context) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     // don't run tests after release
@@ -3306,6 +3303,7 @@ exports.BASE_RETRY = {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+const createJobCache_1 = __nccwpck_require__(340);
 const docker_1 = __nccwpck_require__(9641);
 const sbom_1 = __nccwpck_require__(7038);
 const context_1 = __nccwpck_require__(1724);
@@ -3337,7 +3335,9 @@ const createDeployJob = (context, jobDefinition) => {
         name: exports.DEPLOY_JOB_NAME,
         script: jobDefinition.script,
         image: jobDefinition.image,
-        cache: jobDefinition.cache,
+        cache: jobDefinition.cache
+            ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache)
+            : undefined,
         artifacts: jobDefinition.artifacts,
         services: jobDefinition.services,
         envMode: "stagePerEnv", // makes it easier to run manual tasks er env
@@ -3736,13 +3736,13 @@ exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
-const gitlab_1 = __nccwpck_require__(8490);
 const createArgsString_1 = __nccwpck_require__(9598);
 const jobName_1 = __nccwpck_require__(9626);
 const common_1 = __nccwpck_require__(3325);
 const getLabels_1 = __nccwpck_require__(920);
 const volumes_1 = __nccwpck_require__(847);
 const constants_1 = __nccwpck_require__(8865);
+const utils_1 = __nccwpck_require__(2497);
 const getJobRunScriptForJob = (context, jobName, wait) => {
     const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
     const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -3784,76 +3784,90 @@ const getJobRunScripts = (context, when) => {
     ["preStop", "postStop"].includes(when)));
 };
 exports.getJobRunScripts = getJobRunScripts;
-const getJobCreateScripts = (context) => {
-    const jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames
-        .map(({ job, jobName }) => getJobCreateScriptsForJob(context, jobName, job))
-        .flat();
-};
-exports.getJobCreateScripts = getJobCreateScripts;
-const getJobCreateScriptsForJob = (context, jobName, job) => {
-    const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
-    // due to some oversight from google, jobs create does not yet accept `--add-volume` 🤦
-    // lucky, update on the other hand accepts it... so let's just imediatly update it
-    // we cannot upsert a job, so we have to create it and catch the error and then update
-    const commandArray = Array.isArray(job.command)
-        ? job.command
-        : job.command.split(" ");
+const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map(({ job: { command, image, cpu, memory = "512Mi", timeout = "10m", parallelism = 1, volumes, }, jobName, }, jobIndex) => {
+    const commandArray = Array.isArray(command)
+        ? command
+        : command.split(" ");
+    const { image: commonImage, project, region, ...deployArgs } = (0, common_1.getCommonDeployArgs)(context);
     const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
-        command: '"' + commandArray.join(",") + '"',
-        ...commonDeployArgs,
-        labels: (0, common_1.makeLabelString)({
-            ...(0, getLabels_1.getLabels)(context),
-            "cloud-run-job-name": jobName.toString(),
-        }),
-        image: job.image || commonDeployArgs.image,
-        cpu: job === null || job === void 0 ? void 0 : job.cpu,
-        memory: job.memory || "512Mi",
-        "task-timeout": job.timeout || "10m",
-        parallelism: job.parallelism || 1,
+        command: `"${commandArray.join(",")}"`,
+        labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
+        image: `"${image !== null && image !== void 0 ? image : commonImage}"`,
+        project,
+        region,
+        cpu,
+        memory,
+        parallelism,
+        "task-timeout": timeout,
         "env-vars-file": constants_1.ENV_VARS_FILENAME,
         "max-retries": 0,
+        ...deployArgs,
     });
-    const requiresBeta = (job === null || job === void 0 ? void 0 : job.volumes) && Object.keys(job === null || job === void 0 ? void 0 : job.volumes).length > 0;
-    const argsString = `${jobName} ${commonDeployArgsString}`;
+    // due to some oversight from google, jobs create does not yet accept `--add-volume` 🤦
+    // lucky, update on the other hand accepts it... so let's just imediatly update it
+    // we cannot upsert a job, so we have to create it and catch the error and then update
+    const hasVolumes = Object.keys(volumes || {}).length > 0;
+    const needsBeta = hasVolumes ? "beta" : undefined;
+    const volumeArgs = hasVolumes
+        ? (0, createArgsString_1.createArgsString)(...(0, volumes_1.createVolumeConfig)(volumes, "job"))
+        : "";
     return [
-        ...(0, gitlab_1.allowFailureInScripts)([`${(0, common_1.gcloudRunCmd)()} jobs create ${argsString}`]),
-        `${(0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined)} jobs update ${argsString} ${(0, createArgsString_1.createArgsString)(...(0, volumes_1.createVolumeConfig)(job === null || job === void 0 ? void 0 : job.volumes, "job"))}`,
-    ];
-};
+        jobIndex === 0
+            ? `exist_job_names="$(\n  ${(0, common_1.gcloudRunCmd)()} jobs list --filter='metadata.name ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --project='${project}' --region='${region}'\n)"`
+            : null,
+        `current_job_name="${jobName}"`,
+        'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then',
+        `  ${(0, common_1.gcloudRunCmd)(needsBeta)} jobs update "$current_job_name" ${commonDeployArgsString} ${volumeArgs}`,
+        "else",
+        `  ${(0, common_1.gcloudRunCmd)()} jobs create "$current_job_name" ${commonDeployArgsString}`,
+        "fi",
+    ]
+        .filter(utils_1.notNil)
+        .join("\n");
+});
+exports.getJobCreateScripts = getJobCreateScripts;
 const getCreateScheduleScripts = (context) => {
     const jobsWithSchedule = getCloudRunJobsWithSchedule(context);
-    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    return jobsWithSchedule
-        .map(({ job, jobName, schedulerName }) => {
-        var _a;
+    const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
+    const uriBase = `https://${location}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${project}/jobs`;
+    const gcloudArgs = {
+        project,
+        location,
+        uri: `"$current_job_uri"`,
+        "http-method": "POST",
+        "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
+    };
+    return jobsWithSchedule.map(({ job: { maxRetryAttempts, schedule }, jobName, schedulerName }, jobIndex) => {
         const argsString = (0, createArgsString_1.createArgsString)({
-            project: deployConfig.projectId,
-            location: deployConfig.region,
-            schedule: `"${job.schedule}"`,
-            "max-retry-attempts": (_a = job.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0,
-            uri: `"https://${deployConfig.region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${deployConfig.projectId}/jobs/${jobName}:run"`,
-            "http-method": "POST",
-            "oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
+            ...gcloudArgs,
+            schedule: `"${schedule}"`,
+            "max-retry-attempts": maxRetryAttempts !== null && maxRetryAttempts !== void 0 ? maxRetryAttempts : 0,
         });
-        const commonArgs = `http ${schedulerName} ${argsString}`;
         return [
-            ...(0, gitlab_1.allowFailureInScripts)([
-                `${(0, common_1.gcloudSchedulerCmd)()} jobs create ${commonArgs}`,
-            ]),
-            `${(0, common_1.gcloudSchedulerCmd)()} jobs update ${commonArgs}`,
-        ];
-    })
-        .flat();
+            jobIndex === 0
+                ? `exist_scheduler_names="$(\n  ${(0, common_1.gcloudSchedulerCmd)()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
+                : null,
+            `current_job_uri="${uriBase}/${jobName}:run"`,
+            `current_scheduler_name="${schedulerName}"`,
+            `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
+            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs update http "$current_scheduler_name" ${argsString}`,
+            `else`,
+            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs create http "$current_scheduler_name" ${argsString}`,
+            `fi`,
+        ]
+            .filter(utils_1.notNil)
+            .join("\n");
+    });
 };
 exports.getCreateScheduleScripts = getCreateScheduleScripts;
 const getCloudRunJobsWithSchedule = (context) => {
     const jobsWithNames = getCloudRunJobsWithNames(context);
     return jobsWithNames
         .filter((entry) => entry.job.when === "schedule")
-        .map(({ job, jobName }) => ({
+        .map(({ job, jobName, jobKey }) => ({
         job,
         jobName,
+        jobKey,
         schedulerName: jobName.concat("-scheduler"),
     }));
 };
@@ -3864,9 +3878,10 @@ const getCloudRunJobsWithNames = (context) => {
     const jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
         // filter out disabled jobs
         .filter((entry) => Boolean(entry[1]))
-        .map(([name, job]) => ({
-        jobName: getFullJobName(name),
+        .map(([jobKey, job]) => ({
+        jobName: getFullJobName(jobKey),
         job,
+        jobKey,
     }));
     return jobsWithNames;
 };
@@ -4467,13 +4482,14 @@ exports.getFullDbName = getFullDbName;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomDeployJobs = void 0;
+const getAllCacheConfigsFromConfig_1 = __nccwpck_require__(673);
 const yarn_1 = __nccwpck_require__(5043);
 const runner_1 = __nccwpck_require__(4058);
 const base_1 = __nccwpck_require__(2024);
 const sbom_1 = __nccwpck_require__(4986);
 const types_1 = __nccwpck_require__(5781);
 const createCustomDeployJobs = (context) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
         // should not happen
@@ -4483,10 +4499,10 @@ const createCustomDeployJobs = (context) => {
     const yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
-    return (0, base_1.createDeployementJobs)(context, {
+    const result = (0, base_1.createDeployementJobs)(context, {
         deploy: {
             image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
-            cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+            cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
             script: [
                 `cd ${context.build.dir}`,
                 ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
@@ -4497,7 +4513,7 @@ const createCustomDeployJobs = (context) => {
         },
         stop: deployConfig.stopScript
             ? {
-                image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
+                image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
                 script: [
                     ...deployConfig.stopScript,
                     ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
@@ -4506,6 +4522,7 @@ const createCustomDeployJobs = (context) => {
             }
             : undefined,
     });
+    return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
 //# sourceMappingURL=deployJob.js.map
@@ -42732,7 +42749,7 @@ var Scalar = __nccwpck_require__(9387);
 var YAMLMap = __nccwpck_require__(1030);
 var YAMLSeq = __nccwpck_require__(1936);
 var cst = __nccwpck_require__(8164);
-var lexer = __nccwpck_require__(340);
+var lexer = __nccwpck_require__(2269);
 var lineCounter = __nccwpck_require__(4211);
 var parser = __nccwpck_require__(4639);
 var publicApi = __nccwpck_require__(3019);
@@ -44225,7 +44242,7 @@ exports.tokenType = tokenType;
 
 /***/ }),
 
-/***/ 340:
+/***/ 2269:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -45012,7 +45029,7 @@ exports.LineCounter = LineCounter;
 
 
 var cst = __nccwpck_require__(8164);
-var lexer = __nccwpck_require__(340);
+var lexer = __nccwpck_require__(2269);
 
 function includesToken(list, type) {
     for (let i = 0; i < list.length; ++i)

package/dist/bundles/cli/index.js

@@ -4520,8 +4520,8 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
 };
 exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
 /** shortcut, used in some build types */
-const createJobCacheFromConfig = (context, buildConfig) => {
-    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+const createJobCacheFromConfig = (context, configWithCache) => {
+    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, configWithCache));
 };
 exports.createJobCacheFromConfig = createJobCacheFromConfig;
 //# sourceMappingURL=createJobCache.js.map
@@ -4537,15 +4537,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getAllCacheConfigsFromConfig = void 0;
 const index_1 = __nccwpck_require__(32497);
 const transformLegacyJobCache_1 = __nccwpck_require__(96673);
-const getAllCacheConfigsFromConfig = (context, buildConfig) => {
+const getAllCacheConfigsFromConfig = (context, configWithCache) => {
     return [
-        ...("jobCache" in buildConfig
-            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache)
+        ...("jobCache" in configWithCache
+            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(configWithCache.jobCache)
             : []),
-        ...(0, index_1.ensureArray)(buildConfig.cache).map((c) => ({
-            ...c,
-            context,
-        })),
+        ...(0, index_1.ensureArray)(configWithCache.cache),
         ...(context.type === "workspace"
             ? // also add cache configs of the components of that workspace
                 context.components.flatMap((componentContext) => {
@@ -6474,6 +6471,7 @@ exports.BASE_RETRY = {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+const createJobCache_1 = __nccwpck_require__(10340);
 const docker_1 = __nccwpck_require__(9641);
 const sbom_1 = __nccwpck_require__(37038);
 const context_1 = __nccwpck_require__(61724);
@@ -6505,7 +6503,9 @@ const createDeployJob = (context, jobDefinition) => {
         name: exports.DEPLOY_JOB_NAME,
         script: jobDefinition.script,
         image: jobDefinition.image,
-        cache: jobDefinition.cache,
+        cache: jobDefinition.cache
+            ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache)
+            : undefined,
         artifacts: jobDefinition.artifacts,
         services: jobDefinition.services,
         envMode: "stagePerEnv", // makes it easier to run manual tasks er env
@@ -6904,13 +6904,13 @@ exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
-const gitlab_1 = __nccwpck_require__(38490);
 const createArgsString_1 = __nccwpck_require__(49598);
 const jobName_1 = __nccwpck_require__(9626);
 const common_1 = __nccwpck_require__(73325);
 const getLabels_1 = __nccwpck_require__(30920);
 const volumes_1 = __nccwpck_require__(60847);
 const constants_1 = __nccwpck_require__(38865);
+const utils_1 = __nccwpck_require__(32497);
 const getJobRunScriptForJob = (context, jobName, wait) => {
     const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
     const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -6952,76 +6952,90 @@ const getJobRunScripts = (context, when) => {
     ["preStop", "postStop"].includes(when)));
 };
 exports.getJobRunScripts = getJobRunScripts;
-const getJobCreateScripts = (context) => {
-    const jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames
-        .map(({ job, jobName }) => getJobCreateScriptsForJob(context, jobName, job))
-        .flat();
-};
-exports.getJobCreateScripts = getJobCreateScripts;
-const getJobCreateScriptsForJob = (context, jobName, job) => {
-    const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
-    // due to some oversight from google, jobs create does not yet accept `--add-volume` 🤦
-    // lucky, update on the other hand accepts it... so let's just imediatly update it
-    // we cannot upsert a job, so we have to create it and catch the error and then update
-    const commandArray = Array.isArray(job.command)
-        ? job.command
-        : job.command.split(" ");
+const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map(({ job: { command, image, cpu, memory = "512Mi", timeout = "10m", parallelism = 1, volumes, }, jobName, }, jobIndex) => {
+    const commandArray = Array.isArray(command)
+        ? command
+        : command.split(" ");
+    const { image: commonImage, project, region, ...deployArgs } = (0, common_1.getCommonDeployArgs)(context);
     const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
-        command: '"' + commandArray.join(",") + '"',
-        ...commonDeployArgs,
-        labels: (0, common_1.makeLabelString)({
-            ...(0, getLabels_1.getLabels)(context),
-            "cloud-run-job-name": jobName.toString(),
-        }),
-        image: job.image || commonDeployArgs.image,
-        cpu: job === null || job === void 0 ? void 0 : job.cpu,
-        memory: job.memory || "512Mi",
-        "task-timeout": job.timeout || "10m",
-        parallelism: job.parallelism || 1,
+        command: `"${commandArray.join(",")}"`,
+        labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
+        image: `"${image !== null && image !== void 0 ? image : commonImage}"`,
+        project,
+        region,
+        cpu,
+        memory,
+        parallelism,
+        "task-timeout": timeout,
         "env-vars-file": constants_1.ENV_VARS_FILENAME,
         "max-retries": 0,
+        ...deployArgs,
     });
-    const requiresBeta = (job === null || job === void 0 ? void 0 : job.volumes) && Object.keys(job === null || job === void 0 ? void 0 : job.volumes).length > 0;
-    const argsString = `${jobName} ${commonDeployArgsString}`;
+    // due to some oversight from google, jobs create does not yet accept `--add-volume` 🤦
+    // lucky, update on the other hand accepts it... so let's just imediatly update it
+    // we cannot upsert a job, so we have to create it and catch the error and then update
+    const hasVolumes = Object.keys(volumes || {}).length > 0;
+    const needsBeta = hasVolumes ? "beta" : undefined;
+    const volumeArgs = hasVolumes
+        ? (0, createArgsString_1.createArgsString)(...(0, volumes_1.createVolumeConfig)(volumes, "job"))
+        : "";
     return [
-        ...(0, gitlab_1.allowFailureInScripts)([`${(0, common_1.gcloudRunCmd)()} jobs create ${argsString}`]),
-        `${(0, common_1.gcloudRunCmd)(requiresBeta ? "beta" : undefined)} jobs update ${argsString} ${(0, createArgsString_1.createArgsString)(...(0, volumes_1.createVolumeConfig)(job === null || job === void 0 ? void 0 : job.volumes, "job"))}`,
-    ];
-};
+        jobIndex === 0
+            ? `exist_job_names="$(\n  ${(0, common_1.gcloudRunCmd)()} jobs list --filter='metadata.name ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --project='${project}' --region='${region}'\n)"`
+            : null,
+        `current_job_name="${jobName}"`,
+        'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then',
+        `  ${(0, common_1.gcloudRunCmd)(needsBeta)} jobs update "$current_job_name" ${commonDeployArgsString} ${volumeArgs}`,
+        "else",
+        `  ${(0, common_1.gcloudRunCmd)()} jobs create "$current_job_name" ${commonDeployArgsString}`,
+        "fi",
+    ]
+        .filter(utils_1.notNil)
+        .join("\n");
+});
+exports.getJobCreateScripts = getJobCreateScripts;
 const getCreateScheduleScripts = (context) => {
     const jobsWithSchedule = getCloudRunJobsWithSchedule(context);
-    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    return jobsWithSchedule
-        .map(({ job, jobName, schedulerName }) => {
-        var _a;
+    const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
+    const uriBase = `https://${location}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${project}/jobs`;
+    const gcloudArgs = {
+        project,
+        location,
+        uri: `"$current_job_uri"`,
+        "http-method": "POST",
+        "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
+    };
+    return jobsWithSchedule.map(({ job: { maxRetryAttempts, schedule }, jobName, schedulerName }, jobIndex) => {
         const argsString = (0, createArgsString_1.createArgsString)({
-            project: deployConfig.projectId,
-            location: deployConfig.region,
-            schedule: `"${job.schedule}"`,
-            "max-retry-attempts": (_a = job.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0,
-            uri: `"https://${deployConfig.region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${deployConfig.projectId}/jobs/${jobName}:run"`,
-            "http-method": "POST",
-            "oauth-service-account-email": "$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com",
+            ...gcloudArgs,
+            schedule: `"${schedule}"`,
+            "max-retry-attempts": maxRetryAttempts !== null && maxRetryAttempts !== void 0 ? maxRetryAttempts : 0,
         });
-        const commonArgs = `http ${schedulerName} ${argsString}`;
         return [
-            ...(0, gitlab_1.allowFailureInScripts)([
-                `${(0, common_1.gcloudSchedulerCmd)()} jobs create ${commonArgs}`,
-            ]),
-            `${(0, common_1.gcloudSchedulerCmd)()} jobs update ${commonArgs}`,
-        ];
-    })
-        .flat();
+            jobIndex === 0
+                ? `exist_scheduler_names="$(\n  ${(0, common_1.gcloudSchedulerCmd)()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
+                : null,
+            `current_job_uri="${uriBase}/${jobName}:run"`,
+            `current_scheduler_name="${schedulerName}"`,
+            `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
+            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs update http "$current_scheduler_name" ${argsString}`,
+            `else`,
+            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs create http "$current_scheduler_name" ${argsString}`,
+            `fi`,
+        ]
+            .filter(utils_1.notNil)
+            .join("\n");
+    });
 };
 exports.getCreateScheduleScripts = getCreateScheduleScripts;
 const getCloudRunJobsWithSchedule = (context) => {
     const jobsWithNames = getCloudRunJobsWithNames(context);
     return jobsWithNames
         .filter((entry) => entry.job.when === "schedule")
-        .map(({ job, jobName }) => ({
+        .map(({ job, jobName, jobKey }) => ({
         job,
         jobName,
+        jobKey,
         schedulerName: jobName.concat("-scheduler"),
     }));
 };
@@ -7032,9 +7046,10 @@ const getCloudRunJobsWithNames = (context) => {
     const jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
         // filter out disabled jobs
         .filter((entry) => Boolean(entry[1]))
-        .map(([name, job]) => ({
-        jobName: getFullJobName(name),
+        .map(([jobKey, job]) => ({
+        jobName: getFullJobName(jobKey),
         job,
+        jobKey,
     }));
     return jobsWithNames;
 };
@@ -7635,13 +7650,14 @@ exports.getFullDbName = getFullDbName;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomDeployJobs = void 0;
+const getAllCacheConfigsFromConfig_1 = __nccwpck_require__(30673);
 const yarn_1 = __nccwpck_require__(45043);
 const runner_1 = __nccwpck_require__(4058);
 const base_1 = __nccwpck_require__(84052);
 const sbom_1 = __nccwpck_require__(44986);
 const types_1 = __nccwpck_require__(75781);
 const createCustomDeployJobs = (context) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
         // should not happen
@@ -7651,10 +7667,10 @@ const createCustomDeployJobs = (context) => {
     const yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
-    return (0, base_1.createDeployementJobs)(context, {
+    const result = (0, base_1.createDeployementJobs)(context, {
         deploy: {
             image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
-            cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+            cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
             script: [
                 `cd ${context.build.dir}`,
                 ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
@@ -7665,7 +7681,7 @@ const createCustomDeployJobs = (context) => {
         },
         stop: deployConfig.stopScript
             ? {
-                image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
+                image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
                 script: [
                     ...deployConfig.stopScript,
                     ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
@@ -7674,6 +7690,7 @@ const createCustomDeployJobs = (context) => {
             }
             : undefined,
     });
+    return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
 //# sourceMappingURL=deployJob.js.map

package/dist/pipeline/src/build/base/createAppBuildJob.d.ts

@@ -1,5 +1,4 @@
 import type { BuildContextStandalone, ComponentContext, WorkspaceContext } from "../..";
-import type { JobDefintion } from "../../types/jobDefinition";
+import type { AppBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export type AppBuildJobDefinition = JobDefintion;
 export declare const createAppBuildJob: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext, { script, variables, runnerVariables, cache, ...def }: AppBuildJobDefinition) => CatladderJob;

package/dist/pipeline/src/build/base/createAppBuildJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAGhB,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EAC9D,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;oBAChD,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;iBAC1C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}
+{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAEhB,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EAC9D,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;oBAChD,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;iBAC1C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}

package/dist/pipeline/src/build/base/createBuildJobDefinition.d.ts

@@ -1,7 +1,6 @@
 import type { BuildConfigStandalone, WorkspaceBuildConfig } from "..";
-import type { Context } from "../../types";
-import type { JobDefintion } from "../../types/jobDefinition";
-export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<JobDefintion, "cache"> & {
+import type { AppBuildJobDefinition, Context } from "../../types";
+export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<AppBuildJobDefinition, "cache"> & {
     prescript?: string[];
     postscript?: string[];
-}) => JobDefintion | undefined;
+}) => AppBuildJobDefinition | undefined;

package/dist/pipeline/src/build/base/createBuildJobDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBuildJobDefinition.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createBuildJobDefinition.ts"],"names":[],"mappings":";;;AACA,yCAA8C;AAG9C,uCAA0C;AAC1C,wFAAqF;AACrF,iDAAgE;AAEzD,MAAM,wBAAwB,GAAG,CACtC,OAAgB,EAChB,WAAyD,EACzD,YAGI,EAAE,EACoB,EAAE;;IAC5B,IAAI,WAAW,CAAC,YAAY,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;QAC3C,eAAe,EAAE,uCAA2B;QAC5C,KAAK,EAAE;YACL,GAAG,CAAC,MAAA,SAAS,CAAC,KAAK,mCAAI,EAAE,CAAC;YAC1B,GAAG,IAAA,2DAA4B,EAAC,OAAO,EAAE,WAAW,CAAC;SACtD;QACD,QAAQ,EACN,aAAa,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QACpE,MAAM,EAAE;YACN,GAAG,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC;YAC9B,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC;YACxC,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}
+{"version":3,"file":"createBuildJobDefinition.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createBuildJobDefinition.ts"],"names":[],"mappings":";;;AACA,yCAA8C;AAE9C,uCAA0C;AAC1C,wFAAqF;AACrF,iDAAgE;AAEzD,MAAM,wBAAwB,GAAG,CACtC,OAAgB,EAChB,WAAyD,EACzD,YAGI,EAAE,EAC6B,EAAE;;IACrC,IAAI,WAAW,CAAC,YAAY,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;QAC3C,eAAe,EAAE,uCAA2B;QAC5C,KAAK,EAAE;YACL,GAAG,CAAC,MAAA,SAAS,CAAC,KAAK,mCAAI,EAAE,CAAC;YAC1B,GAAG,IAAA,2DAA4B,EAAC,OAAO,EAAE,WAAW,CAAC;SACtD;QACD,QAAQ,EACN,aAAa,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QACpE,MAAM,EAAE;YACN,GAAG,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC;YAC9B,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC;YACxC,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}