@catladder/cli 0.0.0-further-refactor-deploy-644e2956 → 0.0.0-further-refactor-deploy-77d59e43

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 +95 -62
  2. package/dist/bundles/cli/index.js +95 -62
  3. package/package.json +2 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -40830,7 +40830,7 @@ exports.readConfigSync = readConfigSync;
40830
40830
 
40831
40831
  exports.__esModule = true;
40832
40832
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40833
- exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-644e2956" || 0;
40833
+ exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-77d59e43" || 0;
40834
40834
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40835
40835
 
40836
40836
  /***/ }),
@@ -42203,25 +42203,46 @@ exports.createDeployJob = createDeployJob;
42203
42203
  "use strict";
42204
42204
 
42205
42205
 
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];
42206
+ var __read = this && this.__read || function (o, n) {
42207
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
42208
+ if (!m) return o;
42209
+ var i = m.call(o),
42210
+ r,
42211
+ ar = [],
42212
+ e;
42213
+ try {
42214
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
42215
+ } catch (error) {
42216
+ e = {
42217
+ error: error
42218
+ };
42219
+ } finally {
42220
+ try {
42221
+ if (r && !r.done && (m = i["return"])) m.call(i);
42222
+ } finally {
42223
+ if (e) throw e.error;
42212
42224
  }
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);
42225
+ }
42226
+ return ar;
42227
+ };
42228
+ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
42229
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
42230
+ if (ar || !(i in from)) {
42231
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
42232
+ ar[i] = from[i];
42233
+ }
42234
+ }
42235
+ return to.concat(ar || Array.prototype.slice.call(from));
42220
42236
  };
42221
42237
  exports.__esModule = true;
42222
- __exportStar(__nccwpck_require__(6166), exports);
42223
- __exportStar(__nccwpck_require__(9567), exports);
42224
- __exportStar(__nccwpck_require__(8297), exports);
42238
+ exports.createDeployementJobs = void 0;
42239
+ var deploy_1 = __nccwpck_require__(6166);
42240
+ var rollback_1 = __nccwpck_require__(9567);
42241
+ var stop_1 = __nccwpck_require__(8297);
42242
+ var createDeployementJobs = function (context, definitions) {
42243
+ 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);
42244
+ };
42245
+ exports.createDeployementJobs = createDeployementJobs;
42225
42246
 
42226
42247
  /***/ }),
42227
42248
 
@@ -42245,7 +42266,7 @@ exports.__esModule = true;
42245
42266
  exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
42246
42267
  var variables_1 = __nccwpck_require__(7040);
42247
42268
  exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
42248
- var createRollbackJob = function (jobDefinition, context) {
42269
+ var createRollbackJob = function (context, jobDefinition) {
42249
42270
  return {
42250
42271
  name: exports.ROLLBACK_JOB_NAME,
42251
42272
  image: jobDefinition.image,
@@ -42289,7 +42310,7 @@ exports.__esModule = true;
42289
42310
  exports.createStopJob = exports.STOP_JOB_NAME = void 0;
42290
42311
  var variables_1 = __nccwpck_require__(7040);
42291
42312
  exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
42292
- var createStopJob = function (jobDefinition, context) {
42313
+ var createStopJob = function (context, jobDefinition) {
42293
42314
  return {
42294
42315
  name: exports.STOP_JOB_NAME,
42295
42316
  image: jobDefinition.image,
@@ -42559,27 +42580,30 @@ var createGoogleCloudRunDeployJobs = function (context) {
42559
42580
  name = _b[0];
42560
42581
  return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
42561
42582
  })), 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)];
42583
+ return (0, base_1.createDeployementJobs)(context, {
42584
+ deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
42585
+ artifacts: {
42586
+ paths: ["____envvars.yaml"]
42587
+ },
42588
+ variables: {
42589
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
42590
+ ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
42591
+ lineWidth: -1,
42592
+ quotingType: "'",
42593
+ forceQuotes: true
42594
+ })
42595
+ },
42596
+ image: (0, runner_1.getRunnerImage)("gcloud"),
42597
+ script: deployScripts
42598
+ }),
42599
+ stop: {
42600
+ image: (0, runner_1.getRunnerImage)("gcloud"),
42601
+ variables: {
42602
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
42603
+ },
42604
+ script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
42605
+ }
42606
+ });
42583
42607
  };
