@catladder/cli 0.0.0-main-842b2cfa → 0.0.0-main-99253261

package/dist/bundles/catenv/index.js

@@ -40918,7 +40918,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-842b2cfa" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-99253261" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -45363,77 +45363,27 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-var __read = this && this.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-    r,
-    ar = [],
-    e;
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-  return ar;
-};
-var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
-    }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-};
 exports.__esModule = true;
 exports.createChildPipeline = void 0;
-var config_1 = __nccwpck_require__(3138);
-var rules_1 = __nccwpck_require__(2020);
-var runner_1 = __nccwpck_require__(5071);
-var jobs_1 = __nccwpck_require__(2339);
 var createAllJobs_1 = __nccwpck_require__(7052);
+var getPipelineStages_1 = __nccwpck_require__(5812);
 var createGitlabJobs_1 = __nccwpck_require__(3920);
+var createGitlabPipeline_1 = __nccwpck_require__(9800);
 var createChildPipeline = function (type, trigger, config) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var jobs, allEnvs, stages, pipeline;
-    var _a;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
+    var jobs, stages, gitlabJobs;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
           return [4 /*yield*/, (0, createAllJobs_1.createAllJobs)(config, trigger)];
         case 1:
-          jobs = _b.sent();
-          allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
-          stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
-            return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
-              return "".concat(baseStage, " ").concat(e);
-            })), false);
-          }, []);
+          jobs = _a.sent();
+          stages = (0, getPipelineStages_1.getPipelineStages)(config);
           if (!(type === "gitlab")) return [3 /*break*/, 3];
-          _a = {
-            image: (0, runner_1.getRunnerImage)("jobs-default"),
-            variables: {
-              FF_USE_FASTZIP: "true",
-              GIT_DEPTH: 1
-            },
-            workflow: {
-              rules: rules_1.RULES_ALWAYS
-            },
-            stages: stages
-          };
           return [4 /*yield*/, (0, createGitlabJobs_1.createGitlabJobs)(jobs)];
         case 2:
-          pipeline = (_a.jobs = _b.sent(), _a);
-          return [2 /*return*/, pipeline];
+          gitlabJobs = _a.sent();
+          return [2 /*return*/, (0, createGitlabPipeline_1.createGitlabPipelineFromStagesAndJobs)(stages, gitlabJobs)];
         case 3:
           throw new Error("".concat(type, " is not supported"));
       }
@@ -45672,6 +45622,66 @@ exports.createJobsForComponent = createJobsForComponent;
 
 /***/ }),
 
+/***/ 5812:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getPipelineStages = void 0;
+var config_1 = __nccwpck_require__(3138);
+var jobs_1 = __nccwpck_require__(2339);
+/**
+ *
+  while technically not required, we group different envs in its own stage
+  each job from `createJobs` that is defined as `envMode: "stagePerEnv"` will have `deploy dev`, etc. instead of just `deploy`
+  this is just so that it looks nicer in gitlab and makes running mutliple manual tasks more easy to use
+ */
+function getPipelineStages(config) {
+  var allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
+  var stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
+    return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
+      return "".concat(baseStage, " ").concat(e);
+    })), false);
+  }, []);
+  return stages;
+}
+exports.getPipelineStages = getPipelineStages;
+
+/***/ }),
+
 /***/ 3920:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -45954,6 +45964,34 @@ exports.createGitlabJobs = createGitlabJobs;
 
 /***/ }),
 
+/***/ 9800:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createGitlabPipelineFromStagesAndJobs = void 0;
+var rules_1 = __nccwpck_require__(2020);
+var runner_1 = __nccwpck_require__(5071);
+function createGitlabPipelineFromStagesAndJobs(stages, gitlabJobs) {
+  return {
+    image: (0, runner_1.getRunnerImage)("jobs-default"),
+    variables: {
+      FF_USE_FASTZIP: "true",
+      GIT_DEPTH: 1
+    },
+    workflow: {
+      rules: rules_1.RULES_ALWAYS
+    },
+    stages: stages,
+    jobs: gitlabJobs
+  };
+}
+exports.createGitlabPipelineFromStagesAndJobs = createGitlabPipelineFromStagesAndJobs;
+
+/***/ }),
+
 /***/ 4011:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/dist/bundles/cli/index.js

