@catladder/cli 0.0.0-further-refactor-deploy-644e2956 → 0.0.0-further-refactor-deploy-1e5928e9

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.
Files changed (3) hide show
  1. package/dist/bundles/catenv/index.js +244 -196
  2. package/dist/bundles/cli/index.js +244 -196
  3. package/package.json +2 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -39301,6 +39301,70 @@ exports.createBuildJob = createBuildJob;
39301
39301
 
39302
39302
  /***/ }),
39303
39303
 
39304
+ /***/ 8035:
39305
+ /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
39306
+
39307
+ "use strict";
39308
+
39309
+
39310
+ var __assign = this && this.__assign || function () {
39311
+ __assign = Object.assign || function (t) {
39312
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
39313
+ s = arguments[i];
39314
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
39315
+ }
39316
+ return t;
39317
+ };
39318
+ return __assign.apply(this, arguments);
39319
+ };
39320
+ var __read = this && this.__read || function (o, n) {
39321
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
39322
+ if (!m) return o;
39323
+ var i = m.call(o),
39324
+ r,
39325
+ ar = [],
39326
+ e;
39327
+ try {
39328
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
39329
+ } catch (error) {
39330
+ e = {
39331
+ error: error
39332
+ };
39333
+ } finally {
39334
+ try {
39335
+ if (r && !r.done && (m = i["return"])) m.call(i);
39336
+ } finally {
39337
+ if (e) throw e.error;
39338
+ }
39339
+ }
39340
+ return ar;
39341
+ };
39342
+ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
39343
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
39344
+ if (ar || !(i in from)) {
39345
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
39346
+ ar[i] = from[i];
39347
+ }
39348
+ }
39349
+ return to.concat(ar || Array.prototype.slice.call(from));
39350
+ };
39351
+ exports.__esModule = true;
39352
+ exports.createBuildJobs = void 0;
39353
+ var sbom_1 = __nccwpck_require__(5928);
39354
+ var docker_1 = __nccwpck_require__(3219);
39355
+ var sbom_2 = __nccwpck_require__(9927);
39356
+ var constants_1 = __nccwpck_require__(1542);
39357
+ var createBuildJob_1 = __nccwpck_require__(8063);
39358
+ var createBuildJobs = function (context, definitions) {
39359
+ var _a;
39360
+ return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild ? [(0, createBuildJob_1.createBuildJob)(context, definitions.appBuild)] : []), false), __read(definitions.dockerBuild ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
39361
+ needs: __spreadArray(__spreadArray([], __read((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : []), false), __read(definitions.appBuild ? [constants_1.APP_BUILD_JOB_NAME] : []), false)
39362
+ }))] : []), false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
39363
+ };
39364
+ exports.createBuildJobs = createBuildJobs;
39365
+
39366
+ /***/ }),
39367
+
39304
39368
  /***/ 1754:
39305
39369
  /***/ ((__unused_webpack_module, exports) => {
39306
39370
 
@@ -39418,12 +39482,9 @@ exports.__esModule = true;
39418
39482
  exports.createCustomBuildJobs = void 0;
39419
39483
  var path_1 = __nccwpck_require__(1017);
39420
39484
  var utils_1 = __nccwpck_require__(7461);
39421
- var constants_1 = __nccwpck_require__(1542);
39422
- var createBuildJob_1 = __nccwpck_require__(8063);
39423
39485
  var docker_1 = __nccwpck_require__(3219);
39424
39486
  var types_1 = __nccwpck_require__(1197);
39425
- var sbom_1 = __nccwpck_require__(9927);
39426
- var sbom_2 = __nccwpck_require__(5928);
39487
+ var base_1 = __nccwpck_require__(8035);
39427
39488
  var RUNNER_BUILD_VARIABLES = {
39428
39489
  KUBERNETES_CPU_REQUEST: "0.5",
39429
39490
  KUBERNETES_CPU_LIMIT: "2",
@@ -39436,25 +39497,25 @@ var createCustomBuildJobs = function (context) {
39436
39497
  if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
39437
39498
  throw new Error("deploy config is not custom");
39438
39499
  }
39439
- var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
39440
- image: buildConfig.jobImage,
39441
- variables: __assign({}, RUNNER_BUILD_VARIABLES),
39442
- cache: buildConfig.jobCache,
39443
- services: buildConfig.jobServices,
39444
- script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
39445
- artifacts: {
39446
- paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
39447
- return (0, path_1.join)(context.componentConfig.dir, path);
39448
- })) !== null && _c !== void 0 ? _c : []), false),
39449
- expire_in: "1 day"
39450
- }
39451
- }) : null;
39452
- return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
39453
- script: [((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : "" // e.g. custom,
39454
- ].filter(Boolean),
39455
- variables: {},
39456
- needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
39457
- })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
39500
+ return (0, base_1.createBuildJobs)(context, {
39501
+ appBuild: buildConfig.buildCommand !== null ? {
39502
+ image: buildConfig.jobImage,
39503
+ variables: __assign({}, RUNNER_BUILD_VARIABLES),
39504
+ cache: buildConfig.jobCache,
39505
+ services: buildConfig.jobServices,
39506
+ script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
39507
+ artifacts: {
39508
+ paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
39509
+ return (0, path_1.join)(context.componentConfig.dir, path);
39510
+ })) !== null && _c !== void 0 ? _c : []), false),
39511
+ expire_in: "1 day"
39512
+ }
39513
+ } : undefined,
39514
+ dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
39515
+ script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
39516
+ variables: {}
39517
+ } : undefined
39518
+ });
39458
39519
  };
39459
39520
  exports.createCustomBuildJobs = createCustomBuildJobs;
39460
39521
 
@@ -39636,39 +39697,8 @@ var __rest = this && this.__rest || function (s, e) {
39636
39697
  }
39637
39698
  return t;
39638
39699
  };
39639
- var __read = this && this.__read || function (o, n) {
39640
- var m = typeof Symbol === "function" && o[Symbol.iterator];
39641
- if (!m) return o;
39642
- var i = m.call(o),
39643
- r,
39644
- ar = [],
39645
- e;
39646
- try {
39647
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
39648
- } catch (error) {
39649
- e = {
39650
- error: error
39651
- };
39652
- } finally {
39653
- try {
39654
- if (r && !r.done && (m = i["return"])) m.call(i);
39655
- } finally {
39656
- if (e) throw e.error;
39657
- }
39658
- }
39659
- return ar;
39660
- };
39661
- var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
39662
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
39663
- if (ar || !(i in from)) {
39664
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
39665
- ar[i] = from[i];
39666
- }
39667
- }
39668
- return to.concat(ar || Array.prototype.slice.call(from));
39669
- };
39670
39700
  exports.__esModule = true;