42584
42608
  exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
42585
42609
 
@@ -42936,8 +42960,8 @@ exports.createCustomDeployJobs = void 0;
42936
42960
  var yarn_1 = __nccwpck_require__(464);
42937
42961
  var runner_1 = __nccwpck_require__(5071);
42938
42962
  var base_1 = __nccwpck_require__(2866);
42939
- var types_1 = __nccwpck_require__(3109);
42940
42963
  var sbom_1 = __nccwpck_require__(5928);
42964
+ var types_1 = __nccwpck_require__(3109);
42941
42965
  var createCustomDeployJobs = function (context) {
42942
42966
  var _a, _b, _c;
42943
42967
  var deployConfig = context.componentConfig.deploy;
@@ -42952,16 +42976,19 @@ var createCustomDeployJobs = function (context) {
42952
42976
  var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
42953
42977
  noCustomPostInstall: true
42954
42978
  });
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);
42979
+ return (0, base_1.createDeployementJobs)(context, {
42980
+ deploy: {
42981
+ image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
42982
+ cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
42983
+ 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),
42984
+ variables: {}
42985
+ },
42986
+ stop: deployConfig.stopScript ? {
42987
+ image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
42988
+ script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
42989
+ variables: {}
42990
+ } : undefined
42991
+ });
42965
42992
  };
42966
42993
  exports.createCustomDeployJobs = createCustomDeployJobs;
42967
42994
 
@@ -43022,9 +43049,11 @@ var createDockerTagDeployJobs = function (context) {
43022
43049
  throw new Error("deploy config is not dockerTag");
43023
43050
  }
43024
43051
  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
- }))];
43052
+ return (0, base_1.createDeployementJobs)(context, {
43053
+ deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
43054
+ 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, "\"")]
43055
+ })
43056
+ });
43028
43057
  };
43029
43058
  exports.createDockerTagDeployJobs = createDockerTagDeployJobs;
43030
43059
 
@@ -43240,9 +43269,9 @@ var js_yaml_1 = __nccwpck_require__(3618);
43240
43269
  var __1 = __nccwpck_require__(5355);
43241
43270
  var runner_1 = __nccwpck_require__(5071);
43242
43271
  var base_1 = __nccwpck_require__(2866);
43272
+ var sbom_1 = __nccwpck_require__(5928);
43243
43273
  var types_1 = __nccwpck_require__(3109);
43244
43274
  var kubeValues_1 = __nccwpck_require__(1061);
43245
- var sbom_1 = __nccwpck_require__(5928);
43246
43275
  var createKubernetesDeployJobs = function (context) {
43247
43276
  var _a, _b, _c;
43248
43277
  var deployConfig = context.componentConfig.deploy;
@@ -43273,13 +43302,17 @@ var createKubernetesDeployJobs = function (context) {
43273
43302
  };
43274
43303
  var clusterName = "kube-".concat(context.environment.fullName);
43275
43304
  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)];
43305
+ return (0, base_1.createDeployementJobs)(context, {
43306
+ deploy: __assign(__assign({}, shared), {
43307
+ script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
43308
+ }),
43309
+ stop: __assign(__assign({}, shared), {
43310
+ script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
43311
+ }),
43312
+ rollback: __assign(__assign({}, shared), {
43313
+ script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
43314
+ })
43315
+ });
43283
43316
  };
43284
43317
  exports.createKubernetesDeployJobs = createKubernetesDeployJobs;
43285
43318
 
package/dist/bundles/cli/index.js CHANGED
@@ -351895,7 +351895,7 @@ exports.readConfigSync = readConfigSync;
351895
351895
 
351896
351896
  exports.__esModule = true;
