@catladder/pipeline 3.40.0 → 3.41.0

package/dist/build/base/index.js

@@ -45,21 +45,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createWorkspaceBuildJobs = exports.createComponentBuildJobs = void 0;
-var sbom_1 = require("../../deploy/sbom");
 var context_1 = require("../../types/context");
 var docker_1 = require("../docker");
-var sbom_2 = require("../sbom");
 var constants_1 = require("./constants");
 var createAppBuildJob_1 = require("./createAppBuildJob");
 var createComponentBuildJobs = function (context, definitions) {
   var _a;
-  return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild && (0, context_1.componentContextIsStandaloneBuild)(context) ? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
+  return __spreadArray(__spreadArray([], __read(definitions.appBuild && (0, context_1.componentContextIsStandaloneBuild)(context) ? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
     needs: __spreadArray(__spreadArray([], __read((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : []), false), __read(definitions.appBuild && (0, context_1.componentContextIsStandaloneBuild)(context) ? [constants_1.APP_BUILD_JOB_NAME] : (0, context_1.componentContextHasWorkspaceBuild)(context) ? [{
       job: constants_1.APP_BUILD_JOB_NAME,
       artifacts: true,
       workspaceName: context.build.workspaceName
     }] : []), false)
-  }))] : []), false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
+  }))] : []), false);
 };
 exports.createComponentBuildJobs = createComponentBuildJobs;
 var createWorkspaceBuildJobs = function (context, definitions) {

package/dist/build/rails/build.js

@@ -83,7 +83,7 @@ var createRailsBuildJobs = function (context) {
       // custom script
       script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["cd ".concat(context.build.dir), "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 : "")], false)
+      "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack config registry-mirrors add index.docker.io --mirror mirror.gcr.io", "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 : "")], false)
     }
   });
 };

package/dist/build/types.d.ts

@@ -236,16 +236,6 @@ export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit">
    * custom audit, disabled when not set
    */
   audit?: TestJobCustom;
