@catladder/pipeline 1.110.2 → 1.110.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build/custom/buildJob.js +4 -2
- package/dist/build/node/buildJob.js +4 -2
- package/dist/build/rails/build.js +13 -2
- package/dist/build/sbom.d.ts +5 -0
- package/dist/build/sbom.js +29 -0
- package/dist/bundles/catladder-gitlab/index.js +3 -3
- package/dist/constants.js +1 -1
- package/dist/deploy/base.js +38 -2
- package/dist/deploy/cloudRun/deployJob.js +5 -4
- package/dist/deploy/custom/deployJob.js +3 -2
- package/dist/deploy/kubernetes/deployJob.js +3 -2
- package/dist/deploy/sbom.d.ts +4 -0
- package/dist/deploy/sbom.js +17 -0
- package/dist/pipeline/createJobsForComponent.js +1 -3
- package/dist/pipeline/gitlab/createGitlabJobs.js +5 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/examples/__snapshots__/cloud-run-memory-limit.ts.snap +40 -96
- package/examples/__snapshots__/cloud-run-no-cpu-throttling.ts.snap +40 -96
- package/examples/__snapshots__/cloud-run-non-public.ts.snap +40 -96
- package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap +80 -192
- package/examples/__snapshots__/cloud-run-with-sql.ts.snap +80 -192
- package/examples/__snapshots__/custom-build-job-with-tests.ts.snap +40 -96
- package/examples/__snapshots__/custom-build-job.ts.snap +40 -96
- package/examples/__snapshots__/custom-deploy.ts.snap +40 -96
- package/examples/__snapshots__/custom-envs.ts.snap +6 -126
- package/examples/__snapshots__/custom-sbom-java.ts.snap +40 -96
- package/examples/__snapshots__/kubernetes-application-customization.ts.snap +40 -96
- package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap +40 -96
- package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap +40 -96
- package/examples/__snapshots__/kubernetes-with-jobs.ts.snap +80 -192
- package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap +40 -96
- package/examples/__snapshots__/native-app.ts.snap +72 -192
- package/examples/__snapshots__/node-build-with-custom-image.ts.snap +40 -96
- package/examples/__snapshots__/rails-k8s-with-worker.ts.snap +40 -96
- package/examples/__snapshots__/wait-for-other-deploy.ts.snap +64 -192
- package/package.json +1 -1
- package/src/build/custom/buildJob.ts +3 -0
- package/src/build/node/buildJob.ts +3 -0
- package/src/build/rails/build.ts +3 -0
- package/src/build/sbom.ts +43 -0
- package/src/deploy/base.ts +14 -7
- package/src/deploy/cloudRun/deployJob.ts +6 -0
- package/src/deploy/custom/deployJob.ts +9 -1
- package/src/deploy/kubernetes/deployJob.ts +10 -1
- package/src/deploy/sbom.ts +24 -0
- package/src/pipeline/createJobsForComponent.ts +1 -3
- package/src/pipeline/gitlab/createGitlabJobs.ts +6 -2
- package/dist/verify/reporting.d.ts +0 -3
- package/dist/verify/reporting.js +0 -48
- package/src/verify/reporting.ts +0 -69
|
@@ -49,6 +49,8 @@ var constants_1 = require("../base/constants");
|
|
|
49
49
|
var createBuildJob_1 = require("../base/createBuildJob");
|
|
50
50
|
var docker_1 = require("../docker");
|
|
51
51
|
var types_1 = require("../types");
|
|
52
|
+
var sbom_1 = require("../sbom");
|
|
53
|
+
var sbom_2 = require("../../deploy/sbom");
|
|
52
54
|
var RUNNER_BUILD_VARIABLES = {
|
|
53
55
|
KUBERNETES_CPU_REQUEST: "0.5",
|
|
54
56
|
KUBERNETES_CPU_LIMIT: "2",
|
|
@@ -74,11 +76,11 @@ var createCustomBuildJobs = function (context) {
|
|
|
74
76
|
expire_in: "1 day"
|
|
75
77
|
}
|
|
76
78
|
}) : null;
|
|
77
|
-
return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
|
|
79
|
+
return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
|
|
78
80
|
script: [((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : "" // e.g. custom,
|
|
79
81
|
].filter(Boolean),
|
|
80
82
|
variables: {},
|
|
81
83
|
needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
|
|
82
|
-
})] : []), false);
|
|
84
|
+
})] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
|
|
83
85
|
};
|
|
84
86
|
exports.createCustomBuildJobs = createCustomBuildJobs;
|
|
@@ -53,6 +53,8 @@ var cache_1 = require("./cache");
|
|
|
53
53
|
var constants_2 = require("./constants");
|
|
54
54
|
var yarn_1 = require("./yarn");
|
|
55
55
|
var runner_1 = require("../../runner");
|
|
56
|
+
var sbom_1 = require("../sbom");
|
|
57
|
+
var sbom_2 = require("../../deploy/sbom");
|
|
56
58
|
var createNodeBuildJobs = function (context) {
|
|
57
59
|
var _a, _b, _c, _d, _e, _f, _g;
|
|
58
60
|
var buildConfig = context.componentConfig.build;
|
|
@@ -74,7 +76,7 @@ var createNodeBuildJobs = function (context) {
|
|
|
74
76
|
},
|
|
75
77
|
jobTags: buildConfig.jobTags
|
|
76
78
|
}) : null;
|
|
77
|
-
return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
|
|
79
|
+
return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
|
|
78
80
|
script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
|
|
79
81
|
cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
|
|
80
82
|
variables: {
|
|
@@ -85,6 +87,6 @@ var createNodeBuildJobs = function (context) {
|
|
|
85
87
|
})) === null || _g === void 0 ? void 0 : _g.join("\n")
|
|
86
88
|
},
|
|
87
89
|
needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
|
|
88
|
-
})] : []), false);
|
|
90
|
+
})] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
|
|
89
91
|
};
|
|
90
92
|
exports.createNodeBuildJobs = createNodeBuildJobs;
|
|
@@ -32,10 +32,21 @@ var __read = this && this.__read || function (o, n) {
|
|
|
32
32
|
}
|
|
33
33
|
return ar;
|
|
34
34
|
};
|
|
35
|
+
var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
36
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
37
|
+
if (ar || !(i in from)) {
|
|
38
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
39
|
+
ar[i] = from[i];
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
43
|
+
};
|
|
35
44
|
exports.__esModule = true;
|
|
36
45
|
exports.createRailsBuildJobs = void 0;
|
|
37
46
|
var types_1 = require("../types");
|
|
38
47
|
var docker_1 = require("../docker");
|
|
48
|
+
var sbom_1 = require("../../deploy/sbom");
|
|
49
|
+
var sbom_2 = require("../sbom");
|
|
39
50
|
var createRailsBuildJobs = function (context) {
|
|
40
51
|
var _a, _b, _c;
|
|
41
52
|
var buildConfig = context.componentConfig.build;
|
|
@@ -50,12 +61,12 @@ var createRailsBuildJobs = function (context) {
|
|
|
50
61
|
v = _b[1];
|
|
51
62
|
return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
|
|
52
63
|
}).join(" ");
|
|
53
|
-
return [(0, docker_1.createDockerBuildJobBase)(context, {
|
|
64
|
+
return __spreadArray([(0, docker_1.createDockerBuildJobBase)(context, {
|
|
54
65
|
variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
|
|
55
66
|
// custom script
|
|
56
67
|
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",
|
|
57
68
|
// replace private git ssh gem sources with https to make bundler with credentials via env var work
|
|
58
69
|
"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 : "")]
|
|
59
|
-
})];
|
|
70
|
+
})], __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
|
|
60
71
|
};
|
|
61
72
|
exports.createRailsBuildJobs = createRailsBuildJobs;
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { Context } from "../types/context";
|
|
2
|
+
import type { CatladderJob } from "../types/jobs";
|
|
3
|
+
export declare const SBOM_BUILD_JOB_NAME = "\uD83E\uDDFE sbom";
|
|
4
|
+
export declare const SBOM_FILE = "__sbom.json";
|
|
5
|
+
export declare const createSbomBuildJob: (context: Context) => CatladderJob;
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
exports.createSbomBuildJob = exports.SBOM_FILE = exports.SBOM_BUILD_JOB_NAME = void 0;
|
|
5
|
+
var utils_1 = require("../utils");
|
|
6
|
+
exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
|
|
7
|
+
exports.SBOM_FILE = "__sbom.json";
|
|
8
|
+
var createSbomBuildJob = function (context) {
|
|
9
|
+
var _a, _b, _c, _d, _e;
|
|
10
|
+
var buildConfig = context.componentConfig.build;
|
|
11
|
+
var defaultImage = "aquasec/trivy:0.38.3";
|
|
12
|
+
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)];
|
|
13
|
+
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;
|
|
14
|
+
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;
|
|
15
|
+
return {
|
|
16
|
+
name: exports.SBOM_BUILD_JOB_NAME,
|
|
17
|
+
stage: "build",
|
|
18
|
+
envMode: "jobPerEnv",
|
|
19
|
+
variables: {},
|
|
20
|
+
cache: undefined,
|
|
21
|
+
image: image,
|
|
22
|
+
script: script,
|
|
23
|
+
allow_failure: true,
|
|
24
|
+
artifacts: {
|
|
25
|
+
paths: [exports.SBOM_FILE]
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
};
|
|
29
|
+
exports.createSbomBuildJob = createSbomBuildJob;
|