39671
- exports.createDockerBuildJobDefault = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
39701
+ exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
39672
39702
  var lodash_1 = __nccwpck_require__(3255);
39673
39703
  var deploy_1 = __nccwpck_require__(223);
39674
39704
  var runner_1 = __nccwpck_require__(5071);
@@ -39742,14 +39772,10 @@ var createDockerBuildJobBase = function (context, _a) {
39742
39772
  };
39743
39773
  exports.createDockerBuildJobBase = createDockerBuildJobBase;
39744
39774
  exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
39745
- var createDockerBuildJobDefault = function (context, _a) {
39746
- var script = _a.script,
39747
- def = __rest(_a, ["script"]);
39748
- return (0, exports.createDockerBuildJobBase)(context, __assign({
39749
- script: __spreadArray(__spreadArray([], __read(script || []), false), [exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"], false)
39750
- }, def));
39775
+ var getDockerBuildDefaultScript = function (ensureDockerFileScript) {
39776
+ return [ensureDockerFileScript, exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"].filter(Boolean);
39751
39777
  };
39752
- exports.createDockerBuildJobDefault = createDockerBuildJobDefault;
39778
+ exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
39753
39779
 
39754
39780
  /***/ }),
39755
39781
 
@@ -39886,18 +39912,15 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
39886
39912
  };
39887
39913
  exports.__esModule = true;
39888
39914
  exports.createNodeBuildJobs = void 0;
39915
+ var path_1 = __nccwpck_require__(1017);
39916
+ var runner_1 = __nccwpck_require__(5071);
39889
39917
  var utils_1 = __nccwpck_require__(7461);
39890
- var constants_1 = __nccwpck_require__(1542);
39891
- var createBuildJob_1 = __nccwpck_require__(8063);
39918
+ var base_1 = __nccwpck_require__(8035);
39892
39919
  var docker_1 = __nccwpck_require__(3219);
39893
- var path_1 = __nccwpck_require__(1017);
39894
39920
  var types_1 = __nccwpck_require__(1197);
39895
39921
  var cache_1 = __nccwpck_require__(4303);
39896
- var constants_2 = __nccwpck_require__(9284);
39922
+ var constants_1 = __nccwpck_require__(9284);
39897
39923
  var yarn_1 = __nccwpck_require__(464);
39898
- var runner_1 = __nccwpck_require__(5071);
39899
- var sbom_1 = __nccwpck_require__(9927);
39900
- var sbom_2 = __nccwpck_require__(5928);
39901
39924
  var createNodeBuildJobs = function (context) {
39902
39925
  var _a, _b, _c, _d, _e, _f, _g;
39903
39926
  var buildConfig = context.componentConfig.build;
@@ -39906,31 +39929,32 @@ var createNodeBuildJobs = function (context) {
39906
39929
  }
39907
39930
  var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
39908
39931
  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
39909
- var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
39910
- image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
39911
- variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
39912
- cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
39913
- script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
39914
- artifacts: {
39915
- paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
39916
- return (0, path_1.join)(context.componentConfig.dir, path);
39917
- })) !== null && _e !== void 0 ? _e : []), false),
39918
- expire_in: "1 day"
39919
- },
39920
- jobTags: buildConfig.jobTags
39921
- }) : null;
39922
- return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
39923
- script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
39924
- cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
39925
- variables: {
39926
- // only required for non static
39927
- DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
39928
- DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
39929
- return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
39930
- })) === null || _g === void 0 ? void 0 : _g.join("\n")
39931
- },
39932
- needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
39933
- })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
39932
+ return (0, base_1.createBuildJobs)(context, {
39933
+ appBuild: buildConfig.buildCommand !== null ? {
39934
+ image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
39935
+ variables: __assign({}, constants_1.NODE_RUNNER_BUILD_VARIABLES),
39936
+ cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
39937
+ script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
39938
+ artifacts: {
39939
+ paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
39940
+ return (0, path_1.join)(context.componentConfig.dir, path);
39941
+ })) !== null && _e !== void 0 ? _e : []), false),
39942
+ expire_in: "1 day"
39943
+ },
39944
+ jobTags: buildConfig.jobTags
39945
+ } : undefined,
39946
+ dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
39947
+ script: (0, docker_1.getDockerBuildDefaultScript)(buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
39948
+ cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
39949
+ variables: {
39950
+ // only required for non static
39951
+ DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
39952
+ DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
39953
+ return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
39954
+ })) === null || _g === void 0 ? void 0 : _g.join("\n")
39955
+ }
39956
+ } : undefined
39957
+ });
39934
39958
  };
39935
39959
  exports.createNodeBuildJobs = createNodeBuildJobs;
39936
39960
 
@@ -40150,14 +40174,11 @@ exports.__esModule = true;
40150
40174
  exports.createMeteorBuildJobs = void 0;
40151
40175
  var path_1 = __nccwpck_require__(1017);
40152
40176
  var runner_1 = __nccwpck_require__(5071);
40153
- var constants_1 = __nccwpck_require__(1542);
40154
- var createBuildJob_1 = __nccwpck_require__(8063);
40177
+ var base_1 = __nccwpck_require__(8035);
40155
40178
  var docker_1 = __nccwpck_require__(3219);
40156
40179
  var types_1 = __nccwpck_require__(1197);
40157
40180
  var cache_1 = __nccwpck_require__(4303);
40158
40181
  var yarn_1 = __nccwpck_require__(464);
40159
- var sbom_1 = __nccwpck_require__(5928);
40160
- var sbom_2 = __nccwpck_require__(9927);
40161
40182
  var getMeteorCache = function (context) {
40162
40183
  return [{
40163
40184
  key: context.componentName + "meteor-build-cache",
@@ -40171,24 +40192,25 @@ var createMeteorBuildJobs = function (context) {
40171
40192
  throw new Error("deploy config is not meteor");
40172
40193
  }
40173
40194
  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
40174
- var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
40175
- cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
40176
- image: (0, runner_1.getRunnerImage)("jobs-meteor"),
40177
- variables: {
40178
- METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
40179
- },
40180
- script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
40181
- artifacts: {
40182
- paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
40195
+ return (0, base_1.createBuildJobs)(context, {
40196
+ appBuild: buildConfig.buildCommand !== null ? {
40197
+ cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
40198
+ image: (0, runner_1.getRunnerImage)("jobs-meteor"),
40199
+ variables: {
40200
+ METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
40201
+ },
40202
+ script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
40203
+ artifacts: {
40204
+ paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
40205
+ }
40206
+ } : undefined,
40207
+ dockerBuild: {
40208
+ script: (0, docker_1.getDockerBuildDefaultScript)("ensureMeteorDockerfile"),
40209
+ variables: {
40210
+ METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
40211
+ }
40183
40212
  }
40184
- }) : null;
40185
- return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [(0, docker_1.createDockerBuildJobDefault)(context, {
40186
- script: ["ensureMeteorDockerfile"],
40187
- variables: {
40188
- METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
40189
- },
40190
- needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
40191
- })], false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
40213
+ });
40192
40214
  };
40193
40215
  exports.createMeteorBuildJobs = createMeteorBuildJobs;
40194
40216
 
@@ -40414,21 +40436,11 @@ var __read = this && this.__read || function (o, n) {
40414
40436
  }
40415
40437
  return ar;
40416
40438
  };
