@catladder/cli 0.0.0-main-8f79dd9f → 0.0.0-main-48ef3537

package/dist/bundles/catenv/index.js

@@ -39419,6 +39419,8 @@ var constants_1 = __nccwpck_require__(1542);
 var createBuildJob_1 = __nccwpck_require__(8063);
 var docker_1 = __nccwpck_require__(3219);
 var types_1 = __nccwpck_require__(1197);
+var sbom_1 = __nccwpck_require__(9927);
+var sbom_2 = __nccwpck_require__(5928);
 var RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "2",
@@ -39444,12 +39446,12 @@ var createCustomBuildJobs = function (context) {
       expire_in: "1 day"
     }
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : "" // e.g. custom,
     ].filter(Boolean),
     variables: {},
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false);
+  })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
 };
 exports.createCustomBuildJobs = createCustomBuildJobs;
 
@@ -39900,6 +39902,8 @@ var cache_1 = __nccwpck_require__(4303);
 var constants_2 = __nccwpck_require__(9284);
 var yarn_1 = __nccwpck_require__(464);
 var runner_1 = __nccwpck_require__(5071);
+var sbom_1 = __nccwpck_require__(9927);
+var sbom_2 = __nccwpck_require__(5928);
 var createNodeBuildJobs = function (context) {
   var _a, _b, _c, _d, _e, _f, _g;
   var buildConfig = context.componentConfig.build;
@@ -39921,7 +39925,7 @@ var createNodeBuildJobs = function (context) {
     },
     jobTags: buildConfig.jobTags
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
     cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
     variables: {
@@ -39932,7 +39936,7 @@ var createNodeBuildJobs = function (context) {
       })) === null || _g === void 0 ? void 0 : _g.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false);
+  })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
 };
 exports.createNodeBuildJobs = createNodeBuildJobs;
 
@@ -40414,10 +40418,21 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
 var types_1 = __nccwpck_require__(1197);
 var docker_1 = __nccwpck_require__(3219);
+var sbom_1 = __nccwpck_require__(5928);
+var sbom_2 = __nccwpck_require__(9927);
 var createRailsBuildJobs = function (context) {
   var _a, _b, _c;
   var buildConfig = context.componentConfig.build;
@@ -40432,13 +40447,13 @@ var createRailsBuildJobs = function (context) {
       v = _b[1];
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
   }).join(" ");
-  return [(0, docker_1.createDockerBuildJobBase)(context, {
+  return __spreadArray([(0, docker_1.createDockerBuildJobBase)(context, {
     variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
     // custom script
     script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
     //  replace private git ssh gem sources with https to make bundler with credentials via env var work
     "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")]
-  })];
+  })], __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;
 
@@ -40593,6 +40608,42 @@ exports.createRailsTestJobs = createRailsTestJobs;
 
 /***/ }),
 
+/***/ 9927:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createSbomBuildJob = exports.SBOM_FILE = exports.SBOM_BUILD_JOB_NAME = void 0;
+var utils_1 = __nccwpck_require__(7461);
+exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
+exports.SBOM_FILE = "__sbom.json";
+var createSbomBuildJob = function (context) {
+  var _a, _b, _c, _d, _e;
+  var buildConfig = context.componentConfig.build;
+  var defaultImage = "aquasec/trivy:0.38.3";
+  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.componentConfig.dir)];
+  var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage : defaultImage;
+  var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript : defaultScript;
+  return {
+    name: exports.SBOM_BUILD_JOB_NAME,
+    stage: "build",
+    envMode: "jobPerEnv",
+    variables: {},
+    cache: undefined,
+    image: image,
+    script: script,
+    allow_failure: true,
+    artifacts: {
+      paths: [exports.SBOM_FILE]
+    }
+  };
+};
+exports.createSbomBuildJob = createSbomBuildJob;
+
+/***/ }),
+
 /***/ 1197:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -40783,7 +40834,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-8f79dd9f" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-48ef3537" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42053,9 +42104,42 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.getBaseRollbackJob = exports.getBaseDeploymentStopJob = exports.getBaseDeploymentJob = exports.ROLLBACK_JOB_NAME = exports.STOP_JOB_NAME = exports.DEPLOY_JOB_NAME = void 0;
 var docker_1 = __nccwpck_require__(3219);