@@ -355852,7 +355852,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-842b2cfa" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-99253261" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -360297,77 +360297,27 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-var __read = this && this.__read || function (o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-    r,
-    ar = [],
-    e;
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-  return ar;
-};
-var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
-    }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-};
 exports.__esModule = true;
 exports.createChildPipeline = void 0;
-var config_1 = __nccwpck_require__(33138);
-var rules_1 = __nccwpck_require__(42020);
-var runner_1 = __nccwpck_require__(55071);
-var jobs_1 = __nccwpck_require__(62339);
 var createAllJobs_1 = __nccwpck_require__(17052);
+var getPipelineStages_1 = __nccwpck_require__(45812);
 var createGitlabJobs_1 = __nccwpck_require__(63920);
+var createGitlabPipeline_1 = __nccwpck_require__(59800);
 var createChildPipeline = function (type, trigger, config) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var jobs, allEnvs, stages, pipeline;
-    var _a;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
+    var jobs, stages, gitlabJobs;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
           return [4 /*yield*/, (0, createAllJobs_1.createAllJobs)(config, trigger)];
         case 1:
-          jobs = _b.sent();
-          allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
-          stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
-            return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
-              return "".concat(baseStage, " ").concat(e);
-            })), false);
-          }, []);
+          jobs = _a.sent();
+          stages = (0, getPipelineStages_1.getPipelineStages)(config);
           if (!(type === "gitlab")) return [3 /*break*/, 3];
-          _a = {
-            image: (0, runner_1.getRunnerImage)("jobs-default"),
-            variables: {
-              FF_USE_FASTZIP: "true",
-              GIT_DEPTH: 1
-            },
-            workflow: {
-              rules: rules_1.RULES_ALWAYS
-            },
-            stages: stages
-          };
           return [4 /*yield*/, (0, createGitlabJobs_1.createGitlabJobs)(jobs)];
         case 2:
-          pipeline = (_a.jobs = _b.sent(), _a);
-          return [2 /*return*/, pipeline];
+          gitlabJobs = _a.sent();
+          return [2 /*return*/, (0, createGitlabPipeline_1.createGitlabPipelineFromStagesAndJobs)(stages, gitlabJobs)];
         case 3:
           throw new Error("".concat(type, " is not supported"));
       }
@@ -360606,6 +360556,66 @@ exports.createJobsForComponent = createJobsForComponent;
 
 /***/ }),
 
+/***/ 45812:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+exports.__esModule = true;
+exports.getPipelineStages = void 0;
+var config_1 = __nccwpck_require__(33138);
+var jobs_1 = __nccwpck_require__(62339);
+/**
+ *
+  while technically not required, we group different envs in its own stage
+  each job from `createJobs` that is defined as `envMode: "stagePerEnv"` will have `deploy dev`, etc. instead of just `deploy`
+  this is just so that it looks nicer in gitlab and makes running mutliple manual tasks more easy to use
+ */
+function getPipelineStages(config) {
+  var allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
+  var stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
+    return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
+      return "".concat(baseStage, " ").concat(e);
+    })), false);
+  }, []);
+  return stages;
+}
+exports.getPipelineStages = getPipelineStages;
+
+/***/ }),
+
 /***/ 63920:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -360888,6 +360898,34 @@ exports.createGitlabJobs = createGitlabJobs;
 
 /***/ }),
 
+/***/ 59800:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createGitlabPipelineFromStagesAndJobs = void 0;
+var rules_1 = __nccwpck_require__(42020);
+var runner_1 = __nccwpck_require__(55071);
+function createGitlabPipelineFromStagesAndJobs(stages, gitlabJobs) {
+  return {
+    image: (0, runner_1.getRunnerImage)("jobs-default"),
+    variables: {
+      FF_USE_FASTZIP: "true",
+      GIT_DEPTH: 1
+    },
+    workflow: {
+      rules: rules_1.RULES_ALWAYS
+    },
+    stages: stages,
+    jobs: gitlabJobs
+  };
+}
+exports.createGitlabPipelineFromStagesAndJobs = createGitlabPipelineFromStagesAndJobs;
+
+/***/ }),
+
 /***/ 34011:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-main-842b2cfa",
+  "version": "0.0.0-main-99253261",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -74,7 +74,7 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-842b2cfa",
+    "@catladder/pipeline": "0.0.0-main-99253261",
     "@gitbeaker/rest": "^39.28.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",