40417
- var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
40418
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
40419
- if (ar || !(i in from)) {
40420
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
40421
- ar[i] = from[i];
40422
- }
40423
- }
40424
- return to.concat(ar || Array.prototype.slice.call(from));
40425
- };
40426
40439
  exports.__esModule = true;
40427
40440
  exports.createRailsBuildJobs = void 0;
40428
- var types_1 = __nccwpck_require__(1197);
40441
+ var base_1 = __nccwpck_require__(8035);
40429
40442
  var docker_1 = __nccwpck_require__(3219);
40430
- var sbom_1 = __nccwpck_require__(5928);
40431
- var sbom_2 = __nccwpck_require__(9927);
40443
+ var types_1 = __nccwpck_require__(1197);
40432
40444
  var createRailsBuildJobs = function (context) {
40433
40445
  var _a, _b, _c;
40434
40446
  var buildConfig = context.componentConfig.build;
@@ -40443,13 +40455,16 @@ var createRailsBuildJobs = function (context) {
40443
40455
  v = _b[1];
40444
40456
  return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
40445
40457
  }).join(" ");
40446
- return __spreadArray([(0, docker_1.createDockerBuildJobBase)(context, {
40447
- variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
40448
- // custom script
40449
- 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",
40450
- // replace private git ssh gem sources with https to make bundler with credentials via env var work
40451
- "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 : "")]
40452
- })], __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
40458
+ return (0, base_1.createBuildJobs)(context, {
40459
+ appBuild: undefined,
40460
+ dockerBuild: {
40461
+ variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
40462
+ // custom script
40463
+ 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",
40464
+ // replace private git ssh gem sources with https to make bundler with credentials via env var work
40465
+ "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 : "")]
40466
+ }
40467
+ });
40453
40468
  };
40454
40469
  exports.createRailsBuildJobs = createRailsBuildJobs;
40455
40470
 
@@ -40830,7 +40845,7 @@ exports.readConfigSync = readConfigSync;
40830
40845
 
40831
40846
  exports.__esModule = true;
40832
40847
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40833
- exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-644e2956" || 0;
40848
+ exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-1e5928e9" || 0;
40834
40849
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40835
40850
 
40836
40851
  /***/ }),
@@ -42203,25 +42218,46 @@ exports.createDeployJob = createDeployJob;
42203
42218
  "use strict";
42204
42219
 
42205
42220
 
42206
- var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
42207
- if (k2 === undefined) k2 = k;
42208
- Object.defineProperty(o, k2, {
42209
- enumerable: true,
42210
- get: function () {
42211
- return m[k];
42221
+ var __read = this && this.__read || function (o, n) {
42222
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
42223
+ if (!m) return o;
42224
+ var i = m.call(o),
42225
+ r,
42226
+ ar = [],
42227
+ e;
42228
+ try {
42229
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
42230
+ } catch (error) {
42231
+ e = {
42232
+ error: error
42233
+ };
42234
+ } finally {
42235
+ try {
42236
+ if (r && !r.done && (m = i["return"])) m.call(i);
42237
+ } finally {
42238
+ if (e) throw e.error;
42212
42239
  }
42213
- });
42214
- } : function (o, m, k, k2) {
42215
- if (k2 === undefined) k2 = k;
42216
- o[k2] = m[k];
42217
- });
42218
- var __exportStar = this && this.__exportStar || function (m, exports) {
42219
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
42240
+ }
42241
+ return ar;
42242
+ };
42243
+ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
42244
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
42245
+ if (ar || !(i in from)) {
42246
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
42247
+ ar[i] = from[i];
42248
+ }
42249
+ }
42250
+ return to.concat(ar || Array.prototype.slice.call(from));
42220
42251
  };
42221
42252
  exports.__esModule = true;
42222
- __exportStar(__nccwpck_require__(6166), exports);
42223
- __exportStar(__nccwpck_require__(9567), exports);
42224
- __exportStar(__nccwpck_require__(8297), exports);
42253
+ exports.createDeployementJobs = void 0;
42254
+ var deploy_1 = __nccwpck_require__(6166);
42255
+ var rollback_1 = __nccwpck_require__(9567);
42256
+ var stop_1 = __nccwpck_require__(8297);
42257
+ var createDeployementJobs = function (context, definitions) {
42258
+ return __spreadArray(__spreadArray([(0, deploy_1.createDeployJob)(context, definitions.deploy)], __read(definitions.stop ? [(0, stop_1.createStopJob)(context, definitions.stop)] : []), false), __read(definitions.rollback ? [(0, rollback_1.createRollbackJob)(context, definitions.rollback)] : []), false);
42259
+ };
42260
+ exports.createDeployementJobs = createDeployementJobs;
42225
42261
 
42226
42262
  /***/ }),
42227
42263
 
@@ -42245,7 +42281,7 @@ exports.__esModule = true;
42245
42281
  exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
42246
42282
  var variables_1 = __nccwpck_require__(7040);
42247
42283
  exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
