@catladder/pipeline 2.7.0 → 2.7.2

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v2-7-0-5e79963c" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v2-7-2-85751a1a" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

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

@@ -67,14 +67,14 @@ var getJobRunScriptForJob = function (context, jobName, wait) {
 };
 var getDeleteSchedulesScripts = function (context) {
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  var schedules = getSchedules(context);
   var argsString = (0, createArgsString_1.createArgsString)({
     project: deployConfig.projectId,
     location: deployConfig.region
   });
-  return jobsWithSchedule.map(function (_a) {
-    var schedulerName = _a.schedulerName;
-    return ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(schedulerName, " ").concat(argsString)];
+  return schedules.map(function (_a) {
+    var name = _a.name;
+    return ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(name, " ").concat(argsString)];
   }).flat();
 };
 exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
@@ -141,45 +141,52 @@ var getJobCreateScripts = function (context) {
 };
 exports.getJobCreateScripts = getJobCreateScripts;
 var getCreateScheduleScripts = function (context) {
-  var jobsWithSchedule = getCloudRunJobsWithSchedule(context);
+  var schedules = getSchedules(context);
   var _a = (0, common_1.getCloudRunDeployConfig)(context),
     location = _a.region,
     project = _a.projectId;
-  var uriBase = "https://".concat(location, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(project, "/jobs");
-  var gcloudArgs = {
-    project: project,
-    location: location,
-    uri: "\"$current_job_uri\"",
-    "http-method": "POST",
-    "oauth-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\""
-  };
-  return jobsWithSchedule.map(function (_a, jobIndex) {
-    var _b = _a.job,
-      maxRetryAttempts = _b.maxRetryAttempts,
-      schedule = _b.schedule,
-      jobName = _a.jobName,
-      schedulerName = _a.schedulerName;
-    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({}, gcloudArgs), {
-      schedule: "\"".concat(schedule, "\""),
-      "max-retry-attempts": maxRetryAttempts !== null && maxRetryAttempts !== void 0 ? maxRetryAttempts : 0
-    }));
-    return [jobIndex === 0 ? "exist_scheduler_names=\"$(\n  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs list --filter='httpTarget.uri ~ ").concat(context.env, ".*").concat(context.name, "' --format='value(name)' --limit=999 --location='").concat(location, "' --project='").concat(project, "'\n)\"") : null, "current_job_uri=\"".concat(uriBase, "/").concat(jobName, ":run\""), "current_scheduler_name=\"".concat(schedulerName, "\""), "if grep \"$current_scheduler_name\" <<<\"$exist_scheduler_names\" >/dev/null; then", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs update http \"$current_scheduler_name\" ").concat(argsString), "else", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs create http \"$current_scheduler_name\" ").concat(argsString), "fi"].filter(utils_1.notNil).join("\n");
+  return schedules.map(function (scheduler, jobIndex) {
+    var _a;
+    var uri = getSchedulerUrl(scheduler, context);
+    var argsString = (0, createArgsString_1.createArgsString)({
+      project: project,
+      location: location,
+      uri: "\"$current_job_uri\"",
+      "http-method": "POST",
+      "oauth-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\"",
+      schedule: "\"".concat(scheduler.schedule, "\""),
+      "max-retry-attempts": (_a = scheduler.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0
+    });
+    return [jobIndex === 0 ? "exist_scheduler_names=\"$(\n  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs list --filter='httpTarget.uri ~ ").concat(context.env, ".*").concat(context.name, "' --format='value(name)' --limit=999 --location='").concat(location, "' --project='").concat(project, "'\n)\"") : null, "current_job_uri=\"".concat(uri, "\""), "current_scheduler_name=\"".concat(scheduler.name, "\""), "if grep \"$current_scheduler_name\" <<<\"$exist_scheduler_names\" >/dev/null; then", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs update http \"$current_scheduler_name\" ").concat(argsString), "else", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs create http \"$current_scheduler_name\" ").concat(argsString), "fi"].filter(utils_1.notNil).join("\n");
   });
 };
 exports.getCreateScheduleScripts = getCreateScheduleScripts;
