@catladder/cli 1.146.2 → 1.147.0
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/bundles/catenv/index.js +1 -1
- package/dist/bundles/cli/index.js +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +22 -19
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/commandOpenDashboard.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandPortForward.js +18 -16
- package/dist/cli/src/apps/cli/commands/project/commandPortForward.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js +9 -8
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +23 -22
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js +10 -9
- package/dist/cli/src/apps/cli/commands/project/utils/ensureCluster.js.map +1 -1
- package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js +6 -5
- package/dist/cli/src/gcloud/cloudRun/openCloudRunDashboards.js.map +1 -1
- package/dist/cli/src/kubernetes/openKubernetesDashboards.js +10 -8
- package/dist/cli/src/kubernetes/openKubernetesDashboards.js.map +1 -1
- package/dist/pipeline/src/build/base/createAppBuildJob.js +8 -6
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/base/writeBuildInfo.js +1 -1
- package/dist/pipeline/src/build/base/writeBuildInfo.js.map +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
- package/dist/pipeline/src/build/custom/buildJob.js +6 -6
- package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/custom/testJob.js +5 -5
- package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.d.ts +26 -5
- package/dist/pipeline/src/build/docker.js +50 -17
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.js +11 -11
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.js +1 -1
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.js +10 -10
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.js +12 -12
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/rails/build.js +3 -3
- package/dist/pipeline/src/build/rails/build.js.map +1 -1
- package/dist/pipeline/src/build/rails/test.js +4 -4
- package/dist/pipeline/src/build/rails/test.js.map +1 -1
- package/dist/pipeline/src/build/sbom.js +3 -3
- package/dist/pipeline/src/build/sbom.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +33 -25
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/context/getLabels.js +1 -1
- package/dist/pipeline/src/context/getLabels.js.map +1 -1
- package/dist/pipeline/src/context/index.js +37 -15
- package/dist/pipeline/src/context/index.js.map +1 -1
- package/dist/pipeline/src/deploy/base/deploy.js +10 -17
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.d.ts +1 -1
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js +8 -9
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js +4 -5
- package/dist/pipeline/src/deploy/cloudRun/cloudRunRevisions.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/cloudRunServices.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts +4 -4
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js +2 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js +2 -4
- package/dist/pipeline/src/deploy/cloudRun/createJobs/index.js.map +1 -1
- package/dist/pipeline/src/deploy/custom/deployJob.js +7 -10
- package/dist/pipeline/src/deploy/custom/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/dockerTag/deployJob.js +3 -5
- package/dist/pipeline/src/deploy/dockerTag/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +11 -9
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js +3 -6
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js +2 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeEnv.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +6 -6
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js +11 -11
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js.map +1 -1
- package/dist/pipeline/src/deploy/sbom.js +1 -2
- package/dist/pipeline/src/deploy/sbom.js.map +1 -1
- package/dist/pipeline/src/deploy/types/index.d.ts +1 -1
- package/dist/pipeline/src/deploy/types/index.js +1 -1
- package/dist/pipeline/src/deploy/types/index.js.map +1 -1
- package/dist/pipeline/src/deploy/utils.js +2 -1
- package/dist/pipeline/src/deploy/utils.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForComponent.js +6 -8
- package/dist/pipeline/src/pipeline/createJobsForComponent.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +1 -1
- package/dist/pipeline/src/types/context.d.ts +13 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +6 -9
- package/src/apps/cli/commands/project/commandOpenDashboard.ts +2 -2
- package/src/apps/cli/commands/project/commandPortForward.ts +4 -4
- package/src/apps/cli/commands/project/setup/setupCloudRun.ts +2 -2
- package/src/apps/cli/commands/project/setup/setupContext.ts +2 -2
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +1 -1
- package/src/apps/cli/commands/project/utils/ensureCluster.ts +2 -4
- package/src/gcloud/cloudRun/openCloudRunDashboards.ts +2 -2
- package/src/kubernetes/openKubernetesDashboards.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"meteor.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/meteor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,uCAA8C;AAM9C,gCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AACzC,iCAAuC;AACvC,+BAAwC;AAExC,IAAM,cAAc,GAAG,UAAC,OAAyB,IAAuB,OAAA;IACtE;QACE,GAAG,EAAE,OAAO,CAAC,aAAa,GAAG,oBAAoB;QACjD,MAAM,EAAE,WAAW;QACnB,KAAK,EAAE;YACL,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,0CAA0C,CAAC;YACnE,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,4BAA4B,CAAC;YACrD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,wBAAwB,CAAC;YACjD,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,qCAAqC,CAAC;SAC/D;KACF;CACF,EAXuE,CAWvE,CAAC;AACK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,IAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAElD,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,yCAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,KAAK,CAAC,kBAAK,cAAc,CAAC,OAAO,CAAC,SAAC;gBACnE,KAAK,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC;gBACpC,SAAS,EAAE;oBACT,iCAAiC,EAAE,GAAG,EAAE,yGAAyG;iBAClJ;gBACD,MAAM,yCACD,WAAW;oBAEd,gCAAgC;oBAChC,iDAAiD;oBACjD,gDAAgD;oBAEhD,kNAAkN;oBAElN,sDAAsD;yBACvD;gBACD,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,oBAAoB;wBACxC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,OAAO;qBAC5B;iBACF;aACF;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,EAAE,QAAQ,CAAC;YACpE,SAAS,EAAE;gBACT,sBAAsB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACjE;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA9CW,QAAA,qBAAqB,yBA8ChC"}
|
|
@@ -50,32 +50,32 @@ var createNodeTestJobs = function (context) {
|
|
|
50
50
|
if (context.trigger === "taggedRelease") {
|
|
51
51
|
return [];
|
|
52
52
|
}
|
|
53
|
-
var buildConfig = context.
|
|
53
|
+
var buildConfig = context.build.config;
|
|
54
54
|
var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
|
|
55
55
|
var base = {
|
|
56
|
-
variables: __assign(__assign({ APP_PATH: context.
|
|
56
|
+
variables: __assign(__assign({ APP_PATH: context.build.dir }, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
|
|
57
57
|
runnerVariables: constants_1.NODE_RUNNER_BUILD_VARIABLES,
|
|
58
58
|
stage: "test",
|
|
59
59
|
needs: [],
|
|
60
60
|
envMode: "none",
|
|
61
61
|
};
|
|
62
|
-
var yarnInstall = (0, yarn_1.getYarnInstall)(context.
|
|
62
|
+
var yarnInstall = (0, yarn_1.getYarnInstall)(context.build);
|
|
63
63
|
var auditJob = buildConfig.audit !== false
|
|
64
64
|
? __assign(__assign(__assign({ name: "🛡 audit" }, base), { image: (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage, cache: undefined, script: __spreadArray([
|
|
65
|
-
"cd ".concat(context.
|
|
65
|
+
"cd ".concat(context.build.dir)
|
|
66
66
|
], __read(((_e = (0, utils_1.ensureArray)((_d = buildConfig.audit) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : [
|
|
67
|
-
((_f = context.
|
|
67
|
+
((_f = context.build.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.isClassic)
|
|
68
68
|
? "yarn audit"
|
|
69
69
|
: "yarn npm audit --environment production", // yarn 2
|
|
70
|
-
])), false), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.
|
|
70
|
+
])), false), allow_failure: true }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_g = buildConfig.audit) === null || _g === void 0 ? void 0 : _g.artifactsReports, (_h = buildConfig.audit) === null || _h === void 0 ? void 0 : _h.artifacts)) : null;
|
|
71
71
|
var lintJob = buildConfig.lint !== false
|
|
72
|
-
? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.jobImage) !== null && _k !== void 0 ? _k : defaultImage, cache: (0, cache_1.getNodeCache)(context.
|
|
73
|
-
"cd ".concat(context.
|
|
74
|
-
], false), __read(yarnInstall), false), __read(((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["yarn lint"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.
|
|
72
|
+
? __assign(__assign(__assign({ name: "👮 lint" }, base), { image: (_k = (_j = buildConfig.lint) === null || _j === void 0 ? void 0 : _j.jobImage) !== null && _k !== void 0 ? _k : defaultImage, cache: (0, cache_1.getNodeCache)(context.build), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), [
|
|
73
|
+
"cd ".concat(context.build.dir)
|
|
74
|
+
], false), __read(yarnInstall), false), __read(((_m = (0, utils_1.ensureArray)((_l = buildConfig.lint) === null || _l === void 0 ? void 0 : _l.command)) !== null && _m !== void 0 ? _m : ["yarn lint"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_o = buildConfig.lint) === null || _o === void 0 ? void 0 : _o.artifactsReports, (_p = buildConfig.lint) === null || _p === void 0 ? void 0 : _p.artifacts)) : null;
|
|
75
75
|
var testJob = buildConfig.test !== false
|
|
76
|
-
? __assign(__assign(__assign({ name: "🧪 test" }, base), { image: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : (0, runner_1.getRunnerImage)("jobs-testing-chrome"), cache: (0, cache_1.getNodeCache)(context.
|
|
77
|
-
"cd ".concat(context.
|
|
78
|
-
], false), __read(yarnInstall), false), __read(((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["yarn test"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.
|
|
76
|
+
? __assign(__assign(__assign({ name: "🧪 test" }, base), { image: (_r = (_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.jobImage) !== null && _r !== void 0 ? _r : (0, runner_1.getRunnerImage)("jobs-testing-chrome"), cache: (0, cache_1.getNodeCache)(context.build), script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, yarn_1.ensureNodeVersion)(context.build)), false), [
|
|
77
|
+
"cd ".concat(context.build.dir)
|
|
78
|
+
], false), __read(yarnInstall), false), __read(((_t = (0, utils_1.ensureArray)((_s = buildConfig.test) === null || _s === void 0 ? void 0 : _s.command)) !== null && _t !== void 0 ? _t : ["yarn test"])), false) }), (0, createArtifactsConfig_1.createArtifactsConfig)(context.build.dir, (_u = buildConfig.test) === null || _u === void 0 ? void 0 : _u.artifactsReports, (_v = buildConfig.test) === null || _v === void 0 ? void 0 : _v.artifacts)) : null;
|
|
79
79
|
return [auditJob, lintJob, testJob].filter(utils_1.notNil);
|
|
80
80
|
};
|
|
81
81
|
exports.createNodeTestJobs = createNodeTestJobs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA8C;AAG9C,qCAAkD;AAClD,iCAAuC;AACvC,yCAA0D;AAC1D,+BAA2D;AAC3D,uEAAsE;AAE/D,IAAM,kBAAkB,GAAG,UAChC,OAAyB;;IAEzB,gCAAgC;IAChC,6CAA6C;IAC7C,IAAI,OAAO,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAM,WAAW,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/testJob.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ var docker_1 = require("../docker");
|
|
|
42
42
|
var types_1 = require("../types");
|
|
43
43
|
var createRailsBuildJobs = function (context) {
|
|
44
44
|
var _a, _b, _c;
|
|
45
|
-
var buildConfig = context.
|
|
45
|
+
var buildConfig = context.build.config;
|
|
46
46
|
if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
|
|
47
47
|
// should not happen
|
|
48
48
|
throw new Error("build type is not rails");
|
|
@@ -66,10 +66,10 @@ var createRailsBuildJobs = function (context) {
|
|
|
66
66
|
return (0, base_1.createBuildJobs)(context, {
|
|
67
67
|
appBuild: undefined,
|
|
68
68
|
dockerBuild: {
|
|
69
|
-
variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.
|
|
69
|
+
variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.build.config.extraVars),
|
|
70
70
|
// custom script
|
|
71
71
|
script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), [
|
|
72
|
-
"cd ".concat(context.
|
|
72
|
+
"cd ".concat(context.build.dir),
|
|
73
73
|
"docker pull $DOCKER_CACHE_IMAGE || true",
|
|
74
74
|
"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"),
|
|
75
75
|
"chmod +x /usr/local/bin/pack",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,gCAA0C;AAC1C,oCAImB;AACnB,kCAAyC;AAElC,IAAM,oBAAoB,GAAG,UAClC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,gCAA0C;AAC1C,oCAImB;AACnB,kCAAyC;AAElC,IAAM,oBAAoB,GAAG,UAClC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IACzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,IAAA,sBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;YAC9B,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE;gBACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,CAAC;gBAC5C,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;IAEvC,IAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,EAAE,CAAC;SACzD,GAAG,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAAM,OAAA,iBAAU,CAAC,SAAG,CAAC,CAAC,CAAC,CAAC,WAAI,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,MAAG;IAAjC,CAAiC,CAAC;SAClD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE;YACX,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAClC;YACD,gBAAgB;YAChB,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;gBACzB,yCAAyC;gBACzC,yFAAkF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,oBAAU,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,yDAAsD;gBAC1L,8BAA8B;gBAC9B,oGAAoG;gBACpG,yEAAyE;gBACzE,oEACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,+DACmC,WAAW,cAC5D,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,IAAI,CAAC,GAAG,CAAC,mCAAI,EAAE,CACvC;qBACH;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAhDW,QAAA,oBAAoB,wBAgD/B"}
|
|
@@ -45,7 +45,7 @@ var createRailsTestJobs = function (context) {
|
|
|
45
45
|
if (context.trigger === "taggedRelease") {
|
|
46
46
|
return [];
|
|
47
47
|
}
|
|
48
|
-
var buildConfig = context.
|
|
48
|
+
var buildConfig = context.build.config;
|
|
49
49
|
var base = {
|
|
50
50
|
variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
|
|
51
51
|
stage: "test",
|
|
@@ -67,20 +67,20 @@ var createRailsTestJobs = function (context) {
|
|
|
67
67
|
};
|
|
68
68
|
var auditJob = buildConfig.audit !== false
|
|
69
69
|
? __assign(__assign({ name: "🛡 audit" }, base), { cache: undefined, image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage, script: __spreadArray([
|
|
70
|
-
"cd ".concat(context.
|
|
70
|
+
"cd ".concat(context.build.dir)
|
|
71
71
|
], __read(((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [
|
|
72
72
|
"gem install bundler-audit",
|
|
73
73
|
"bundle audit check",
|
|
74
74
|
])), false), allow_failure: true }) : null;
|
|
75
75
|
var lintJob = buildConfig.lint !== false
|
|
76
76
|
? __assign(__assign({ name: "👮 lint" }, base), { cache: bundlerCache, image: (_j = (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage) !== null && _j !== void 0 ? _j : defaultImage, script: __spreadArray(__spreadArray([
|
|
77
|
-
"cd ".concat(context.
|
|
77
|
+
"cd ".concat(context.build.dir)
|
|
78
78
|
], __read(bundlerInstall), false), __read(((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [
|
|
79
79
|
"bundle exec rubocop",
|
|
80
80
|
])), false) }) : null;
|
|
81
81
|
var testJob = buildConfig.test !== false
|
|
82
82
|
? __assign(__assign({ name: "🧪 test" }, base), { cache: bundlerCache, image: (_p = (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage) !== null && _p !== void 0 ? _p : defaultImage, script: __spreadArray(__spreadArray([
|
|
83
|
-
"cd ".concat(context.
|
|
83
|
+
"cd ".concat(context.build.dir)
|
|
84
84
|
], __read(bundlerInstall), false), __read(((_r = (0, utils_1.ensureArray)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : [
|
|
85
85
|
"bundle exec rspec",
|
|
86
86
|
])), false) }) : null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAAkD;AAE3C,IAAM,mBAAmB,GAAG,UACjC,OAAyB;;IAEzB,gCAAgC;IAChC,6CAA6C;IAC7C,IAAI,OAAO,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAM,WAAW,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,12 @@ exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
|
|
|
6
6
|
exports.SBOM_FILE = "__sbom.json";
|
|
7
7
|
var createSbomBuildJob = function (context) {
|
|
8
8
|
var _a, _b, _c, _d, _e;
|
|
9
|
-
var buildConfig = context.
|
|
9
|
+
var buildConfig = context.build.config;
|
|
10
10
|
var defaultImage = "aquasec/trivy:0.38.3";
|
|
11
11
|
var defaultScript = [
|
|
12
|
-
"trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.
|
|
12
|
+
"trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.build.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace)
|
|
13
13
|
? "."
|
|
14
|
-
: context.
|
|
14
|
+
: context.build.dir),
|
|
15
15
|
];
|
|
16
16
|
var image = buildConfig.type === "custom" && buildConfig.sbom !== false
|
|
17
17
|
? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAEA,kCAAuC;AAE1B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,SAAS,GAAG,aAAa,CAAC;AAEhC,IAAM,kBAAkB,GAAG,UAAC,OAAyB;;IAC1D,IAAM,WAAW,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAEA,kCAAuC;AAE1B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,SAAS,GAAG,aAAa,CAAC;AAEhC,IAAM,kBAAkB,GAAG,UAAC,OAAyB;;IAC1D,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAM,YAAY,GAAG,sBAAsB,CAAC;IAC5C,IAAM,aAAa,GAAG;QACpB,yDAAiD,iBAAS,gBACxD,CAAA,MAAA,OAAO,CAAC,KAAK,CAAC,kBAAkB,0CAAE,sBAAsB;YACtD,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CACrB;KACH,CAAC;IAEF,IAAM,KAAK,GACT,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK;QACzD,CAAC,CAAC,MAAA,MAAA,WAAW,CAAC,IAAI,0CAAE,QAAQ,mCAAI,YAAY;QAC5C,CAAC,CAAC,YAAY,CAAC;IAEnB,IAAM,MAAM,GACV,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK;QACzD,CAAC,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAA,WAAW,CAAC,IAAI,0CAAE,OAAO,CAAC,mCAAI,aAAa;QACzD,CAAC,CAAC,aAAa,CAAC;IAEpB,OAAO;QACL,IAAI,EAAE,2BAAmB;QACzB,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,SAAS;QAChB,KAAK,OAAA;QACL,MAAM,QAAA;QACN,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,iBAAS,CAAC;SACnB;KACF,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,kBAAkB,sBAmC7B"}
|
|
@@ -51,27 +51,6 @@ export type BuildConfigBase = {
|
|
|
51
51
|
* define the build command
|
|
52
52
|
*/
|
|
53
53
|
buildCommand?: string | string[] | null;
|
|
54
|
-
/**
|
|
55
|
-
* customize docker build
|
|
56
|
-
*/
|
|
57
|
-
docker?: {
|
|
58
|
-
/**
|
|
59
|
-
* Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
|
|
60
|
-
*
|
|
61
|
-
* - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
|
|
62
|
-
* - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
|
|
63
|
-
* - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
|
|
64
|
-
*/
|
|
65
|
-
additionsBegin?: string[];
|
|
66
|
-
/**
|
|
67
|
-
* Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
|
|
68
|
-
*
|
|
69
|
-
* - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
|
|
70
|
-
* - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
|
|
71
|
-
* - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
|
|
72
|
-
*/
|
|
73
|
-
additionsEnd?: string[];
|
|
74
|
-
};
|
|
75
54
|
/**
|
|
76
55
|
* customize lint, set false to disable
|
|
77
56
|
*/
|
|
@@ -116,10 +95,12 @@ export type BuildConfigNodeBase = BuildConfigBase & {
|
|
|
116
95
|
};
|
|
117
96
|
export type BuildConfigNode = {
|
|
118
97
|
type: "node";
|
|
98
|
+
docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
|
|
119
99
|
} & BuildConfigNodeBase;
|
|
120
100
|
export type BuildConfigNodeStatic = BuildConfigNodeBase & {
|
|
121
101
|
type: "node-static";
|
|
122
102
|
startCommand?: never;
|
|
103
|
+
docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
|
|
123
104
|
};
|
|
124
105
|
export type BuildConfigMeteor = BuildConfigNodeBase & {
|
|
125
106
|
type: "meteor";
|
|
@@ -128,18 +109,44 @@ export type BuildConfigMeteor = BuildConfigNodeBase & {
|
|
|
128
109
|
* This is only required if you have custom scripts in your image
|
|
129
110
|
*/
|
|
130
111
|
installScripts?: boolean;
|
|
112
|
+
docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
|
|
131
113
|
};
|
|
132
|
-
|
|
114
|
+
type BuildConfigDockerWithAdditions = {
|
|
115
|
+
/**
|
|
116
|
+
* Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
|
|
117
|
+
*
|
|
118
|
+
*/
|
|
119
|
+
additionsBegin?: string[];
|
|
120
|
+
/**
|
|
121
|
+
* Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
|
|
122
|
+
*
|
|
123
|
+
*/
|
|
124
|
+
additionsEnd?: string[];
|
|
125
|
+
};
|
|
126
|
+
type BuildConfigDockerBuiltInNode = {
|
|
127
|
+
type: "node";
|
|
128
|
+
} & BuildConfigDockerWithAdditions;
|
|
129
|
+
type BuildConfigDockerBuiltInMeteor = {
|
|
130
|
+
type: "meteor";
|
|
131
|
+
} & BuildConfigDockerWithAdditions;
|
|
132
|
+
type BuildConfigDockerBuiltInNgninx = {
|
|
133
133
|
/**
|
|
134
134
|
* use the built-in nginx image for simple static apps
|
|
135
135
|
*/
|
|
136
136
|
type: "nginx";
|
|
137
|
-
}
|
|
137
|
+
} & BuildConfigDockerWithAdditions;
|
|
138
|
+
type BuildConfigDockerBuiltIn = BuildConfigDockerBuiltInNgninx | BuildConfigDockerBuiltInNode | BuildConfigDockerBuiltInMeteor;
|
|
139
|
+
type BuildConfigDockerCustom = {
|
|
138
140
|
/**
|
|
139
141
|
* custom docker build, expect that a Dockerfile in your directory
|
|
140
142
|
*/
|
|
141
143
|
type: "custom";
|
|
142
|
-
}
|
|
144
|
+
};
|
|
145
|
+
export type BuildConfigDocker = BuildConfigDockerBuiltIn | BuildConfigDockerCustom;
|
|
146
|
+
/**
|
|
147
|
+
* @deprecated this type is no longer used. Use {@link BuildConfigDocker} instead.
|
|
148
|
+
*/
|
|
149
|
+
export type BuildConfigCustomDocker = BuildConfigDockerCustom | BuildConfigDockerBuiltInNgninx;
|
|
143
150
|
export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit"> & {
|
|
144
151
|
type: "custom";
|
|
145
152
|
jobImage: GitlabJobImage;
|
|
@@ -147,7 +154,7 @@ export type BuildConfigCustom = Omit<BuildConfigBase, "lint" | "test" | "audit">
|
|
|
147
154
|
* {@link Services}s used in lint, test, audit, and build jobs.
|
|
148
155
|
*/
|
|
149
156
|
jobServices?: Services;
|
|
150
|
-
docker:
|
|
157
|
+
docker: BuildConfigDocker;
|
|
151
158
|
/**
|
|
152
159
|
* custom lint, disabled when not set
|
|
153
160
|
*/
|
|
@@ -228,3 +235,4 @@ export declare const isOfBuildType: <T extends ("custom" | "node" | "node-static
|
|
|
228
235
|
}> | Extract<BuildConfigStorybook, {
|
|
229
236
|
type: T[number];
|
|
230
237
|
}>;
|
|
238
|
+
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAsRO,IAAM,aAAa,GAAG,UAC3B,CAAc;IACd,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AALW,QAAA,aAAa,iBAKxB"}
|
|
@@ -25,7 +25,7 @@ var sanitize = function (value) {
|
|
|
25
25
|
};
|
|
26
26
|
var getLabels = function (context) {
|
|
27
27
|
var _a, _b, _c;
|
|
28
|
-
var labels = __assign({ "customer-name": sanitize(context.fullConfig.customerName), "component-name": sanitize(context.componentName), "app-name": sanitize(context.fullConfig.appName), "env-type": sanitize(context.environment.envType), "env-name": sanitize(context.environment.shortName), "build-type": sanitize((_a = context.
|
|
28
|
+
var labels = __assign({ "customer-name": sanitize(context.fullConfig.customerName), "component-name": sanitize(context.componentName), "app-name": sanitize(context.fullConfig.appName), "env-type": sanitize(context.environment.envType), "env-name": sanitize(context.environment.shortName), "build-type": sanitize((_a = context.build.config) === null || _a === void 0 ? void 0 : _a.type) }, ((_c = (_b = context.fullConfig.meta) === null || _b === void 0 ? void 0 : _b.labels) !== null && _c !== void 0 ? _c : {}));
|
|
29
29
|
return labels;
|
|
30
30
|
};
|
|
31
31
|
exports.getLabels = getLabels;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLabels.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getLabels.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAA8B;AAG9B,IAAM,QAAQ,GAAG,UAAC,KAAc;IAC9B,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,gLAAgL;IAChL,4BAA4B;IAC5B,OAAO,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AACtC,CAAC,CAAC;AACK,IAAM,SAAS,GAAG,UAAC,OAAyB;;IACjD,IAAM,MAAM,cACV,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAC1D,gBAAgB,EAAE,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EACjD,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAChD,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EACjD,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EACnD,YAAY,EAAE,QAAQ,CAAC,MAAA,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"getLabels.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getLabels.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAA8B;AAG9B,IAAM,QAAQ,GAAG,UAAC,KAAc;IAC9B,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,gLAAgL;IAChL,4BAA4B;IAC5B,OAAO,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;AACtC,CAAC,CAAC;AACK,IAAM,SAAS,GAAG,UAAC,OAAyB;;IACjD,IAAM,MAAM,cACV,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAC1D,gBAAgB,EAAE,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EACjD,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAChD,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EACjD,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,EACnD,YAAY,EAAE,QAAQ,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,0CAAE,IAAI,CAAC,IAC/C,CAAC,MAAA,MAAA,OAAO,CAAC,UAAU,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC,CAC3C,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAXW,QAAA,SAAS,aAWpB"}
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
14
|
if (k2 === undefined) k2 = k;
|
|
4
15
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -51,6 +62,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
51
62
|
};
|
|
52
63
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
64
|
exports.createContext = exports.createComponentContext = void 0;
|
|
65
|
+
var lodash_1 = require("lodash");
|
|
54
66
|
var build_1 = require("../build");
|
|
55
67
|
var deploy_1 = require("../deploy");
|
|
56
68
|
var utils_1 = require("../utils");
|
|
@@ -59,10 +71,9 @@ var getEnvironmentContext_1 = require("./getEnvironmentContext");
|
|
|
59
71
|
__exportStar(require("./getEnvironment"), exports);
|
|
60
72
|
__exportStar(require("./getEnvironmentVariables"), exports);
|
|
61
73
|
var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, void 0, function () {
|
|
62
|
-
var envContext, componentConfigWithoutDefaults, defaults, componentConfig;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
switch (_b.label) {
|
|
74
|
+
var envContext, componentConfigWithoutDefaults, defaults, componentConfig, environment, deploy, build, customJobs, dir, context, resolvedCustomJobs;
|
|
75
|
+
return __generator(this, function (_a) {
|
|
76
|
+
switch (_a.label) {
|
|
66
77
|
case 0:
|
|
67
78
|
if (!/^[a-z0-9-]+$/.test(ctx.componentName)) {
|
|
68
79
|
throw new Error("componentName may only contain lower case letters, numbers and -");
|
|
@@ -79,22 +90,33 @@ var createComponentContext = function (ctx) { return __awaiter(void 0, void 0, v
|
|
|
79
90
|
deploy: {},
|
|
80
91
|
};
|
|
81
92
|
componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
|
|
82
|
-
|
|
93
|
+
return [4 /*yield*/, (0, getEnvironment_1.getEnvironment)(ctx)];
|
|
94
|
+
case 1:
|
|
95
|
+
environment = _a.sent();
|
|
96
|
+
deploy = componentConfig.deploy, build = componentConfig.build, customJobs = componentConfig.customJobs, dir = componentConfig.dir;
|
|
97
|
+
context = {
|
|
83
98
|
fullConfig: ctx.config,
|
|
84
99
|
componentConfig: componentConfig,
|
|
85
|
-
|
|
86
|
-
dir:
|
|
100
|
+
build: {
|
|
101
|
+
dir: dir,
|
|
87
102
|
packageManagerInfo: ctx.packageManagerInfo,
|
|
88
|
-
config:
|
|
103
|
+
config: build,
|
|
89
104
|
},
|
|
90
|
-
|
|
105
|
+
deploy: deploy
|
|
106
|
+
? {
|
|
107
|
+
config: deploy,
|
|
108
|
+
}
|
|
109
|
+
: null,
|
|
110
|
+
componentName: ctx.componentName,
|
|
111
|
+
environment: environment,
|
|
112
|
+
packageManagerInfo: ctx.packageManagerInfo,
|
|
113
|
+
pipelineType: ctx.pipelineType,
|
|
114
|
+
trigger: ctx.trigger,
|
|
91
115
|
};
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
_a.trigger = ctx.trigger,
|
|
97
|
-
_a)];
|
|
116
|
+
resolvedCustomJobs = (0, lodash_1.isFunction)(customJobs)
|
|
117
|
+
? customJobs(context)
|
|
118
|
+
: customJobs;
|
|
119
|
+
return [2 /*return*/, __assign(__assign({}, context), { customJobs: resolvedCustomJobs })];
|
|
98
120
|
}
|
|
99
121
|
});
|
|
100
122
|
}); };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAoC;AACpC,kCAAuC;AAEvC,oCAAyC;AAMzC,kCAAkD;AAClD,mDAAkD;AAClD,iEAAgE;AAEhE,mDAAiC;AACjC,4DAA0C;AAWnC,IAAM,sBAAsB,GAAG,UACpC,GAAkC;;;;;gBAElC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;gBACJ,CAAC;gBAEK,UAAU,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;gBAExC,8BAA8B,GAAG,UAAU,CAAC,YAAY,CAAC;gBACzD,QAAQ,GAGV,8BAA8B,CAAC,MAAM;oBACvC,CAAC,CAAC;wBACE,KAAK,EACH,mBAAW,CACT,8BAA8B,CAAC,KAAK,CAAC,IAAuB,CAC7D,CAAC,QAAQ,CAAC,UAAU,CAAC;wBACxB,MAAM,EAAE,qBAAY,CAClB,8BAA8B,CAAC,MAAM,CAAC,IAAwB,CAC/D,CAAC,QAAQ,CAAC,UAAiB,CAAC;qBAC9B;oBACH,CAAC,CAAC;wBACE,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,EAAE;qBACX,CAAC;gBACA,eAAe,GAAG,IAAA,8BAAsB,EAC5C,QAAQ,EACR,8BAA8B,CAC/B,CAAC;gBAEkB,qBAAM,IAAA,+BAAc,EAAC,GAAG,CAAC,EAAA;;gBAAvC,WAAW,GAAG,SAAyB;gBACrC,MAAM,GAA6B,eAAe,OAA5C,EAAE,KAAK,GAAsB,eAAe,MAArC,EAAE,UAAU,GAAU,eAAe,WAAzB,EAAE,GAAG,GAAK,eAAe,IAApB,CAAqB;gBACrD,OAAO,GAAyC;oBACpD,UAAU,EAAE,GAAG,CAAC,MAAM;oBACtB,eAAe,iBAAA;oBAEf,KAAK,EAAE;wBACL,GAAG,EAAE,GAAG;wBACR,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;wBAC1C,MAAM,EAAE,KAAK;qBACd;oBACD,MAAM,EAAE,MAAM;wBACZ,CAAC,CAAC;4BACE,MAAM,EAAE,MAAM;yBACf;wBACH,CAAC,CAAC,IAAI;oBACR,aAAa,EAAE,GAAG,CAAC,aAAa;oBAChC,WAAW,aAAA;oBACX,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;oBAC1C,YAAY,EAAE,GAAG,CAAC,YAAY;oBAC9B,OAAO,EAAE,GAAG,CAAC,OAAO;iBACrB,CAAC;gBACI,kBAAkB,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC;oBAC/C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;oBACrB,CAAC,CAAC,UAAU,CAAC;gBACf,4CACK,OAAO,KACV,UAAU,EAAE,kBAAkB,KAC9B;;;KACH,CAAC;AA/DW,QAAA,sBAAsB,0BA+DjC;AAEF;;GAEG;AACU,QAAA,aAAa,GAAG,8BAAsB,CAAC"}
|
|
@@ -45,7 +45,7 @@ var stop_1 = require("./stop");
|
|
|
45
45
|
var variables_1 = require("./variables");
|
|
46
46
|
exports.DEPLOY_JOB_NAME = "🚀 Deploy";
|
|
47
47
|
var createDeployJob = function (context, jobDefinition) {
|
|
48
|
-
var _a, _b, _c, _d, _e, _f;
|
|
48
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
49
49
|
var hasDocker = (0, docker_1.requiresDockerBuild)(context);
|
|
50
50
|
var isStoppable = (0, utils_1.contextIsStoppable)(context);
|
|
51
51
|
var autoStop = context.environment.envType === "review"
|
|
@@ -53,14 +53,13 @@ var createDeployJob = function (context, jobDefinition) {
|
|
|
53
53
|
: context.environment.envType === "dev"
|
|
54
54
|
? "4 weeks"
|
|
55
55
|
: undefined;
|
|
56
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
56
57
|
// if auto or manual is configured explicitly, use that
|
|
57
|
-
var whenDeployDefined =
|
|
58
|
-
? context.componentConfig.deploy.when
|
|
59
|
-
: undefined;
|
|
58
|
+
var whenDeployDefined = deployConfig && deployConfig.when ? deployConfig.when : undefined;
|
|
60
59
|
// otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
|
|
61
60
|
var whenDeployDefault = context.environment.envType !== "prod"
|
|
62
61
|
? "auto" // is not stage, auto deploy
|
|
63
|
-
: ((
|
|
62
|
+
: ((_b = context.componentConfig.env) === null || _b === void 0 ? void 0 : _b.stage) === false
|
|
64
63
|
? "auto" // is prod, but no staging, auto deploy
|
|
65
64
|
: "manual"; // manually deploy
|
|
66
65
|
var whenDeploy = whenDeployDefined ? whenDeployDefined : whenDeployDefault;
|
|
@@ -74,12 +73,12 @@ var createDeployJob = function (context, jobDefinition) {
|
|
|
74
73
|
envMode: "stagePerEnv", // makes it easier to run manual tasks er env
|
|
75
74
|
needs: __spreadArray(__spreadArray([], __read(((0, sbom_2.sbomDeactivated)(context)
|
|
76
75
|
? []
|
|
77
|
-
: [{ job: sbom_1.SBOM_BUILD_JOB_NAME, artifacts: true }])), false), __read((
|
|
78
|
-
? (
|
|
76
|
+
: [{ job: sbom_1.SBOM_BUILD_JOB_NAME, artifacts: true }])), false), __read((deployConfig
|
|
77
|
+
? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) { return ({
|
|
79
78
|
componentName: c,
|
|
80
79
|
job: exports.DEPLOY_JOB_NAME,
|
|
81
80
|
artifacts: false,
|
|
82
|
-
}); })) !== null &&
|
|
81
|
+
}); })) !== null && _d !== void 0 ? _d : []
|
|
83
82
|
: [])), false),
|
|
84
83
|
// we don't want to deploy when there is a broken test
|
|
85
84
|
needsStages: [
|
|
@@ -95,21 +94,15 @@ var createDeployJob = function (context, jobDefinition) {
|
|
|
95
94
|
when: whenDeploy === "auto" ? "on_success" : "manual",
|
|
96
95
|
allow_failure: whenDeploy === "manual" ? true : false,
|
|
97
96
|
stage: "deploy",
|
|
98
|
-
variables: __assign(__assign(__assign(__assign(__assign({}, context.environment.envVars), (hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {})), context.environment.jobOnlyVars.deploy.envVars), (
|
|
99
|
-
|
|
100
|
-
: {})), jobDefinition.variables),
|
|
101
|
-
runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), ((_e = jobDefinition.runnerVariables) !== null && _e !== void 0 ? _e : {})), (context.componentConfig.deploy
|
|
102
|
-
? (_f = context.componentConfig.deploy.runnerVariables) !== null && _f !== void 0 ? _f : {}
|
|
103
|
-
: {})),
|
|
97
|
+
variables: __assign(__assign(__assign(__assign(__assign({}, context.environment.envVars), (hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {})), context.environment.jobOnlyVars.deploy.envVars), (deployConfig ? (_e = deployConfig.extraVars) !== null && _e !== void 0 ? _e : {} : {})), jobDefinition.variables),
|
|
98
|
+
runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), ((_f = jobDefinition.runnerVariables) !== null && _f !== void 0 ? _f : {})), (deployConfig ? (_g = deployConfig.runnerVariables) !== null && _g !== void 0 ? _g : {} : {})),
|
|
104
99
|
environment: isStoppable
|
|
105
100
|
? {
|
|
106
101
|
on_stop: stop_1.STOP_JOB_NAME,
|
|
107
102
|
auto_stop_in: autoStop,
|
|
108
103
|
}
|
|
109
104
|
: undefined,
|
|
110
|
-
jobTags:
|
|
111
|
-
? context.componentConfig.deploy.jobTags
|
|
112
|
-
: undefined,
|
|
105
|
+
jobTags: deployConfig ? deployConfig.jobTags : undefined,
|
|
113
106
|
};
|
|
114
107
|
};
|
|
115
108
|
exports.createDeployJob = createDeployJob;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAG4B;AAC5B,yCAAuD;AAGvD,gCAA0C;AAC1C,kCAA8C;AAC9C,+BAAuC;AAEvC,yCAAsD;AAEzC,QAAA,eAAe,GAAG,WAAW,CAAC;AAYpC,IAAM,eAAe,GAAG,UAC7B,OAAyB,EACzB,aAAkC;;IAElC,IAAM,SAAS,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAC/C,IAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;IAEhD,IAAM,QAAQ,GACZ,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ;QACtC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,KAAK;YACrC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC;IAElB,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { StringOrBashExpression } from "../../bash/BashExpression";
|
|
2
2
|
import type { ComponentContext } from "../../types/context";
|
|
3
|
-
export declare const getArtifactsRegistryHost: (
|
|
3
|
+
export declare const getArtifactsRegistryHost: (context: ComponentContext) => string;
|
|
4
4
|
export declare const getArtifactsRegistryDockerUrl: (context: ComponentContext) => string;
|
|
5
5
|
/**
|
|
6
6
|
*
|
|
@@ -30,17 +30,18 @@ var BashExpression_1 = require("../../bash/BashExpression");
|
|
|
30
30
|
var gitlab_1 = require("../../utils/gitlab");
|
|
31
31
|
var types_1 = require("../types");
|
|
32
32
|
var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
|
|
33
|
-
var getArtifactsRegistryHost = function (
|
|
34
|
-
var
|
|
35
|
-
if (!(0, types_1.isOfDeployType)(deploy, "google-cloudrun")) {
|
|
33
|
+
var getArtifactsRegistryHost = function (context) {
|
|
34
|
+
var _a;
|
|
35
|
+
if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) {
|
|
36
36
|
// should not happen
|
|
37
37
|
throw new Error("deploy config is wrong");
|
|
38
38
|
}
|
|
39
|
-
return "".concat(deploy.region, "-docker.pkg.dev");
|
|
39
|
+
return "".concat(context.deploy.config.region, "-docker.pkg.dev");
|
|
40
40
|
};
|
|
41
41
|
exports.getArtifactsRegistryHost = getArtifactsRegistryHost;
|
|
42
42
|
var getArtifactsRegistryDockerUrl = function (context) {
|
|
43
|
-
var
|
|
43
|
+
var _a;
|
|
44
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
44
45
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
45
46
|
// should not happen
|
|
46
47
|
throw new Error("deploy config is wrong");
|
|
@@ -103,11 +104,9 @@ var getDeleteImageCommands = function (fullImageName, keepNewest) {
|
|
|
103
104
|
* @returns
|
|
104
105
|
*/
|
|
105
106
|
var getDeleteUnusedImagesCommands = function (context, keep) {
|
|
107
|
+
var _a;
|
|
106
108
|
if (keep === void 0) { keep = 0; }
|
|
107
|
-
var deployConfig = context.
|
|
108
|
-
if (deployConfig === false) {
|
|
109
|
-
return [];
|
|
110
|
-
}
|
|
109
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
111
110
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
112
111
|
// should not happen
|
|
113
112
|
throw new Error("deploy config is wrong");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifactsRegistry.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/artifactsRegistry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAAgE;AAEhE,6CAA2D;AAC3D,kCAA0C;AAC1C,+FAA8F;AAEvF,IAAM,wBAAwB,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"artifactsRegistry.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/artifactsRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,9 @@ var createArgsString_1 = require("./utils/createArgsString");
|
|
|
17
17
|
var getServiceName_1 = require("./utils/getServiceName");
|
|
18
18
|
var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
|
|
19
19
|
var getListRevisionsCommand = function (context, args) {
|
|
20
|
+
var _a;
|
|
20
21
|
var serviceName = (0, getServiceName_1.getServiceName)(context);
|
|
21
|
-
var deployConfig = context.
|
|
22
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
22
23
|
if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
23
24
|
// should not happen
|
|
24
25
|
throw new Error("deploy config is wrong");
|
|
@@ -30,10 +31,8 @@ var getListRevisionsCommand = function (context, args) {
|
|
|
30
31
|
return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
|
|
31
32
|
};
|
|
32
33
|
var getDeleteUnusedRevisionsCommands = function (context, keep) {
|
|
33
|
-
var
|
|
34
|
-
|
|
35
|
-
return [];
|
|
36
|
-
}
|
|
34
|
+
var _a;
|
|
35
|
+
var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
37
36
|
if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
|
|
38
37
|
// should not happen
|
|
39
38
|
throw new Error("deploy config is wrong");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunRevisions.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cloudRunRevisions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kCAA0C;AAC1C,6DAA4D;AAC5D,yDAAwD;AACxD,+FAA8F;AAE9F,IAAM,uBAAuB,GAAG,UAC9B,OAAyB,EACzB,IAGC
|
|
1
|
+
{"version":3,"file":"cloudRunRevisions.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/cloudRun/cloudRunRevisions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kCAA0C;AAC1C,6DAA4D;AAC5D,yDAAwD;AACxD,+FAA8F;AAE9F,IAAM,uBAAuB,GAAG,UAC9B,OAAyB,EACzB,IAGC;;IAED,IAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC;IAE5C,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,YAAY,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACtE,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,IAAM,kBAAkB,cACtB,OAAO,EAAE,YAAY,CAAC,SAAS,EAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,+BAA+B;QAC/B,OAAO,EAAE,WAAW,EAEpB,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,4BAA4B,IACpC,IAAI,CACR,CAAC;IAEF,uDAAuD;IACvD,OAAO,oCAA6B,IAAA,mCAAgB,EAAC,kBAAkB,CAAC,CAAE,CAAC;AAC7E,CAAC,CAAC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,OAAyB,EACzB,IAAY;;IAEZ,IAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,uDAAuD;IACvD,IAAM,2BAA2B,GAAG,uBAAuB,CAAC,OAAO,EAAE;QACnE,MAAM,EAAE,iBAAe;QACvB,MAAM,EAAE,wEAAwE;KACjF,CAAC,CAAC;IACH,mDAAmD;IACnD,IAAM,wBAAwB,GAAG,IAAA,qEAAiC,EAChE,2BAA2B,EAC3B,IAAI,CACL,CAAC;IACF,IAAM,iBAAiB,GAAG,sCAA+B,IAAA,mCAAgB,EAAC;QACxE,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,KAAK,EAAE,IAAI;KACZ,CAAC,oBAAiB,CAAC;IAEpB,IAAM,kBAAkB,GAAG,UAAG,wBAAwB,+CAAqC,iBAAiB,WAAQ,CAAC;IACrH,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC9B,CAAC,CAAC;AA5BW,QAAA,gCAAgC,oCA4B3C"}
|