42248
- var createRollbackJob = function (jobDefinition, context) {
42284
+ var createRollbackJob = function (context, jobDefinition) {
42249
42285
  return {
42250
42286
  name: exports.ROLLBACK_JOB_NAME,
42251
42287
  image: jobDefinition.image,
@@ -42289,7 +42325,7 @@ exports.__esModule = true;
42289
42325
  exports.createStopJob = exports.STOP_JOB_NAME = void 0;
42290
42326
  var variables_1 = __nccwpck_require__(7040);
42291
42327
  exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
42292
- var createStopJob = function (jobDefinition, context) {
42328
+ var createStopJob = function (context, jobDefinition) {
42293
42329
  return {
42294
42330
  name: exports.STOP_JOB_NAME,
42295
42331
  image: jobDefinition.image,
@@ -42559,27 +42595,30 @@ var createGoogleCloudRunDeployJobs = function (context) {
42559
42595
  name = _b[0];
42560
42596
  return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
42561
42597
  })), 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);
42562
- return [(0, base_1.createDeployJob)(context, (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
42563
- artifacts: {
42564
- paths: ["____envvars.yaml"]
42565
- },
42566
- variables: {
42567
- CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
42568
- ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
42569
- lineWidth: -1,
42570
- quotingType: "'",
42571
- forceQuotes: true
42572
- })
42573
- },
42574
- image: (0, runner_1.getRunnerImage)("gcloud"),
42575
- script: deployScripts
42576
- })), (0, base_1.createStopJob)({
42577
- image: (0, runner_1.getRunnerImage)("gcloud"),
42578
- variables: {
42579
- CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
42580
- },
42581
- script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
42582
- }, context)];
42598
+ return (0, base_1.createDeployementJobs)(context, {
42599
+ deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
42600
+ artifacts: {
42601
+ paths: ["____envvars.yaml"]
42602
+ },
42603
+ variables: {
42604
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
42605
+ ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
42606
+ lineWidth: -1,
42607
+ quotingType: "'",
42608
+ forceQuotes: true
42609
+ })
42610
+ },
42611
+ image: (0, runner_1.getRunnerImage)("gcloud"),
42612
+ script: deployScripts
42613
+ }),
42614
+ stop: {
42615
+ image: (0, runner_1.getRunnerImage)("gcloud"),
42616
+ variables: {
42617
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
42618
+ },
42619
+ script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
42620
+ }
42621
+ });
42583
42622
  };
42584
42623
  exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
42585
42624
 
@@ -42936,8 +42975,8 @@ exports.createCustomDeployJobs = void 0;
42936
42975
  var yarn_1 = __nccwpck_require__(464);
42937
42976
  var runner_1 = __nccwpck_require__(5071);
42938
42977
  var base_1 = __nccwpck_require__(2866);
42939
- var types_1 = __nccwpck_require__(3109);
42940
42978
  var sbom_1 = __nccwpck_require__(5928);
42979
+ var types_1 = __nccwpck_require__(3109);
42941
42980
  var createCustomDeployJobs = function (context) {
42942
42981
  var _a, _b, _c;
42943
42982
  var deployConfig = context.componentConfig.deploy;
@@ -42952,16 +42991,19 @@ var createCustomDeployJobs = function (context) {
42952
42991
  var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
42953
42992
  noCustomPostInstall: true
42954
42993
  });
42955
- return __spreadArray([(0, base_1.createDeployJob)(context, {
42956
- image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
42957
- cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
42958
- 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),
42959
- variables: {}
42960
- })], __read(deployConfig.stopScript ? [(0, base_1.createStopJob)({
42961
- image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
42962
- script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
42963
- variables: {}
42964
- }, context)] : []), false);
42994
+ return (0, base_1.createDeployementJobs)(context, {
42995
+ deploy: {
42996
+ image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
42997
+ cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
42998
+ 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),
42999
+ variables: {}
43000
+ },
43001
+ stop: deployConfig.stopScript ? {
43002
+ image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
43003
+ script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
43004
+ variables: {}
43005
+ } : undefined
43006
+ });
42965
43007
  };
42966
43008
  exports.createCustomDeployJobs = createCustomDeployJobs;
42967
43009
 
@@ -43022,9 +43064,11 @@ var createDockerTagDeployJobs = function (context) {
43022
43064
  throw new Error("deploy config is not dockerTag");
43023
43065
  }
43024
43066
  var tag = deployConfig.tag;
43025
- return [(0, base_1.createDeployJob)(context, __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
43026
- script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
43027
- }))];
43067
+ return (0, base_1.createDeployementJobs)(context, {
43068
+ deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
43069
+ script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
43070
+ })
43071
+ });
43028
43072
  };
43029
43073
  exports.createDockerTagDeployJobs = createDockerTagDeployJobs;
43030
43074
 
@@ -43240,9 +43284,9 @@ var js_yaml_1 = __nccwpck_require__(3618);
43240
43284
  var __1 = __nccwpck_require__(5355);
43241
43285
  var runner_1 = __nccwpck_require__(5071);
43242
43286
  var base_1 = __nccwpck_require__(2866);
43287
+ var sbom_1 = __nccwpck_require__(5928);
43243
43288
  var types_1 = __nccwpck_require__(3109);
43244
43289
  var kubeValues_1 = __nccwpck_require__(1061);
43245
- var sbom_1 = __nccwpck_require__(5928);
43246
43290
  var createKubernetesDeployJobs = function (context) {
43247
43291
  var _a, _b, _c;
43248
43292
  var deployConfig = context.componentConfig.deploy;
@@ -43273,13 +43317,17 @@ var createKubernetesDeployJobs = function (context) {
43273
43317
  };
43274
43318
  var clusterName = "kube-".concat(context.environment.fullName);
43275
43319
  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, "\"")];
43276
- return [(0, base_1.createDeployJob)(context, __assign(__assign({}, shared), {
43277
- script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
43278
- })), (0, base_1.createStopJob)(__assign(__assign({}, shared), {
43279
- script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
43280
- }), context), (0, base_1.createRollbackJob)(__assign(__assign({}, shared), {
43281
- script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
43282
- }), context)];
43320
+ return (0, base_1.createDeployementJobs)(context, {
43321
+ deploy: __assign(__assign({}, shared), {
43322
+ script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
43323
+ }),
43324
+ stop: __assign(__assign({}, shared), {
43325
+ script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
43326
+ }),
43327
+ rollback: __assign(__assign({}, shared), {
43328
+ script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
43329
+ })
43330
+ });
43283
43331
  };
43284
43332
  exports.createKubernetesDeployJobs = createKubernetesDeployJobs;
43285
43333
 
package/dist/bundles/cli/index.js CHANGED
@@ -350366,6 +350366,70 @@ exports.createBuildJob = createBuildJob;
350366
350366
 
350367
350367
  /***/ }),
350368
350368
 