+var sbom_1 = __nccwpck_require__(9927);
+var sbom_2 = __nccwpck_require__(5928);
 var utils_1 = __nccwpck_require__(2757);
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
 exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
@@ -42081,13 +42165,16 @@ var getBaseDeploymentJob = function (context) {
   return {
     name: exports.DEPLOY_JOB_NAME,
     envMode: "stagePerEnv",
-    needs: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+    needs: __spreadArray(__spreadArray([], __read((0, sbom_2.sbomDeactivated)(context) ? [] : [{
+      job: sbom_1.SBOM_BUILD_JOB_NAME,
+      artifacts: true
+    }]), false), __read(context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,
         artifacts: false
       };
-    })) !== null && _c !== void 0 ? _c : undefined : undefined,
+    })) !== null && _c !== void 0 ? _c : [] : []), false),
     // we don't want to deploy when there is a broken test
     needsStages: [{
       stage: "build",
@@ -42219,6 +42306,7 @@ var database_1 = __nccwpck_require__(1384);
 var gitlab_1 = __nccwpck_require__(4997);
 var jobName_1 = __nccwpck_require__(7311);
 var createArgsString_1 = __nccwpck_require__(8686);
+var sbom_1 = __nccwpck_require__(5928);
 var setExtraVarsScripts = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
@@ -42370,18 +42458,18 @@ var createGoogleCloudRunDeployJobs = function (context) {
       "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
     });
   };
-  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_b = deployConfig.additionalServices) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
     var _b = __read(_a, 2),
       name = _b[0],
       service = _b[1];
     return getServiceDeployScript(service, "-" + name);
-  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
-  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
+  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
     var _b = __read(_a, 1),
       name = _b[0];
     return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
-  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
+  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
     artifacts: {
       paths: ["____envvars.yaml"]
@@ -42761,6 +42849,7 @@ var yarn_1 = __nccwpck_require__(464);
 var runner_1 = __nccwpck_require__(5071);
 var base_1 = __nccwpck_require__(9177);
 var types_1 = __nccwpck_require__(3109);
+var sbom_1 = __nccwpck_require__(5928);
 var createCustomDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -42779,10 +42868,10 @@ var createCustomDeployJobs = function (context) {
   return __spreadArray([(0, lodash_1.merge)({}, baseDeploymentJob, {
     image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
     cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false)
+    script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false)
   })], __read(deployConfig.stopScript ? [(0, lodash_1.merge)({}, (0, base_1.getBaseDeploymentStopJob)(context), {
     image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
-    script: deployConfig.stopScript
+    script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
   })] : []), false);
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
@@ -43057,6 +43146,7 @@ var runner_1 = __nccwpck_require__(5071);
 var base_1 = __nccwpck_require__(9177);
 var types_1 = __nccwpck_require__(3109);
 var kubeValues_1 = __nccwpck_require__(1061);
+var sbom_1 = __nccwpck_require__(5928);
 var createKubernetesDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -43094,12 +43184,12 @@ var createKubernetesDeployJobs = function (context) {
   var clusterName = "kube-".concat(context.environment.fullName);
   var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_TOKEN"), "\""), "kubectl config set-context \"".concat(clusterName, "\" --cluster=\"").concat(clusterName, "\" --user=\"").concat(clusterName, "\" --namespace=\"").concat(context.environment.envVars.KUBE_NAMESPACE, "\""), "kubectl config use-context \"".concat(clusterName, "\"")];
   return [(0, lodash_1.merge)({}, baseDeploymentJob, shared, {
-    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy", "echo deployment successful 😻"], false),
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false),
     environment: {
       kubernetes: kubernetesEnvironment
     }
   }), (0, lodash_1.merge)({}, baseStopJob, shared, {
-    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false),
+    script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
     environment: {
       kubernetes: kubernetesEnvironment
     }
@@ -43545,6 +43635,30 @@ exports.processSecretsAsFiles = processSecretsAsFiles;
 
 /***/ }),
 