-var getCloudRunJobsWithSchedule = function (context) {
+var getSchedulerUrl = function (scheduler, context) {
+  if (scheduler.type === "cloudRunJob") {
+    var _a = (0, common_1.getCloudRunDeployConfig)(context),
+      location_1 = _a.region,
+      project = _a.projectId;
+    var uriBase = "https://".concat(location_1, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(project, "/jobs");
+    return "".concat(uriBase, "/").concat(scheduler.jobName, ":run");
+  }
+  throw new Error("Unknown scheduler type: ".concat(scheduler.type));
+};
+var getSchedules = function (context) {
   var jobsWithNames = getCloudRunJobsWithNames(context);
   return jobsWithNames.filter(function (entry) {
     return entry.job.when === "schedule";
   }).map(function (_a) {
-    var job = _a.job,
-      jobName = _a.jobName,
-      jobKey = _a.jobKey;
+    var _b = _a.job,
+      maxRetryAttempts = _b.maxRetryAttempts,
+      schedule = _b.schedule,
+      jobName = _a.jobName;
+    var schedulerName = jobName.concat("-scheduler");
     return {
-      job: job,
-      jobName: jobName,
-      jobKey: jobKey,
-      schedulerName: jobName.concat("-scheduler")
+      name: schedulerName,
+      maxRetryAttempts: maxRetryAttempts,
+      schedule: schedule,
+      type: "cloudRunJob",
+      jobName: jobName
     };
   });
 };

package/dist/pipeline/gitlab/createGitlabJobs.js

@@ -312,24 +312,28 @@ var addGitlabEnvironment = function (context, catladderJobEnvironment, job, allJ
     restEnvironment = __rest(catladderJobEnvironment, ["on_stop"]);
   // those can be dynamic, so we therefore have to do this: https://docs.gitlab.com/ee/ci/environments/#set-a-dynamic-environment-url
   var dotEnvFile = "gitlab_environment.env";
+  var createsJobEnv = !catladderJobEnvironment.action || catladderJobEnvironment.action === "start";
+  var artifacts = (0, lodash_1.merge)((_a = job.artifacts) !== null && _a !== void 0 ? _a : {}, createsJobEnv ? {
+    reports: {
+      dotenv: dotEnvFile
+    }
+  } : {});
   var scriptToAdd = ["echo \"".concat(exports.GITLAB_ENVIRONMENT_URL_VARIABLE, "=").concat((0, BashExpression_1.getBashVariable)("ROOT_URL"), "\" >> ").concat(dotEnvFile)];
   // this is NOT a bashVariable since it NEEDS to be used as a string in gitlab
   var gitlabEnvironmentName = envType === "review" ? "".concat(env, "/$CI_COMMIT_REF_NAME/").concat(name) // FIXME: should be replaced with mr name as well
   : "".concat(env, "/").concat(name);
-  return __assign(__assign({}, job), {
+  return __assign(__assign(__assign(__assign({}, job), {
     environment: __assign(__assign(__assign({
       name: gitlabEnvironmentName
-    }, !catladderJobEnvironment.action || catladderJobEnvironment.action === "start" ? {
+    }, createsJobEnv ? {
       url: "$".concat(exports.GITLAB_ENVIRONMENT_URL_VARIABLE)
     } : {}), on_stop ? {
       on_stop: getFullReferencedJobNameFromComponent(on_stop, name, env, allJobs)
-    } : {}), restEnvironment),
-    artifacts: (0, lodash_1.merge)((_a = job.artifacts) !== null && _a !== void 0 ? _a : {}, {
-      reports: {
-        dotenv: "".concat(dotEnvFile)
-      }
-    }),
-    script: __spreadArray(__spreadArray([], __read((_b = job.script) !== null && _b !== void 0 ? _b : []), false), __read(scriptToAdd), false)
+    } : {}), restEnvironment)
+  }), !(0, lodash_1.isEmpty)(artifacts) ? {
+    artifacts: artifacts
+  } : {}), {
+    script: __spreadArray(__spreadArray([], __read((_b = job.script) !== null && _b !== void 0 ? _b : []), false), __read(createsJobEnv ? scriptToAdd : []), false)
   });
 };
 var createGitlabJobs = function (allJobs, baseRules) {