350369
+ /***/ 18035:
350370
+ /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
350371
+
350372
+ "use strict";
350373
+
350374
+
350375
+ var __assign = this && this.__assign || function () {
350376
+ __assign = Object.assign || function (t) {
350377
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
350378
+ s = arguments[i];
350379
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
350380
+ }
350381
+ return t;
350382
+ };
350383
+ return __assign.apply(this, arguments);
350384
+ };
350385
+ var __read = this && this.__read || function (o, n) {
350386
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
350387
+ if (!m) return o;
350388
+ var i = m.call(o),
350389
+ r,
350390
+ ar = [],
350391
+ e;
350392
+ try {
350393
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
350394
+ } catch (error) {
350395
+ e = {
350396
+ error: error
350397
+ };
350398
+ } finally {
350399
+ try {
350400
+ if (r && !r.done && (m = i["return"])) m.call(i);
350401
+ } finally {
350402
+ if (e) throw e.error;
350403
+ }
350404
+ }
350405
+ return ar;
350406
+ };
350407
+ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
350408
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
350409
+ if (ar || !(i in from)) {
350410
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
350411
+ ar[i] = from[i];
350412
+ }
350413
+ }
350414
+ return to.concat(ar || Array.prototype.slice.call(from));
350415
+ };
350416
+ exports.__esModule = true;
350417
+ exports.createBuildJobs = void 0;
350418
+ var sbom_1 = __nccwpck_require__(65928);
350419
+ var docker_1 = __nccwpck_require__(33219);
350420
+ var sbom_2 = __nccwpck_require__(9927);
350421
+ var constants_1 = __nccwpck_require__(11542);
350422
+ var createBuildJob_1 = __nccwpck_require__(58063);
350423
+ var createBuildJobs = function (context, definitions) {
350424
+ var _a;
350425
+ return __spreadArray(__spreadArray(__spreadArray([], __read(definitions.appBuild ? [(0, createBuildJob_1.createBuildJob)(context, definitions.appBuild)] : []), false), __read(definitions.dockerBuild ? [(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), {
350426
+ needs: __spreadArray(__spreadArray([], __read((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : []), false), __read(definitions.appBuild ? [constants_1.APP_BUILD_JOB_NAME] : []), false)
350427
+ }))] : []), false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
350428
+ };
350429
+ exports.createBuildJobs = createBuildJobs;
350430
+
350431
+ /***/ }),
350432
+
350369
350433
  /***/ 51754:
350370
350434
  /***/ ((__unused_webpack_module, exports) => {
350371
350435
 
@@ -350483,12 +350547,9 @@ exports.__esModule = true;
350483
350547
  exports.createCustomBuildJobs = void 0;
350484
350548
  var path_1 = __nccwpck_require__(71017);
350485
350549
  var utils_1 = __nccwpck_require__(37461);
350486
- var constants_1 = __nccwpck_require__(11542);
350487
- var createBuildJob_1 = __nccwpck_require__(58063);
350488
350550
  var docker_1 = __nccwpck_require__(33219);
350489
350551
  var types_1 = __nccwpck_require__(71197);
350490
- var sbom_1 = __nccwpck_require__(9927);
350491
- var sbom_2 = __nccwpck_require__(65928);
350552
+ var base_1 = __nccwpck_require__(18035);
350492
350553
  var RUNNER_BUILD_VARIABLES = {
350493
350554
  KUBERNETES_CPU_REQUEST: "0.5",
350494
350555
  KUBERNETES_CPU_LIMIT: "2",
@@ -350501,25 +350562,25 @@ var createCustomBuildJobs = function (context) {
350501
350562
  if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
350502
350563
  throw new Error("deploy config is not custom");
350503
350564
  }
350504
- var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
350505
- image: buildConfig.jobImage,
350506
- variables: __assign({}, RUNNER_BUILD_VARIABLES),
350507
- cache: buildConfig.jobCache,
350508
- services: buildConfig.jobServices,
350509
- script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
350510
- artifacts: {
350511
- paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
350512
- return (0, path_1.join)(context.componentConfig.dir, path);
350513
- })) !== null && _c !== void 0 ? _c : []), false),
350514
- expire_in: "1 day"
350515
- }
350516
- }) : null;
350517
- return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
350518
- script: [((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : "" // e.g. custom,
350519
- ].filter(Boolean),
350520
- variables: {},
350521
- needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
350522
- })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
350565
+ return (0, base_1.createBuildJobs)(context, {
350566
+ appBuild: buildConfig.buildCommand !== null ? {
350567
+ image: buildConfig.jobImage,
350568
+ variables: __assign({}, RUNNER_BUILD_VARIABLES),
350569
+ cache: buildConfig.jobCache,
350570
+ services: buildConfig.jobServices,
350571
+ script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
350572
+ artifacts: {
350573
+ paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
350574
+ return (0, path_1.join)(context.componentConfig.dir, path);
350575
+ })) !== null && _c !== void 0 ? _c : []), false),
350576
+ expire_in: "1 day"
350577
+ }
350578
+ } : undefined,
350579
+ dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
350580
+ script: (0, docker_1.getDockerBuildDefaultScript)(((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : ""),
350581
+ variables: {}
350582
+ } : undefined
350583
+ });
350523
350584
  };
350524
350585
  exports.createCustomBuildJobs = createCustomBuildJobs;
350525
350586
 
@@ -350701,39 +350762,8 @@ var __rest = this && this.__rest || function (s, e) {
350701
350762
  }
350702
350763
  return t;
350703
350764
  };
350704
- var __read = this && this.__read || function (o, n) {
350705
- var m = typeof Symbol === "function" && o[Symbol.iterator];
350706
- if (!m) return o;
350707
- var i = m.call(o),
350708
- r,
350709
- ar = [],
350710
- e;
350711
- try {
350712
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
350713
- } catch (error) {
350714
- e = {
350715
- error: error
350716
- };
350717
- } finally {
350718
- try {
350719
- if (r && !r.done && (m = i["return"])) m.call(i);
350720
- } finally {
350721
- if (e) throw e.error;
350722
- }
350723
- }
350724
- return ar;
350725
- };
350726
- var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
350727
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
350728
- if (ar || !(i in from)) {
350729
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
350730
- ar[i] = from[i];
350731
- }
350732
- }
350733
- return to.concat(ar || Array.prototype.slice.call(from));
350734
- };
350735
350765
  exports.__esModule = true;
350736
- exports.createDockerBuildJobDefault = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
350766
+ exports.getDockerBuildDefaultScript = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
350737
350767
  var lodash_1 = __nccwpck_require__(23255);
350738
350768
  var deploy_1 = __nccwpck_require__(90223);
350739
350769
  var runner_1 = __nccwpck_require__(55071);
@@ -350807,14 +350837,10 @@ var createDockerBuildJobBase = function (context, _a) {
350807
350837
  };
350808
350838
  exports.createDockerBuildJobBase = createDockerBuildJobBase;
350809
350839
  exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
350810
- var createDockerBuildJobDefault = function (context, _a) {
350811
- var script = _a.script,
350812
- def = __rest(_a, ["script"]);
350813
- return (0, exports.createDockerBuildJobBase)(context, __assign({
350814
- script: __spreadArray(__spreadArray([], __read(script || []), false), [exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"], false)
350815
- }, def));
350840
+ var getDockerBuildDefaultScript = function (ensureDockerFileScript) {
350841
+ return [ensureDockerFileScript, exports.gitlabDockerLogin, "docker version", "docker build --network host --cache-from $DOCKER_CACHE_IMAGE --tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG -f $APP_DIR/Dockerfile . --build-arg BUILDKIT_INLINE_CACHE=1", "docker push $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_CACHE_IMAGE", "docker push $DOCKER_CACHE_IMAGE"].filter(Boolean);
350816
350842
  };
350817
- exports.createDockerBuildJobDefault = createDockerBuildJobDefault;
350843
+ exports.getDockerBuildDefaultScript = getDockerBuildDefaultScript;
350818
350844
 
350819
350845
  /***/ }),
350820
350846
 
@@ -350951,18 +350977,15 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
350951
350977
  };