+/***/ 5928:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript = exports.sbomDeactivated = void 0;
+var sbom_1 = __nccwpck_require__(9927);
+var sbomDeactivated = function (context) {
+  return context.componentConfig.build.type === "custom" && context.componentConfig.build.sbom === false;
+};
+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.componentName, "\" \"").concat(context.environment.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.componentName, "\" \"").concat(context.environment.url, "\" || true")];
+};
+exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;
+
+/***/ }),
+
 /***/ 438:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -44550,7 +44664,6 @@ exports.__esModule = true;
 exports.createJobsForComponent = void 0;
 var lodash_1 = __nccwpck_require__(3255);
 var build_1 = __nccwpck_require__(3760);
-var reporting_1 = __nccwpck_require__(3545);
 var context_1 = __nccwpck_require__(2041);
 var deploy_1 = __nccwpck_require__(223);
 var getCommitInfo_1 = __nccwpck_require__(5923);
@@ -44575,9 +44688,8 @@ var getCustomJobs = function (context) {
 var createRawJobs = function (context) {
   var buildJobs = build_1.BUILD_TYPES[context.componentConfig.build.type].jobs(context);
   var deployJobs = context.componentConfig.deploy !== false ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context) : [];
-  var reportingJobs = (0, reporting_1.createReportingJobs)(context);
   var customJobs = getCustomJobs(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(reportingJobs), false), __read(customJobs), false);
+  return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
 };
 var createJobsForComponent = function (config, componentName, env, trigger) {
   return __awaiter(void 0, void 0, void 0, function () {
@@ -44834,7 +44946,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
       };
     });
   });
-  var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false), __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false);
+  var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false), __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false);
   var gitlabNeeds = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
     var _a;
     return (0, lodash_1.isObject)(n) ? {
@@ -44844,6 +44956,9 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
   }).sort(function (a, b) {
     return getJobName(a).localeCompare(getJobName(b));
   });
+  var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) {
+    return [(0, lodash_1.isObject)(n) ? n.job : n, n];
+  })).values()), false);
   var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
   var gitlabJob = removeUndefined(__assign(__assign({}, job), {
     tags: jobTags,
@@ -44852,7 +44967,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
       on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allJobs)
     }) : job.environment,
     // sort in a predictable manner for snapshot tests
-    needs: gitlabNeeds,
+    needs: deduplicatedGitlabNeeds,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   }));
@@ -45633,61 +45748,6 @@ exports.mergeWithMergingArrays = mergeWithMergingArrays;
 
 /***/ }),
 
