@catladder/cli 0.0.0-next-81cdc7a3 → 0.0.0-next-aff40897

package/dist/bundles/catenv/index.js

@@ -40,10 +40,11 @@ exports.printVariables = void 0;
 const getProjectConfig_1 = __nccwpck_require__(5264);
 const utils_1 = __nccwpck_require__(4560);
 const getAllVariablesToPrint = async (config, choice) => {
+    var _a;
     const { env, currentComponent } = await (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice);
     if (currentComponent) {
         // don't print vars if dotenv is enabled
-        if (config.components[currentComponent].dotEnv) {
+        if ((_a = config.components[currentComponent].dotEnv) !== null && _a !== void 0 ? _a : true) {
             return {};
         }
         return await (0, getProjectConfig_1.getEnvVarsResolved)(null, env, currentComponent);
@@ -53,8 +54,9 @@ const getAllVariablesToPrint = async (config, choice) => {
         // this is not 100% correct, but better than not exporting any vars at all
         // so we also add prefixed variants
         return await Object.keys(config.components).reduce(async (acc, componentName) => {
+            var _a;
             // don't print vars if dotenv is enabled
-            if (config.components[componentName].dotEnv) {
+            if ((_a = config.components[componentName].dotEnv) !== null && _a !== void 0 ? _a : true) {
                 return await acc;
             }
             const subappvars = await (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName);
@@ -141,7 +143,7 @@ const utils_1 = __nccwpck_require__(4560);
 const writeDotEnvFiles = async (config, choice) => {
     const { env, currentComponent } = await (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice);
     const componentsWithEnabledDotEnvWrite = Object.entries(config.components)
-        .filter(([, component]) => component === null || component === void 0 ? void 0 : component.dotEnv) // when set to true or "local"
+        .filter(([, component]) => { var _a; return (_a = component === null || component === void 0 ? void 0 : component.dotEnv) !== null && _a !== void 0 ? _a : true; }) // when set to true or "local"
         .map(([componentName]) => componentName);
     const componentsToActuallyWriteDotEnvNow = currentComponent
         ? componentsWithEnabledDotEnvWrite.includes(currentComponent)
@@ -181,7 +183,7 @@ const utils_1 = __nccwpck_require__(4560);
 const writeDTsFiles = async (config, choice) => {
     const { env, currentComponent } = await (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice);
     const componentsWithEnabledEnvDTsWrite = Object.entries(config.components)
-        .filter(([, component]) => component === null || component === void 0 ? void 0 : component.envDTs)
+        .filter(([, component]) => { var _a; return (_a = component === null || component === void 0 ? void 0 : component.envDTs) !== null && _a !== void 0 ? _a : true; })
         .map(([componentName]) => componentName);
     const componentsToActuallyWriteEnvDts = currentComponent
         ? componentsWithEnabledEnvDTsWrite.includes(currentComponent)
@@ -1057,7 +1059,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);
@@ -1288,14 +1290,15 @@ EOF`,
 };
 exports.writeDotEnv = writeDotEnv;
 const componentContextNeedsBuildTimeDotEnv = (context) => {
-    return context.componentConfig.dotEnv === true; // don't build when set to `local`
+    var _a;
+    return ((_a = context.componentConfig.dotEnv) !== null && _a !== void 0 ? _a : true) === true; // don't build when set to `local`
 };
 exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDotEnv;
 //# sourceMappingURL=writeDotEnv.js.map
 
 /***/ }),
 
-/***/ 4372:
+/***/ 340:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -1351,8 +1354,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
@@ -1368,15 +1371,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) => {
@@ -1475,7 +1475,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",
@@ -1559,7 +1559,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",
@@ -2042,7 +2042,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;
     // don't run tests after release
@@ -3254,6 +3254,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);
@@ -3285,7 +3286,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
@@ -3683,13 +3686,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);
@@ -3731,76 +3734,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"),
     }));
 };
@@ -3811,9 +3828,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;
 };
@@ -4414,13 +4432,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
@@ -4430,10 +4449,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 : []),
@@ -4444,7 +4463,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),
@@ -4453,6 +4472,7 @@ const createCustomDeployJobs = (context) => {
             }
             : undefined,
     });
+    return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
 //# sourceMappingURL=deployJob.js.map
@@ -42628,7 +42648,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);
@@ -44121,7 +44141,7 @@ exports.tokenType = tokenType;
 
 /***/ }),
 
-/***/ 340:
+/***/ 2269:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -44908,7 +44928,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)