350952
350978
  exports.__esModule = true;
350953
350979
  exports.createNodeBuildJobs = void 0;
350980
+ var path_1 = __nccwpck_require__(71017);
350981
+ var runner_1 = __nccwpck_require__(55071);
350954
350982
  var utils_1 = __nccwpck_require__(37461);
350955
- var constants_1 = __nccwpck_require__(11542);
350956
- var createBuildJob_1 = __nccwpck_require__(58063);
350983
+ var base_1 = __nccwpck_require__(18035);
350957
350984
  var docker_1 = __nccwpck_require__(33219);
350958
- var path_1 = __nccwpck_require__(71017);
350959
350985
  var types_1 = __nccwpck_require__(71197);
350960
350986
  var cache_1 = __nccwpck_require__(54303);
350961
- var constants_2 = __nccwpck_require__(69284);
350987
+ var constants_1 = __nccwpck_require__(69284);
350962
350988
  var yarn_1 = __nccwpck_require__(10464);
350963
- var runner_1 = __nccwpck_require__(55071);
350964
- var sbom_1 = __nccwpck_require__(9927);
350965
- var sbom_2 = __nccwpck_require__(65928);
350966
350989
  var createNodeBuildJobs = function (context) {
350967
350990
  var _a, _b, _c, _d, _e, _f, _g;
350968
350991
  var buildConfig = context.componentConfig.build;
@@ -350971,31 +350994,32 @@ var createNodeBuildJobs = function (context) {
350971
350994
  }
350972
350995
  var defaultImage = (0, runner_1.getRunnerImage)("jobs-default");
350973
350996
  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
350974
- var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
350975
- image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
350976
- variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
350977
- cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
350978
- script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
350979
- artifacts: {
350980
- paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
350981
- return (0, path_1.join)(context.componentConfig.dir, path);
350982
- })) !== null && _e !== void 0 ? _e : []), false),
350983
- expire_in: "1 day"
350984
- },
350985
- jobTags: buildConfig.jobTags
350986
- }) : null;
350987
- return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
350988
- script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
350989
- cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
350990
- variables: {
350991
- // only required for non static
350992
- DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
350993
- DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
350994
- return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
350995
- })) === null || _g === void 0 ? void 0 : _g.join("\n")
350996
- },
350997
- needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
350998
- })] : []), false), __read((0, sbom_2.sbomDeactivated)(context) ? [] : [(0, sbom_1.createSbomBuildJob)(context)]), false);
350997
+ return (0, base_1.createBuildJobs)(context, {
350998
+ appBuild: buildConfig.buildCommand !== null ? {
350999
+ image: (_a = buildConfig.jobImage) !== null && _a !== void 0 ? _a : defaultImage,
351000
+ variables: __assign({}, constants_1.NODE_RUNNER_BUILD_VARIABLES),
351001
+ cache: __spreadArray(__spreadArray(__spreadArray([], __read((_b = (0, utils_1.ensureArray)(buildConfig.jobCache)) !== null && _b !== void 0 ? _b : []), false), __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
351002
+ script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false),
351003
+ artifacts: {
351004
+ paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
351005
+ return (0, path_1.join)(context.componentConfig.dir, path);
351006
+ })) !== null && _e !== void 0 ? _e : []), false),
351007
+ expire_in: "1 day"
351008
+ },
351009
+ jobTags: buildConfig.jobTags
351010
+ } : undefined,
351011
+ dockerBuild: (0, docker_1.requiresDockerBuild)(context) ? {
351012
+ script: (0, docker_1.getDockerBuildDefaultScript)(buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"),
351013
+ cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
351014
+ variables: {
351015
+ // only required for non static
351016
+ DOCKER_COPY_AND_INSTALL_APP: (0, yarn_1.getDockerAppCopyAndBuildScript)(context),
351017
+ DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
351018
+ return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
351019
+ })) === null || _g === void 0 ? void 0 : _g.join("\n")
351020
+ }
351021
+ } : undefined
351022
+ });
350999
351023
  };
351000
351024
  exports.createNodeBuildJobs = createNodeBuildJobs;
351001
351025
 
@@ -351215,14 +351239,11 @@ exports.__esModule = true;
351215
351239
  exports.createMeteorBuildJobs = void 0;
351216
351240
  var path_1 = __nccwpck_require__(71017);
351217
351241
  var runner_1 = __nccwpck_require__(55071);
351218
- var constants_1 = __nccwpck_require__(11542);
351219
- var createBuildJob_1 = __nccwpck_require__(58063);
351242
+ var base_1 = __nccwpck_require__(18035);
351220
351243
  var docker_1 = __nccwpck_require__(33219);
351221
351244
  var types_1 = __nccwpck_require__(71197);
351222
351245
  var cache_1 = __nccwpck_require__(54303);
351223
351246
  var yarn_1 = __nccwpck_require__(10464);
351224
- var sbom_1 = __nccwpck_require__(65928);
351225
- var sbom_2 = __nccwpck_require__(9927);
351226
351247
  var getMeteorCache = function (context) {
351227
351248
  return [{
351228
351249
  key: context.componentName + "meteor-build-cache",
@@ -351236,24 +351257,25 @@ var createMeteorBuildJobs = function (context) {
351236
351257
  throw new Error("deploy config is not meteor");
351237
351258
  }
351238
351259
  var yarnInstall = (0, yarn_1.getYarnInstall)(context);
351239
- var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
351240
- cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
351241
- image: (0, runner_1.getRunnerImage)("jobs-meteor"),
351242
- variables: {
351243
- METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
351244
- },
351245
- script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
351246
- artifacts: {
351247
- paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
351260
+ return (0, base_1.createBuildJobs)(context, {
351261
+ appBuild: buildConfig.buildCommand !== null ? {
351262
+ cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read(getMeteorCache(context)), false),
351263
+ image: (0, runner_1.getRunnerImage)("jobs-meteor"),
351264
+ variables: {
351265
+ METEOR_DISABLE_OPTIMISTIC_CACHING: "1"
351266
+ },
351267
+ script: __spreadArray(__spreadArray([], __read(yarnInstall), false), ['echo "add healthcheck package"', "meteor add panter:healthroute --allow-superuser", "meteor add qualia:prod-shell --allow-superuser", 'TOOL_NODE_FLAGS="--max_old_space_size=3584 --min_semi_space_size=8 --max_semi_space_size=256 --optimize_for_size" meteor build ./dist --architecture os.linux.x86_64 --allow-superuser --server-only --directory', "cp ./__build_info.json ./dist/bundle/programs/server"], false),
351268
+ artifacts: {
351269
+ paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/dist"]
351270
+ }
351271
+ } : undefined,
351272
+ dockerBuild: {
351273
+ script: (0, docker_1.getDockerBuildDefaultScript)("ensureMeteorDockerfile"),
351274
+ variables: {
351275
+ METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
351276
+ }
351248
351277
  }
351249
- }) : null;
351250
- return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), [(0, docker_1.createDockerBuildJobDefault)(context, {
351251
- script: ["ensureMeteorDockerfile"],
351252
- variables: {
351253
- METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : ""
351254
- },
351255
- needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
351256
- })], false), __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
351278
+ });
351257
351279
  };