-/***/ 3545:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-exports.__esModule = true;
-exports.createReportingJobs = void 0;
-var base_1 = __nccwpck_require__(9177);
-var utils_1 = __nccwpck_require__(7461);
-var STAGE = "verify";
-var SBOM_GENERATE_JOB_NAME = "🧾 sbom";
-var SBOM_FILE = "__sbom.json";
-var createSbomGenerateJob = function (context) {
-  var _a, _b, _c, _d, _e;
-  var buildConfig = context.componentConfig.build;
-  var defaultImage = "aquasec/trivy:0.38.3";
-  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(SBOM_FILE, "\" ").concat(((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.componentConfig.dir)];
-  var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage : defaultImage;
-  var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript : defaultScript;
-  return {
-    name: SBOM_GENERATE_JOB_NAME,
-    stage: STAGE,
-    needs: context.componentConfig.deploy !== false ? [base_1.DEPLOY_JOB_NAME] : [],
-    envMode: "jobPerEnv",
-    variables: {},
-    cache: undefined,
-    image: image,
-    script: script,
-    allow_failure: true,
-    artifacts: {
-      paths: [SBOM_FILE]
-    }
-  };
-};
-var createSbomUploadJob = function (context) {
-  return {
-    name: "🧾 sbom upload",
-    stage: STAGE,
-    needs: [SBOM_GENERATE_JOB_NAME],
-    envMode: "jobPerEnv",
-    variables: {},
-    cache: undefined,
-    image: "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
-    script: ["/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.shortName, "\" \"").concat(SBOM_FILE, "\" vex.json")],
-    allow_failure: true
-  };
-};
-var createReportingJobs = function (context) {
-  return context.componentConfig.build.type === "custom" && context.componentConfig.build.sbom === false ? [] : [createSbomGenerateJob(context), createSbomUploadJob(context)];
-};
-exports.createReportingJobs = createReportingJobs;
-
-/***/ }),
-
 /***/ 9904:
 /***/ ((module) => {
 

package/dist/bundles/cli/index.js

@@ -350487,6 +350487,8 @@ var constants_1 = __nccwpck_require__(11542);
 var createBuildJob_1 = __nccwpck_require__(58063);
 var docker_1 = __nccwpck_require__(33219);
 var types_1 = __nccwpck_require__(71197);
+var sbom_1 = __nccwpck_require__(9927);
+var sbom_2 = __nccwpck_require__(65928);
 var RUNNER_BUILD_VARIABLES = {
   KUBERNETES_CPU_REQUEST: "0.5",
   KUBERNETES_CPU_LIMIT: "2",
@@ -350512,12 +350514,12 @@ var createCustomBuildJobs = function (context) {
       expire_in: "1 day"
     }
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : "" // e.g. custom,
     ].filter(Boolean),
     variables: {},
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false);
+  })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
 };
 exports.createCustomBuildJobs = createCustomBuildJobs;
 
@@ -350968,6 +350970,8 @@ var cache_1 = __nccwpck_require__(54303);
 var constants_2 = __nccwpck_require__(69284);
 var yarn_1 = __nccwpck_require__(10464);
 var runner_1 = __nccwpck_require__(55071);
+var sbom_1 = __nccwpck_require__(9927);
+var sbom_2 = __nccwpck_require__(65928);
 var createNodeBuildJobs = function (context) {
   var _a, _b, _c, _d, _e, _f, _g;
   var buildConfig = context.componentConfig.build;
@@ -350989,7 +350993,7 @@ var createNodeBuildJobs = function (context) {
     },
     jobTags: buildConfig.jobTags
   }) : null;
-  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
     cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
     variables: {
@@ -351000,7 +351004,7 @@ var createNodeBuildJobs = function (context) {
       })) === null || _g === void 0 ? void 0 : _g.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false);
+  })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
 };
 exports.createNodeBuildJobs = createNodeBuildJobs;
 
@@ -351482,10 +351486,21 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
 var types_1 = __nccwpck_require__(71197);
 var docker_1 = __nccwpck_require__(33219);
+var sbom_1 = __nccwpck_require__(65928);
+var sbom_2 = __nccwpck_require__(9927);
 var createRailsBuildJobs = function (context) {
   var _a, _b, _c;
   var buildConfig = context.componentConfig.build;
@@ -351500,13 +351515,13 @@ var createRailsBuildJobs = function (context) {
       v = _b[1];
     return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
   }).join(" ");
-  return [(0, docker_1.createDockerBuildJobBase)(context, {
+  return __spreadArray([(0, docker_1.createDockerBuildJobBase)(context, {
     variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
     // custom script
     script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
     //  replace private git ssh gem sources with https to make bundler with credentials via env var work
     "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")]
-  })];
+  })], __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;
 
@@ -351661,6 +351676,42 @@ exports.createRailsTestJobs = createRailsTestJobs;
 
 /***/ }),
 
