@catladder/pipeline 2.2.4 → 2.4.0

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-2-4-6a34177d" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v2-4-0-6d817e0e" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/deploy/base/deploy.js

@@ -115,7 +115,7 @@ var createDeployJob = function (context, jobDefinition) {
     environment: isStoppable ? {
       on_stop: stop_1.STOP_JOB_NAME,
       auto_stop_in: autoStop
-    } : undefined,
+    } : {},
     jobTags: deployConfig ? deployConfig.jobTags : undefined
   };
 };

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

@@ -96,10 +96,13 @@ var getJobRunScripts = function (context, when) {
     var job = _a.job;
     return job.when === when;
   }).map(function (_a) {
-    var jobName = _a.jobName;
-    return getJobRunScriptForJob(context, jobName,
-    // wait for completin on stop jobs, since stop will delete the jobs afterwards, so they will fail
-    ["preStop", "postStop"].includes(when));
+    var _b;
+    var jobName = _a.jobName,
+      job = _a.job;
+    // always wait for completion for preStop and postStop jobs
+    // since stop will delete the jobs afterwards, so they will fail
+    var waitForCompletion = ["preStop", "postStop"].includes(when) ? true : "waitForCompletion" in job ? (_b = job.waitForCompletion) !== null && _b !== void 0 ? _b : false : false;
+    return getJobRunScriptForJob(context, jobName, waitForCompletion);
   });
 };
 exports.getJobRunScripts = getJobRunScripts;

package/dist/deploy/sbom.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript = exports.sbomDeactivated = void 0;
+var BashExpression_1 = require("../bash/BashExpression");
 var sbom_1 = require("../build/sbom");
 var context_1 = require("../types/context");
 var sbomDeactivated = function (context) {
@@ -11,10 +12,10 @@ var sbomDeactivated = function (context) {
 };
 exports.sbomDeactivated = sbomDeactivated;
 var getDependencyTrackUploadScript = function (context) {
-  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Uploading SBOM to Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat(context.environment.envVars.ROOT_URL, "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true")];
+  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Uploading SBOM to Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat((0, BashExpression_1.getBashVariable)("ROOT_URL"), "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true")];
 };
 exports.getDependencyTrackUploadScript = getDependencyTrackUploadScript;
 var getDependencyTrackDeleteScript = function (context) {
-  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Disabling component in Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat(context.environment.envVars.ROOT_URL, "\" || true")];
+  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Disabling component in Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat((0, BashExpression_1.getBashVariable)("CI_ENVIRONMENT_URL"), "\" || true")];
 };
 exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;

package/dist/deploy/types/googleCloudRun.d.ts

@@ -176,6 +176,12 @@ export type DeployConfigCloudRunJobWithSchedule = DeployConfigCloudRunJobBase &
 };
 export type DeployConfigCloudRunJobNormal = DeployConfigCloudRunJobBase & {
   when: "manual" | "preDeploy" | "postDeploy" | "preStop" | "postStop";
+  /**
+   * wait for completion of the job on preDeploy and postDeploy
+   *
+   * has no effect on preStop and postStop (which always wait for completion)
+   */
+  waitForCompletion?: boolean;
 };
 export type DeployConfigCloudRunWithVolumes = {
   /**

package/dist/pipeline/gitlab/createGitlabJobs.js

@@ -174,6 +174,7 @@ var defaults_1 = require("../../defaults");
 var utils_1 = require("../../utils");
 var gitlab_1 = require("../../utils/gitlab");
 var removeUndefined_1 = require("../../utils/removeUndefined");
+var BashExpression_1 = require("../../bash/BashExpression");
 exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
 var getFullJobName = function (_a) {
   var type = _a.type,
@@ -311,15 +312,16 @@ 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 scriptToAdd = ["echo \"".concat(exports.GITLAB_ENVIRONMENT_URL_VARIABLE, "=").concat(envVars.ROOT_URL, "\" >> ").concat(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), {
-    environment: __assign(__assign({
-      name: gitlabEnvironmentName,
+    environment: __assign(__assign(__assign({
+      name: gitlabEnvironmentName
+    }, !catladderJobEnvironment.action || catladderJobEnvironment.action === "start" ? {
       url: "$".concat(exports.GITLAB_ENVIRONMENT_URL_VARIABLE)
-    }, on_stop ? {
+    } : {}), on_stop ? {
       on_stop: getFullReferencedJobNameFromComponent(on_stop, name, env, allJobs)
     } : {}), restEnvironment),
     artifacts: (0, lodash_1.merge)((_a = job.artifacts) !== null && _a !== void 0 ? _a : {}, {