351258
351280
  exports.createMeteorBuildJobs = createMeteorBuildJobs;
351259
351281
 
@@ -351479,21 +351501,11 @@ var __read = this && this.__read || function (o, n) {
351479
351501
  }
351480
351502
  return ar;
351481
351503
  };
351482
- var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
351483
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
351484
- if (ar || !(i in from)) {
351485
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
351486
- ar[i] = from[i];
351487
- }
351488
- }
351489
- return to.concat(ar || Array.prototype.slice.call(from));
351490
- };
351491
351504
  exports.__esModule = true;
351492
351505
  exports.createRailsBuildJobs = void 0;
351493
- var types_1 = __nccwpck_require__(71197);
351506
+ var base_1 = __nccwpck_require__(18035);
351494
351507
  var docker_1 = __nccwpck_require__(33219);
351495
- var sbom_1 = __nccwpck_require__(65928);
351496
- var sbom_2 = __nccwpck_require__(9927);
351508
+ var types_1 = __nccwpck_require__(71197);
351497
351509
  var createRailsBuildJobs = function (context) {
351498
351510
  var _a, _b, _c;
351499
351511
  var buildConfig = context.componentConfig.build;
@@ -351508,13 +351520,16 @@ var createRailsBuildJobs = function (context) {
351508
351520
  v = _b[1];
351509
351521
  return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
351510
351522
  }).join(" ");
351511
- return __spreadArray([(0, docker_1.createDockerBuildJobBase)(context, {
351512
- variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
351513
- // custom script
351514
- 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",
351515
- // replace private git ssh gem sources with https to make bundler with credentials via env var work
351516
- "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 : "")]
351517
- })], __read((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)]), false);
351523
+ return (0, base_1.createBuildJobs)(context, {
351524
+ appBuild: undefined,
351525
+ dockerBuild: {
351526
+ variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.componentConfig.build.extraVars),
351527
+ // custom script
351528
+ 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",
351529
+ // replace private git ssh gem sources with https to make bundler with credentials via env var work
351530
+ "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 : "")]
351531
+ }
351532
+ });
351518
351533
  };
351519
351534
  exports.createRailsBuildJobs = createRailsBuildJobs;
351520
351535
 
@@ -351895,7 +351910,7 @@ exports.readConfigSync = readConfigSync;
351895
351910
 
351896
351911
  exports.__esModule = true;
351897
351912
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351898
- exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-644e2956" || 0;
351913
+ exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-1e5928e9" || 0;
351899
351914
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351900
351915
 
351901
351916
  /***/ }),
@@ -353268,25 +353283,46 @@ exports.createDeployJob = createDeployJob;
353268
353283
  "use strict";
353269
353284
 
353270
353285
 
353271
- var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
353272
- if (k2 === undefined) k2 = k;
353273
- Object.defineProperty(o, k2, {
353274
- enumerable: true,
353275
- get: function () {
353276
- return m[k];
353286
+ var __read = this && this.__read || function (o, n) {
353287
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
353288
+ if (!m) return o;
353289
+ var i = m.call(o),
353290
+ r,
353291
+ ar = [],
353292
+ e;
353293
+ try {
353294
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
353295
+ } catch (error) {
353296
+ e = {
353297
+ error: error
353298
+ };
353299
+ } finally {
353300
+ try {
353301
+ if (r && !r.done && (m = i["return"])) m.call(i);
353302
+ } finally {
353303
+ if (e) throw e.error;
353277
353304
  }
353278
- });
353279
- } : function (o, m, k, k2) {
353280
- if (k2 === undefined) k2 = k;
353281
- o[k2] = m[k];
353282
- });
353283
- var __exportStar = this && this.__exportStar || function (m, exports) {
353284
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
353305
+ }
353306
+ return ar;
353307
+ };
353308
+ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
353309
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
353310
+ if (ar || !(i in from)) {
353311
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
353312
+ ar[i] = from[i];
353313
+ }
353314
+ }
353315
+ return to.concat(ar || Array.prototype.slice.call(from));
353285
353316
  };
353286
353317
  exports.__esModule = true;
353287
- __exportStar(__nccwpck_require__(26166), exports);
353288
- __exportStar(__nccwpck_require__(99567), exports);
353289
- __exportStar(__nccwpck_require__(58297), exports);
353318
+ exports.createDeployementJobs = void 0;
353319
+ var deploy_1 = __nccwpck_require__(26166);
353320
+ var rollback_1 = __nccwpck_require__(99567);
353321
+ var stop_1 = __nccwpck_require__(58297);
353322
+ var createDeployementJobs = function (context, definitions) {
353323
+ return __spreadArray(__spreadArray([(0, deploy_1.createDeployJob)(context, definitions.deploy)], __read(definitions.stop ? [(0, stop_1.createStopJob)(context, definitions.stop)] : []), false), __read(definitions.rollback ? [(0, rollback_1.createRollbackJob)(context, definitions.rollback)] : []), false);
353324
+ };
353325
+ exports.createDeployementJobs = createDeployementJobs;
353290
353326
 
353291
353327
  /***/ }),
353292
353328
 
@@ -353310,7 +353346,7 @@ exports.__esModule = true;
353310
353346
  exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
353311
353347
  var variables_1 = __nccwpck_require__(67040);
353312
353348
  exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