+/***/ 9927:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createSbomBuildJob = exports.SBOM_FILE = exports.SBOM_BUILD_JOB_NAME = void 0;
+var utils_1 = __nccwpck_require__(37461);
+exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
+exports.SBOM_FILE = "__sbom.json";
+var createSbomBuildJob = function (context) {
+  var _a, _b, _c, _d, _e;
+  var buildConfig = context.componentConfig.build;
+  var defaultImage = "aquasec/trivy:0.38.3";
+  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.componentConfig.dir)];
+  var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage : defaultImage;
+  var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript : defaultScript;
+  return {
+    name: exports.SBOM_BUILD_JOB_NAME,
+    stage: "build",
+    envMode: "jobPerEnv",
+    variables: {},
+    cache: undefined,
+    image: image,
+    script: script,
+    allow_failure: true,
+    artifacts: {
+      paths: [exports.SBOM_FILE]
+    }
+  };
+};
+exports.createSbomBuildJob = createSbomBuildJob;
+
+/***/ }),
+
 /***/ 71197:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -351851,7 +351902,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-8f79dd9f" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-48ef3537" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -353121,9 +353172,42 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.getBaseRollbackJob = exports.getBaseDeploymentStopJob = exports.getBaseDeploymentJob = exports.ROLLBACK_JOB_NAME = exports.STOP_JOB_NAME = exports.DEPLOY_JOB_NAME = void 0;
 var docker_1 = __nccwpck_require__(33219);
+var sbom_1 = __nccwpck_require__(9927);
+var sbom_2 = __nccwpck_require__(65928);
 var utils_1 = __nccwpck_require__(92757);
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
 exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
@@ -353149,13 +353233,16 @@ var getBaseDeploymentJob = function (context) {
   return {
     name: exports.DEPLOY_JOB_NAME,
     envMode: "stagePerEnv",
-    needs: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+    needs: __spreadArray(__spreadArray([], __read((0, sbom_2.sbomDeactivated)(context) ? [] : [{
+      job: sbom_1.SBOM_BUILD_JOB_NAME,
+      artifacts: true
+    }]), false), __read(context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,
         artifacts: false
       };
-    })) !== null && _c !== void 0 ? _c : undefined : undefined,
+    })) !== null && _c !== void 0 ? _c : [] : []), false),
     // we don't want to deploy when there is a broken test
     needsStages: [{
       stage: "build",
@@ -353287,6 +353374,7 @@ var database_1 = __nccwpck_require__(41384);
 var gitlab_1 = __nccwpck_require__(84997);
 var jobName_1 = __nccwpck_require__(77311);
 var createArgsString_1 = __nccwpck_require__(8686);
+var sbom_1 = __nccwpck_require__(65928);
 var setExtraVarsScripts = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
@@ -353438,18 +353526,18 @@ var createGoogleCloudRunDeployJobs = function (context) {
       "gcloud beta run jobs executions list ".concat(commonArgsString, " --job ").concat(jobName, " --format=\"value(name)\" | xargs -I {} gcloud beta run jobs executions delete {}  --quiet ").concat(commonArgsString), "gcloud beta run jobs delete ".concat(jobName, " ").concat(commonArgsString)];
     });
   };