351897
351897
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351898
- exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-644e2956" || 0;
351898
+ exports.PIPELINE_IMAGE_TAG = "further-refactor-deploy-77d59e43" || 0;
351899
351899
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351900
351900
 
351901
351901
  /***/ }),
@@ -353268,25 +353268,46 @@ exports.createDeployJob = createDeployJob;
353268
353268
  "use strict";
353269
353269
 
353270
353270
 
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];
353271
+ var __read = this && this.__read || function (o, n) {
353272
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
353273
+ if (!m) return o;
353274
+ var i = m.call(o),
353275
+ r,
353276
+ ar = [],
353277
+ e;
353278
+ try {
353279
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
353280
+ } catch (error) {
353281
+ e = {
353282
+ error: error
353283
+ };
353284
+ } finally {
353285
+ try {
353286
+ if (r && !r.done && (m = i["return"])) m.call(i);
353287
+ } finally {
353288
+ if (e) throw e.error;
353277
353289
  }
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);
353290
+ }
353291
+ return ar;
353292
+ };
353293
+ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
353294
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
353295
+ if (ar || !(i in from)) {
353296
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
353297
+ ar[i] = from[i];
353298
+ }
353299
+ }
353300
+ return to.concat(ar || Array.prototype.slice.call(from));
353285
353301
  };
353286
353302
  exports.__esModule = true;
353287
- __exportStar(__nccwpck_require__(26166), exports);
353288
- __exportStar(__nccwpck_require__(99567), exports);
353289
- __exportStar(__nccwpck_require__(58297), exports);
353303
+ exports.createDeployementJobs = void 0;
353304
+ var deploy_1 = __nccwpck_require__(26166);
353305
+ var rollback_1 = __nccwpck_require__(99567);
353306
+ var stop_1 = __nccwpck_require__(58297);
353307
+ var createDeployementJobs = function (context, definitions) {
353308
+ 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);
353309
+ };
353310
+ exports.createDeployementJobs = createDeployementJobs;
353290
353311
 
353291
353312
  /***/ }),
353292
353313
 
@@ -353310,7 +353331,7 @@ exports.__esModule = true;
353310
353331
  exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
353311
353332
  var variables_1 = __nccwpck_require__(67040);
353312
353333
  exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
353313
- var createRollbackJob = function (jobDefinition, context) {
353334
+ var createRollbackJob = function (context, jobDefinition) {
353314
353335
  return {
353315
353336
  name: exports.ROLLBACK_JOB_NAME,
353316
353337
  image: jobDefinition.image,
@@ -353354,7 +353375,7 @@ exports.__esModule = true;
353354
353375
  exports.createStopJob = exports.STOP_JOB_NAME = void 0;
353355
353376
  var variables_1 = __nccwpck_require__(67040);
353356
353377
  exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
353357
- var createStopJob = function (jobDefinition, context) {
353378
+ var createStopJob = function (context, jobDefinition) {
353358
353379
  return {
353359
353380
  name: exports.STOP_JOB_NAME,
353360
353381
  image: jobDefinition.image,
@@ -353624,27 +353645,30 @@ var createGoogleCloudRunDeployJobs = function (context) {
353624
353645
  name = _b[0];
353625
353646
  return "gcloud run services delete ".concat(serviceName, "-").concat(name, " ").concat(commonArgsString);
353626
353647
  })), 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)];
353648
+ return (0, base_1.createDeployementJobs)(context, {
353649
+ deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
353650
+ artifacts: {
353651
+ paths: ["____envvars.yaml"]
353652
+ },
353653
+ variables: {
353654
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
353655
+ ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
353656
+ lineWidth: -1,
353657
+ quotingType: "'",
353658
+ forceQuotes: true
353659
+ })
353660
+ },
353661
+ image: (0, runner_1.getRunnerImage)("gcloud"),
353662
+ script: deployScripts
353663
+ }),
353664
+ stop: {
353665
+ image: (0, runner_1.getRunnerImage)("gcloud"),
353666
+ variables: {
353667
+ CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
353668
+ },
353669
+ script: (0, gitlab_1.allowFailureInScripts)(stopScripts)
353670
+ }
353671
+ });
353648
353672
  };