353313
- var createRollbackJob = function (jobDefinition, context) {
353349
+ var createRollbackJob = function (context, jobDefinition) {
353314
353350
  return {
353315
353351
  name: exports.ROLLBACK_JOB_NAME,
353316
353352
  image: jobDefinition.image,
@@ -353354,7 +353390,7 @@ exports.__esModule = true;
353354
353390
  exports.createStopJob = exports.STOP_JOB_NAME = void 0;
353355
353391
  var variables_1 = __nccwpck_require__(67040);
353356
353392
  exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
353357
- var createStopJob = function (jobDefinition, context) {
353393
+ var createStopJob = function (context, jobDefinition) {
353358
353394
  return {
353359
353395
  name: exports.STOP_JOB_NAME,
353360
353396
  image: jobDefinition.image,
@@ -353624,27 +353660,30 @@ var createGoogleCloudRunDeployJobs = function (context) {
353624
353660
  name = _b[0];
353625
353661
  return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
353626
353662
  })), 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);
353627
- return [(0, base_1.createDeployJob)(context, (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
353628
- artifacts: {
353629
- paths: ["____envvars.yaml"]
353630
- },
353631
- variables: {
353632
- CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
353633
- ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
353634
- lineWidth: -1,
353635
- quotingType: "'",
353636
- forceQuotes: true
353637
- })
353638
- },
353639
- image: (0, runner_1.getRunnerImage)("gcloud"),
353640
- script: deployScripts
353641
- })), (0, base_1.createStopJob)({
353642
- image: (0, runner_1.getRunnerImage)("gcloud"),
353643
- variables: {
353644
- CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
353645
- },
353646
- script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
353647
- }, context)];
353663
+ return (0, base_1.createDeployementJobs)(context, {
353664
+ deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
353665
+ artifacts: {
353666
+ paths: ["____envvars.yaml"]
353667
+ },
353668
+ variables: {
353669
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
353670
+ ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
353671
+ lineWidth: -1,
353672
+ quotingType: "'",
353673
+ forceQuotes: true
353674
+ })
353675
+ },
353676
+ image: (0, runner_1.getRunnerImage)("gcloud"),
353677
+ script: deployScripts
353678
+ }),
353679
+ stop: {
353680
+ image: (0, runner_1.getRunnerImage)("gcloud"),
353681
+ variables: {
353682
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
353683
+ },
353684
+ script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
353685
+ }
353686
+ });
353648
353687
  };
353649
353688
  exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
353650
353689
 
@@ -354001,8 +354040,8 @@ exports.createCustomDeployJobs = void 0;
354001
354040
  var yarn_1 = __nccwpck_require__(10464);
354002
354041
  var runner_1 = __nccwpck_require__(55071);
354003
354042
  var base_1 = __nccwpck_require__(82866);
354004
- var types_1 = __nccwpck_require__(63109);
354005
354043
  var sbom_1 = __nccwpck_require__(65928);
354044
+ var types_1 = __nccwpck_require__(63109);
354006
354045
  var createCustomDeployJobs = function (context) {
354007
354046
  var _a, _b, _c;
354008
354047
  var deployConfig = context.componentConfig.deploy;
@@ -354017,16 +354056,19 @@ var createCustomDeployJobs = function (context) {
354017
354056
  var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
354018
354057
  noCustomPostInstall: true
354019
354058
  });
354020
- return __spreadArray([(0, base_1.createDeployJob)(context, {
354021
- image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
354022
- cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
354023
- 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),
354024
- variables: {}
354025
- })], __read(deployConfig.stopScript ? [(0, base_1.createStopJob)({
354026
- image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
354027
- script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
354028
- variables: {}
354029
- }, context)] : []), false);
354059
+ return (0, base_1.createDeployementJobs)(context, {
354060
+ deploy: {
354061
+ image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
354062
+ cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
354063
+ 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),
354064
+ variables: {}
354065
+ },
354066
+ stop: deployConfig.stopScript ? {
354067
+ image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
354068
+ script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
354069
+ variables: {}
354070
+ } : undefined
354071
+ });
354030
354072
  };
354031
354073
  exports.createCustomDeployJobs = createCustomDeployJobs;
354032
354074
 
@@ -354087,9 +354129,11 @@ var createDockerTagDeployJobs = function (context) {
354087
354129
  throw new Error("deploy config is not dockerTag");
354088
354130
  }
354089
354131
  var tag = deployConfig.tag;
354090
- return [(0, base_1.createDeployJob)(context, __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
354091
- script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
354092
- }))];
354132
+ return (0, base_1.createDeployementJobs)(context, {
354133
+ deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
354134
+ script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
354135
+ })
354136
+ });
354093
354137
  };
354094
354138
  exports.createDockerTagDeployJobs = createDockerTagDeployJobs;
354095
354139
 
@@ -354305,9 +354349,9 @@ var js_yaml_1 = __nccwpck_require__(3618);
354305
354349
  var __1 = __nccwpck_require__(25355);
354306
354350
  var runner_1 = __nccwpck_require__(55071);
354307
354351
  var base_1 = __nccwpck_require__(82866);
354352
+ var sbom_1 = __nccwpck_require__(65928);
354308
354353
  var types_1 = __nccwpck_require__(63109);
354309
354354
  var kubeValues_1 = __nccwpck_require__(1061);
354310
- var sbom_1 = __nccwpck_require__(65928);
354311
354355
  var createKubernetesDeployJobs = function (context) {
354312
354356
  var _a, _b, _c;
354313
354357
  var deployConfig = context.componentConfig.deploy;
@@ -354338,13 +354382,17 @@ var createKubernetesDeployJobs = function (context) {
354338
354382
  };
354339
354383
  var clusterName = "kube-".concat(context.environment.fullName);
354340
354384
  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, "\"")];
354341
- return [(0, base_1.createDeployJob)(context, __assign(__assign({}, shared), {
354342
- script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
354343
- })), (0, base_1.createStopJob)(__assign(__assign({}, shared), {
354344
- script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
354345
- }), context), (0, base_1.createRollbackJob)(__assign(__assign({}, shared), {
354346
- script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
354347
- }), context)];
354385
+ return (0, base_1.createDeployementJobs)(context, {
354386
+ deploy: __assign(__assign({}, shared), {
354387
+ script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
354388
+ }),
354389
+ stop: __assign(__assign({}, shared), {
354390
+ script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
354391
+ }),
354392
+ rollback: __assign(__assign({}, shared), {
354393
+ script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
354394
+ })
354395
+ });
354348
354396
  };
354349
354397
  exports.createKubernetesDeployJobs = createKubernetesDeployJobs;
354350
354398
 
package/package.json CHANGED
@@ -24,7 +24,7 @@
24
24
  "node": ">=12.0.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@catladder/pipeline": "0.0.0-further-refactor-deploy-644e2956",
27
+ "@catladder/pipeline": "0.0.0-further-refactor-deploy-1e5928e9",
28
28
  "@kubernetes/client-node": "^0.16.2",
29
29
  "@tsconfig/node14": "^1.0.1",
30
30
  "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
57
57
  "typescript": "^4.5.4",
58
58
  "vorpal": "^1.12.0"
59
59
  },
60
- "version": "0.0.0-further-refactor-deploy-644e2956",
60
+ "version": "0.0.0-further-refactor-deploy-1e5928e9",
61
61
  "stableVersion": "0.0.0"
62
62
  }