-  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  var deployScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(setExtraVarsScripts(deployConfig)), false), __read(pushImageToArtifactsRegistry), false), ["echo \"$ENV_VARS\" > ____envvars.yaml"], false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read(getCreateScheduleScripts()), false), __read(getJobCreateScripts()), false), __read(getJobRunScripts("preDeploy")), false), __read(deployConfig.service !== false ? [getServiceDeployScript(deployConfig.service)] : []), false), __read(Object.entries((_b = deployConfig.additionalServices) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
     var _b = __read(_a, 2),
       name = _b[0],
       service = _b[1];
     return getServiceDeployScript(service, "-" + name);
-  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false);
-  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
+  })), false), __read(getJobRunScripts("postDeploy")), false), ["docker image rm ".concat(gcloudImageName)], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  var stopScripts = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read(deployConfig.service !== false ? ["gcloud run services delete ".concat(serviceName, " ").concat(commonArgsString)] : []), false), __read(Object.entries((_c = deployConfig.additionalServices) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
     var _b = __read(_a, 1),
       name = _b[0];
     return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
-  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false);
+  })), false), __read(getDeleteSchedulesScripts()), false), __read(getDeleteJobsScripts()), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
   return [(0, lodash_1.merge)({}, baseDeploymentJob, (0, docker_1.getDockerJobBaseProps)(context), {
     artifacts: {
       paths: ["____envvars.yaml"]
@@ -353829,6 +353917,7 @@ var yarn_1 = __nccwpck_require__(10464);
 var runner_1 = __nccwpck_require__(55071);
 var base_1 = __nccwpck_require__(89177);
 var types_1 = __nccwpck_require__(63109);
+var sbom_1 = __nccwpck_require__(65928);
 var createCustomDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -353847,10 +353936,10 @@ var createCustomDeployJobs = function (context) {
   return __spreadArray([(0, lodash_1.merge)({}, baseDeploymentJob, {
     image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
     cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
-    script: __spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false)
+    script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false)
   })], __read(deployConfig.stopScript ? [(0, lodash_1.merge)({}, (0, base_1.getBaseDeploymentStopJob)(context), {
     image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
-    script: deployConfig.stopScript
+    script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
   })] : []), false);
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
@@ -354125,6 +354214,7 @@ var runner_1 = __nccwpck_require__(55071);
 var base_1 = __nccwpck_require__(89177);
 var types_1 = __nccwpck_require__(63109);
 var kubeValues_1 = __nccwpck_require__(1061);
+var sbom_1 = __nccwpck_require__(65928);
 var createKubernetesDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -354162,12 +354252,12 @@ var createKubernetesDeployJobs = function (context) {
   var clusterName = "kube-".concat(context.environment.fullName);
   var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, __1.getSecretVarNameForContext)(context, "KUBE_TOKEN"), "\""), "kubectl config set-context \"".concat(clusterName, "\" --cluster=\"").concat(clusterName, "\" --user=\"").concat(clusterName, "\" --namespace=\"").concat(context.environment.envVars.KUBE_NAMESPACE, "\""), "kubectl config use-context \"".concat(clusterName, "\"")];
   return [(0, lodash_1.merge)({}, baseDeploymentJob, shared, {
-    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy", "echo deployment successful 😻"], false),
+    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false),
     environment: {
       kubernetes: kubernetesEnvironment
     }
   }), (0, lodash_1.merge)({}, baseStopJob, shared, {
-    script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false),
+    script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
     environment: {
       kubernetes: kubernetesEnvironment
     }
@@ -354613,6 +354703,30 @@ exports.processSecretsAsFiles = processSecretsAsFiles;
 
 /***/ }),
 
+/***/ 65928:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript = exports.sbomDeactivated = void 0;
+var sbom_1 = __nccwpck_require__(9927);
+var sbomDeactivated = function (context) {
+  return context.componentConfig.build.type === "custom" && context.componentConfig.build.sbom === false;
+};
+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.componentName, "\" \"").concat(context.environment.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.componentName, "\" \"").concat(context.environment.url, "\" || true")];
+};
+exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;
+
+/***/ }),
+
 /***/ 20438:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -355618,7 +355732,6 @@ exports.__esModule = true;
 exports.createJobsForComponent = void 0;
 var lodash_1 = __nccwpck_require__(23255);
 var build_1 = __nccwpck_require__(73760);
-var reporting_1 = __nccwpck_require__(43545);
 var context_1 = __nccwpck_require__(22041);
 var deploy_1 = __nccwpck_require__(90223);
 var getCommitInfo_1 = __nccwpck_require__(5923);