353649
353673
  exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
353650
353674
 
@@ -354001,8 +354025,8 @@ exports.createCustomDeployJobs = void 0;
354001
354025
  var yarn_1 = __nccwpck_require__(10464);
354002
354026
  var runner_1 = __nccwpck_require__(55071);
354003
354027
  var base_1 = __nccwpck_require__(82866);
354004
- var types_1 = __nccwpck_require__(63109);
354005
354028
  var sbom_1 = __nccwpck_require__(65928);
354029
+ var types_1 = __nccwpck_require__(63109);
354006
354030
  var createCustomDeployJobs = function (context) {
354007
354031
  var _a, _b, _c;
354008
354032
  var deployConfig = context.componentConfig.deploy;
@@ -354017,16 +354041,19 @@ var createCustomDeployJobs = function (context) {
354017
354041
  var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
354018
354042
  noCustomPostInstall: true
354019
354043
  });
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);
354044
+ return (0, base_1.createDeployementJobs)(context, {
354045
+ deploy: {
354046
+ image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
354047
+ cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
354048
+ 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),
354049
+ variables: {}
354050
+ },
354051
+ stop: deployConfig.stopScript ? {
354052
+ image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
354053
+ script: __spreadArray(__spreadArray([], __read(deployConfig.stopScript), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false),
354054
+ variables: {}
354055
+ } : undefined
354056
+ });
354030
354057
  };
354031
354058
  exports.createCustomDeployJobs = createCustomDeployJobs;
354032
354059
 
@@ -354087,9 +354114,11 @@ var createDockerTagDeployJobs = function (context) {
354087
354114
  throw new Error("deploy config is not dockerTag");
354088
354115
  }
354089
354116
  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
- }))];
354117
+ return (0, base_1.createDeployementJobs)(context, {
354118
+ deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
354119
+ 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, "\"")]
354120
+ })
354121
+ });
354093
354122
  };
354094
354123
  exports.createDockerTagDeployJobs = createDockerTagDeployJobs;
354095
354124
 
@@ -354305,9 +354334,9 @@ var js_yaml_1 = __nccwpck_require__(3618);
354305
354334
  var __1 = __nccwpck_require__(25355);
354306
354335
  var runner_1 = __nccwpck_require__(55071);
354307
354336
  var base_1 = __nccwpck_require__(82866);
354337
+ var sbom_1 = __nccwpck_require__(65928);
354308
354338
  var types_1 = __nccwpck_require__(63109);
354309
354339
  var kubeValues_1 = __nccwpck_require__(1061);
354310
- var sbom_1 = __nccwpck_require__(65928);
354311
354340
  var createKubernetesDeployJobs = function (context) {
354312
354341
  var _a, _b, _c;
354313
354342
  var deployConfig = context.componentConfig.deploy;
@@ -354338,13 +354367,17 @@ var createKubernetesDeployJobs = function (context) {
354338
354367
  };
354339
354368
  var clusterName = "kube-".concat(context.environment.fullName);
354340
354369
  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)];
354370
+ return (0, base_1.createDeployementJobs)(context, {
354371
+ deploy: __assign(__assign({}, shared), {
354372
+ script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesCreateSecret", "kubernetesDeploy"], false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false), ["echo deployment successful 😻"], false)
354373
+ }),
354374
+ stop: __assign(__assign({}, shared), {
354375
+ script: __spreadArray(__spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesDelete"], false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false)
354376
+ }),
354377
+ rollback: __assign(__assign({}, shared), {
354378
+ script: __spreadArray(__spreadArray([], __read(connectContext), false), ["kubernetesRollback"], false)
354379
+ })
354380
+ });
354348
354381
  };
354349
354382
  exports.createKubernetesDeployJobs = createKubernetesDeployJobs;
354350
354383
 
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-77d59e43",
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-77d59e43",
61
61
  "stableVersion": "0.0.0"
62
62
  }