-  /**
-   * custom sbom (software bill of materials), set false to disable
-   */
-  sbom?: false | {
-    /**
-     * needs to create a file at `/__sbom.json` in CycloneDX format
-     */
-    command: string | string[];
-    jobImage: GitlabJobImage;
-  };
 };
 export type BuildConfigRails = BuildConfigBase & {
   type: "rails";

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 = "v3-40-0-dfa8bf9c" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v3-41-0-da98739c" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/deploy/base/deploy.js

@@ -47,9 +47,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
 var createJobCache_1 = require("../../build/cache/createJobCache");
 var docker_1 = require("../../build/docker");
-var sbom_1 = require("../../build/sbom");
 var context_1 = require("../../types/context");
-var sbom_2 = require("../sbom");
 var utils_1 = require("../utils");
 var stop_1 = require("./stop");
 var variables_1 = require("./variables");
@@ -76,10 +74,7 @@ var createDeployJob = function (context, jobDefinition) {
     services: jobDefinition.services,
     envMode: "stagePerEnv",
     // makes it easier to run manual tasks er env
-    needs: __spreadArray(__spreadArray([], __read((0, sbom_2.sbomDeactivated)(context) ? [] : [{
-      job: sbom_1.SBOM_BUILD_JOB_NAME,
-      artifacts: true
-    }]), false), __read(deployConfig ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) {
+    needs: __spreadArray([], __read(deployConfig ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,

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

@@ -37,7 +37,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.getCloudRunDeployScripts = void 0;
 var lodash_1 = require("lodash");
 var gitlab_1 = require("../../../utils/gitlab");
-var sbom_1 = require("../../sbom");
 var __1 = require("..");
 var bashYaml_1 = require("../../../bash/bashYaml");
 var cleanup_1 = require("../cleanup");
@@ -53,7 +52,7 @@ function getCloudRunDeployScripts(context) {
   var _a;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read((0, schedules_1.getCreateScheduleScript)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preDeploy")), false), __read(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(function (_a) {
     var _b = __read(_a, 2),
       _ = _b[0],
@@ -64,6 +63,6 @@ function getCloudRunDeployScripts(context) {
       name = _b[0],
       service = _b[1];
     return (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name);
-  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))), false);
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;

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

@@ -35,7 +35,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getCloudRunStopScripts = void 0;
-var sbom_1 = require("../../sbom");
 var cleanup_1 = require("../cleanup");
 var database_1 = require("../utils/database");
 var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
@@ -47,7 +46,7 @@ var common_1 = require("./common");
 function getCloudRunStopScripts(context) {
   var _a;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preStop")), false), __read(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(function (_a) {
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preStop")), false), __read(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(function (_a) {
     var _b = __read(_a, 2),
       _ = _b[0],
       service = _b[1];
@@ -56,6 +55,6 @@ function getCloudRunStopScripts(context) {
     var _b = __read(_a, 1),
       name = _b[0];
     return (0, cloudRunServices_1.getServiceDeleteScript)(context, name);
-  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postStop")), false), __read((0, schedules_1.getDeleteSchedulesScript)(context)), false), __read((0, cloudRunJobs_1.getDeleteJobsScripts)(context)), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postStop")), false), __read((0, schedules_1.getDeleteSchedulesScript)(context)), false), __read((0, cloudRunJobs_1.getDeleteJobsScripts)(context)), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false);
 }
 exports.getCloudRunStopScripts = getCloudRunStopScripts;

package/dist/deploy/custom/deployJob.js

@@ -39,7 +39,6 @@ var getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfi
 var yarn_1 = require("../../build/node/yarn");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
-var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var createCustomDeployJobs = function (context) {
   var _a, _b, _c;
@@ -56,12 +55,12 @@ var createCustomDeployJobs = function (context) {
     deploy: {
       image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
       cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
-      script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
+      script: __spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false),
       variables: {}
     },
     stop: deployConfig.stopScript ? {
       image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
-      script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
+      script: __spreadArray([], __read(deployConfig.stopScript), false),
       variables: {}
     } : undefined
   });

package/dist/deploy/kubernetes/deployJob.js

@@ -48,7 +48,6 @@ exports.createKubernetesDeployJobs = void 0;
 var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
-var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var kubeValues_1 = require("./kubeValues");
 var bashYaml_1 = require("../../bash/bashYaml");
@@ -83,10 +82,10 @@ var createKubernetesDeployJobs = function (context) {
   var connectContext = ["kubectl config set-cluster \"".concat(clusterName, "\" --server=\"$").concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "KUBE_URL"), "\" --certificate-authority <(echo $").concat((0, getEnvironmentVariables_1.getSecretVarNameForContext)(context, "KUBE_CA_PEM"), " | base64 -d) --embed-certs=true"), "kubectl config set-credentials \"".concat(clusterName, "\" --token=\"$").concat((0, getEnvironmentVariables_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, base_1.createDeployementJobs)(context, {
     deploy: __assign(__assign({}, shared), {
-      script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), __read((0, gitlab_1.collapseableSection)("writeallvalues", "Write " + ALL_VALUES_FILE + " for helm deployment")((0, bashYaml_1.writeBashYamlToFileScript)((0, kubeValues_1.createKubeValues)(context), ALL_VALUES_FILE))), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
+      script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), __read((0, gitlab_1.collapseableSection)("writeallvalues", "Write " + ALL_VALUES_FILE + " for helm deployment")((0, bashYaml_1.writeBashYamlToFileScript)((0, kubeValues_1.createKubeValues)(context), ALL_VALUES_FILE))), false), ["kubernetesCreateSecret", "kubernetesDeploy", "echo deployment successful 😻"], false)
     }),
     stop: __assign(__assign({}, shared), {
-      script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
+      script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false)
     }),
     rollback: __assign(__assign({}, shared), {
       script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)