@@ -355643,9 +355756,8 @@ var getCustomJobs = function (context) {
 var createRawJobs = function (context) {
   var buildJobs = build_1.BUILD_TYPES[context.componentConfig.build.type].jobs(context);
   var deployJobs = context.componentConfig.deploy !== false ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context) : [];
-  var reportingJobs = (0, reporting_1.createReportingJobs)(context);
   var customJobs = getCustomJobs(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(reportingJobs), false), __read(customJobs), false);
+  return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
 };
 var createJobsForComponent = function (config, componentName, env, trigger) {
   return __awaiter(void 0, void 0, void 0, function () {
@@ -355902,7 +356014,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
       };
     });
   });
-  var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false), __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false);
+  var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false), __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false);
   var gitlabNeeds = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
     var _a;
     return (0, lodash_1.isObject)(n) ? {
@@ -355912,6 +356024,9 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
   }).sort(function (a, b) {
     return getJobName(a).localeCompare(getJobName(b));
   });
+  var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) {
+    return [(0, lodash_1.isObject)(n) ? n.job : n, n];
+  })).values()), false);
   var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
   var gitlabJob = removeUndefined(__assign(__assign({}, job), {
     tags: jobTags,
@@ -355920,7 +356035,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
       on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allJobs)
     }) : job.environment,
     // sort in a predictable manner for snapshot tests
-    needs: gitlabNeeds,
+    needs: deduplicatedGitlabNeeds,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   }));
@@ -356701,61 +356816,6 @@ exports.mergeWithMergingArrays = mergeWithMergingArrays;
 
 /***/ }),
 
-/***/ 43545:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-exports.__esModule = true;
-exports.createReportingJobs = void 0;
-var base_1 = __nccwpck_require__(89177);
-var utils_1 = __nccwpck_require__(37461);
-var STAGE = "verify";
-var SBOM_GENERATE_JOB_NAME = "🧾 sbom";
-var SBOM_FILE = "__sbom.json";
-var createSbomGenerateJob = function (context) {
-  var _a, _b, _c, _d, _e;
-  var buildConfig = context.componentConfig.build;
-  var defaultImage = "aquasec/trivy:0.38.3";
-  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(SBOM_FILE, "\" ").concat(((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace) ? "." : context.componentConfig.dir)];
-  var image = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage : defaultImage;
-  var script = buildConfig.type === "custom" && buildConfig.sbom !== false ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript : defaultScript;
-  return {
-    name: SBOM_GENERATE_JOB_NAME,
-    stage: STAGE,
-    needs: context.componentConfig.deploy !== false ? [base_1.DEPLOY_JOB_NAME] : [],
-    envMode: "jobPerEnv",
-    variables: {},
-    cache: undefined,
-    image: image,
-    script: script,
-    allow_failure: true,
-    artifacts: {
-      paths: [SBOM_FILE]
-    }
-  };
-};
-var createSbomUploadJob = function (context) {
-  return {
-    name: "🧾 sbom upload",
-    stage: STAGE,
-    needs: [SBOM_GENERATE_JOB_NAME],
-    envMode: "jobPerEnv",
-    variables: {},
-    cache: undefined,
-    image: "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
-    script: ["/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.shortName, "\" \"").concat(SBOM_FILE, "\" vex.json")],
-    allow_failure: true
-  };
-};
-var createReportingJobs = function (context) {
-  return context.componentConfig.build.type === "custom" && context.componentConfig.build.sbom === false ? [] : [createSbomGenerateJob(context), createSbomUploadJob(context)];
-};
-exports.createReportingJobs = createReportingJobs;
-
-/***/ }),
-
 /***/ 15058:
 /***/ ((module) => {
 

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-8f79dd9f",
+    "@catladder/pipeline": "0.0.0-main-48ef3537",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-main-8f79dd9f",
+  "version": "0.0.0-main-48ef3537",
   "stableVersion": "0.0.0"
 }