@catladder/pipeline 3.40.1 → 3.41.0

package/src/deploy/kubernetes/deployJob.ts

@@ -3,10 +3,7 @@ import { getRunnerImage } from "../../runner";
 import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { createDeployementJobs } from "../base";
-import {
-  getDependencyTrackDeleteScript,
-  getDependencyTrackUploadScript,
-} from "../sbom";
+
 import { isOfDeployType } from "../types";
 import { createKubeValues } from "./kubeValues";
 
@@ -80,17 +77,13 @@ export const createKubernetesDeployJobs = (
         ),
         "kubernetesCreateSecret",
         "kubernetesDeploy",
-        ...getDependencyTrackUploadScript(context),
+
         "echo deployment successful 😻",
       ],
     },
     stop: {
       ...shared,
-      script: [
-        ...connectContext,
-        "kubernetesDelete",
-        ...getDependencyTrackDeleteScript(context),
-      ],
+      script: [...connectContext, "kubernetesDelete"],
     },
     rollback: {
       ...shared,

package/dist/build/sbom.d.ts

@@ -1,5 +0,0 @@
-import type { ComponentContextWithBuild } from "../types/context";
-import type { CatladderJob } from "../types/jobs";
-export declare const SBOM_BUILD_JOB_NAME = "\uD83E\uDDFE sbom";
-export declare const SBOM_FILE = "__sbom.json";
-export declare const createSbomBuildJob: (context: ComponentContextWithBuild) => CatladderJob;

package/dist/build/sbom.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createSbomBuildJob = exports.SBOM_FILE = exports.SBOM_BUILD_JOB_NAME = void 0;
-var _1 = require(".");
-var utils_1 = require("../utils");
-exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
-exports.SBOM_FILE = "__sbom.json";
-var createSbomBuildJob = function (context) {
-  var _a, _b, _c, _d;
-  var buildConfig = context.build.config;
-  var defaultImage = {
-    name: "aquasec/trivy:0.58.2",
-    entrypoint: [""]
-  };
-  var defaultScript = ["trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(context.packageManagerInfo.componentIsInWorkspace ? "." : context.build.dir)];
-  var image = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_b = (_a = buildConfig.sbom) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage : defaultImage;
-  var script = (0, _1.isStandaloneBuildConfig)(buildConfig) && buildConfig.type === "custom" && buildConfig.sbom !== false ? (_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : 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;

package/dist/deploy/sbom.d.ts

@@ -1,4 +0,0 @@
-import { type ComponentContext } from "../types/context";
-export declare const sbomDeactivated: (context: ComponentContext) => boolean;
-export declare const getDependencyTrackUploadScript: (context: ComponentContext) => string[];
-export declare const getDependencyTrackDeleteScript: (context: ComponentContext) => string[];

package/dist/deploy/sbom.js

@@ -1,21 +0,0 @@
-"use strict";
-
-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) {
-  return context.build.type === "disabled" || (0, context_1.componentContextIsStandaloneBuild)(context) && context.build.config.type === "custom" && context.build.config.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.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((0, BashExpression_1.getBashVariable)("CI_ENVIRONMENT_URL"), "\" || true")];
-};
-exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;

package/examples/custom-sbom-java.ts

@@ -1,38 +0,0 @@
-import type { Config } from "../src";
-
-const config = {
-  appName: "test-app",
-  customerName: "pan",
-  components: {
-    app: {
-      dir: "app",
-      build: {
-        type: "custom",
-        docker: {
-          type: "custom",
-          buildContextLocation: "component", // default is root
-        },
-        jobImage: "maven:3-eclipse-temurin-11",
-        buildCommand: ["mvn package", "cp -r target dist"],
-        sbom: {
-          jobImage: "maven:3-eclipse-temurin-11",
-          command: [
-            "mvn org.cyclonedx:cyclonedx-maven-plugin:2.7.4:makeBom",
-            "mv target/bom.json __sbom.json",
-          ],
-        },
-      },
-      deploy: {
-        type: "google-cloudrun",
-        projectId: "asdf",
-        region: "asia-east1",
-      },
-    },
-  },
-} satisfies Config;
-
-export default config;
-
-export const information = {
-  title: "Custom: Sbom Java",
-};

package/src/build/sbom.ts

@@ -1,53 +0,0 @@
-import { isStandaloneBuildConfig } from ".";
-import type { ComponentContextWithBuild } from "../types/context";
-import type { CatladderJob } from "../types/jobs";
-import { ensureArrayOrNull } from "../utils";
-
-export const SBOM_BUILD_JOB_NAME = "🧾 sbom";
-export const SBOM_FILE = "__sbom.json";
-
-export const createSbomBuildJob = (
-  context: ComponentContextWithBuild,
-): CatladderJob => {
-  const buildConfig = context.build.config;
-
-  const defaultImage = {
-    name: "aquasec/trivy:0.58.2",
-    entrypoint: [""],
-  };
-  const defaultScript = [
-    `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
-      context.packageManagerInfo.componentIsInWorkspace
-        ? "."
-        : context.build.dir
-    }`,
-  ];
-
-  const image =
-    isStandaloneBuildConfig(buildConfig) &&
-    buildConfig.type === "custom" &&
-    buildConfig.sbom !== false
-      ? (buildConfig.sbom?.jobImage ?? defaultImage)
-      : defaultImage;
-
-  const script =
-    isStandaloneBuildConfig(buildConfig) &&
-    buildConfig.type === "custom" &&
-    buildConfig.sbom !== false
-      ? (ensureArrayOrNull(buildConfig.sbom?.command) ?? defaultScript)
-      : defaultScript;
-
-  return {
-    name: SBOM_BUILD_JOB_NAME,
-    stage: "build",
-    envMode: "jobPerEnv",
-    variables: {},
-    cache: undefined,
-    image,
-    script,
-    allow_failure: true,
-    artifacts: {
-      paths: [SBOM_FILE],
-    },
-  };
-};

package/src/deploy/sbom.ts

@@ -1,34 +0,0 @@
-import { getBashVariable } from "../bash/BashExpression";
-import { SBOM_FILE } from "../build/sbom";
-import {
-  componentContextIsStandaloneBuild,
-  type ComponentContext,
-} from "../types/context";
-
-export const sbomDeactivated = (context: ComponentContext) =>
-  context.build.type === "disabled" ||
-  (componentContextIsStandaloneBuild(context) &&
-    context.build.config.type === "custom" &&
-    context.build.config.sbom === false);
-
-export const getDependencyTrackUploadScript = (
-  context: ComponentContext,
-): string[] => {
-  return sbomDeactivated(context)
-    ? []
-    : [
-        "echo 'Uploading SBOM to Dependency Track'",
-        `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${getBashVariable("ROOT_URL")}" "${SBOM_FILE}" vex.json || true`,
-      ];
-};
-
-export const getDependencyTrackDeleteScript = (
-  context: ComponentContext,
-): string[] => {
-  return sbomDeactivated(context)
-    ? []
-    : [
-        "echo 'Disabling component in Dependency Track'",
-        `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${getBashVariable("CI_ENVIRONMENT_URL")}" || true`,
-      ];
-};