@catladder/pipeline 1.89.0 → 1.89.2

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-89-0-d22fc6b2" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-89-2-f962281c" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/pipeline/createAllJobs.d.ts

@@ -0,0 +1,8 @@
+import type { Config, PipelineTrigger } from "../types";
+import type { CatladderJob } from "../types/jobs";
+export declare type AllCatladderJobs = {
+  [componentName: string]: {
+    [env: string]: Array<CatladderJob>;
+  };
+};
+export declare const createAllJobs: (config: Config, trigger: PipelineTrigger) => Promise<AllCatladderJobs>;

package/dist/pipeline/createAllJobs.js

@@ -0,0 +1,164 @@
+"use strict";
+
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function () {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (_) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+exports.__esModule = true;
+exports.createAllJobs = void 0;
+var config_1 = require("../config");
+var createJobsForComponent_1 = require("./createJobsForComponent");
+var createAllJobs = function (config, trigger) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b;
+    return __generator(this, function (_c) {
+      switch (_c.label) {
+        case 0:
+          _b = (_a = Object).fromEntries;
+          return [4 /*yield*/, Promise.all(Object.keys(config.components).map(function (componentName) {
+            return __awaiter(void 0, void 0, void 0, function () {
+              var envs, _a, _b, _c;
+              return __generator(this, function (_d) {
+                switch (_d.label) {
+                  case 0:
+                    envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
+                    _a = [componentName];
+                    _c = (_b = Object).fromEntries;
+                    return [4 /*yield*/, Promise.all(envs.map(function (env) {
+                      return __awaiter(void 0, void 0, void 0, function () {
+                        var _a;
+                        return __generator(this, function (_b) {
+                          switch (_b.label) {
+                            case 0:
+                              _a = [env];
+                              return [4 /*yield*/, (0, createJobsForComponent_1.createJobsForComponent)(config, componentName, env, trigger)];
+                            case 1:
+                              return [2 /*return*/, _a.concat([_b.sent()])];
+                          }
+                        });
+                      });
+                    }))];
+                  case 1:
+                    return [2 /*return*/, _a.concat([_c.apply(_b, [_d.sent()])])];
+                }
+              });
+            });
+          }))];
+        case 1:
+          return [2 /*return*/, _b.apply(_a, [_c.sent()])];
+      }
+    });
+  });
+};
+exports.createAllJobs = createAllJobs;

package/dist/pipeline/createChildPipeline.js

@@ -1,15 +1,5 @@
 "use strict";
 
-var __assign = this && this.__assign || function () {
-  __assign = Object.assign || function (t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return __assign.apply(this, arguments);
-};
 var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -162,54 +152,40 @@ var config_1 = require("../config");
 var rules_1 = require("../rules");
 var runner_1 = require("../runner");
 var jobs_1 = require("../types/jobs");
-var createJobs_1 = require("./createJobs");
+var createAllJobs_1 = require("./createAllJobs");
+var createGitlabJobs_1 = require("./gitlab/createGitlabJobs");
 var createChildPipeline = function (type, trigger, config) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var components, jobs, allEnvs, stages, pipeline;
-    return __generator(this, function (_a) {
-      switch (_a.label) {
+    var jobs, allEnvs, stages, pipeline;
+    var _a;
+    return __generator(this, function (_b) {
+      switch (_b.label) {
         case 0:
-          components = Object.keys(config.components);
-          return [4 /*yield*/, components.reduce(function (acc, componentName) {
-            return __awaiter(void 0, void 0, void 0, function () {
-              var envs, _a, _b;
-              return __generator(this, function (_c) {
-                switch (_c.label) {
-                  case 0:
-                    envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
-                    _a = [{}];
-                    return [4 /*yield*/, acc];
-                  case 1:
-                    _b = [__assign.apply(void 0, _a.concat([_c.sent()]))];
-                    return [4 /*yield*/, (0, createJobs_1.createJobs)(type, envs, config, componentName, trigger)];
-                  case 2:
-                    return [2 /*return*/, __assign.apply(void 0, _b.concat([_c.sent()]))];
-                }
-              });
-            });
-          }, Promise.resolve({}))];
+          return [4 /*yield*/, (0, createAllJobs_1.createAllJobs)(config, trigger)];
         case 1:
-          jobs = _a.sent();
+          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);
           }, []);
-          if (type === "gitlab") {
-            pipeline = {
-              image: (0, runner_1.getRunnerImage)("jobs-default"),
-              variables: {
-                FF_USE_FASTZIP: "true"
-              },
-              workflow: {
-                rules: rules_1.RULES_ALWAYS
-              },
-              stages: stages,
-              jobs: jobs
-            };
-            return [2 /*return*/, pipeline];
-          }
+          if (!(type === "gitlab")) return [3 /*break*/, 3];
+          _a = {
+            image: (0, runner_1.getRunnerImage)("jobs-default"),
+            variables: {
+              FF_USE_FASTZIP: "true"
+            },
+            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];
+        case 3:
           throw new Error("".concat(type, " is not supported"));
       }
     });

package/dist/pipeline/createJobsForComponent.d.ts

@@ -0,0 +1,3 @@
+import type { Config, PipelineTrigger } from "../types/config";
+import type { CatladderJob } from "../types/jobs";
+export declare const createJobsForComponent: (config: Config, componentName: string, env: string, trigger: PipelineTrigger) => Promise<Array<CatladderJob>>;

package/dist/pipeline/{createJobs.js → createJobsForComponent.js}

@@ -165,14 +165,12 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.createJobs = void 0;
+exports.createJobsForComponent = void 0;
 var lodash_1 = require("lodash");
 var build_1 = require("../build");
 var context_1 = require("../context");
 var deploy_1 = require("../deploy");
-var utils_1 = require("../utils");
 var getCommitInfo_1 = require("./commitInfo/getCommitInfo");
-var makeGitlabJob_1 = require("./gitlab/makeGitlabJob");
 var packageManager_1 = require("./packageManager");
 var injectDefaultVarsInCustomJobs = function (context, jobs) {
   return jobs.map(function (_a) {
@@ -200,71 +198,9 @@ var createRawJobs = function (context) {
   var customJobs = getCustomJobs(context);
   return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
 };
-var getFullJobName = function (name, componentName, env) {
-  if (env) {
-    return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
-  }
-  return "".concat(componentName, " ").concat(name);
-};
-var getFullReferencedJobName = function (referencedJobName, componentName, env, allRawJobs) {
-  var referencedJob = allRawJobs.find(function (j) {
-    return j.name === referencedJobName;
-  });
-  if (!referencedJob) {
-    throw new Error("unknown job referenced: " + referencedJobName);
-  }
-  var envToSet = referencedJob.envMode !== "none" ? env : null;
-  return getFullJobName(referencedJobName, componentName, envToSet);
-};
-// replaces references to other jobs with the full name
-// the full name contains the componentname and the env name (if any)
-var replaceReferences = function (job, componentName, env, allRawJobs) {
-  var _a, _b, _c;
-  var stage = job.envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
-  var cleanedNeeds = __spreadArray(__spreadArray([], __read((_a = job.needs) !== null && _a !== void 0 ? _a : []), false), __read((_b = job.needsOtherComponent) !== null && _b !== void 0 ? _b : []), false);
-  var needs = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
-    var _a;
-    return (0, lodash_1.isObject)(n) ? {
-      job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allRawJobs),
-      artifacts: n.artifacts
-    } : getFullReferencedJobName(n, componentName, env, allRawJobs);
-  });
-  return __assign(__assign({}, job), {
-    stage: stage,
-    needs: needs,
-    environment: ((_c = job.environment) === null || _c === void 0 ? void 0 : _c.on_stop) ? __assign(__assign({}, job.environment), {
-      on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allRawJobs)
-    }) : job.environment
-  });
-};
-// this can be removed once https://gitlab.com/gitlab-org/gitlab/-/issues/220758 is resolved
-var addStageNeeds = function (jobs) {
-  // when a job defines needsStages, we add these as needs
-  return jobs.map(function (job) {
-    var _a;
-    if (!job.needsStages || job.needsStages.length === 0) {
-      return job;
-    }
-    var neededJobs = jobs.map(function (j) {
-      var _a, _b;
-      var neededStage = (_a = job.needsStages) === null || _a === void 0 ? void 0 : _a.find(function (s) {
-        return j.stage === s.stage;
-      });
-      if (neededStage) {
-        return {
-          job: j.name,
-          artifacts: (_b = neededStage.artifacts) !== null && _b !== void 0 ? _b : false
-        };
-      }
-    }).filter(utils_1.notNil);
-    return __assign(__assign({}, job), {
-      needs: __spreadArray(__spreadArray([], __read((_a = job.needs) !== null && _a !== void 0 ? _a : []), false), __read(neededJobs), false)
-    });
-  });
-};
-var createJobs = function (type, envs, config, componentName, trigger) {
+var createJobsForComponent = function (config, componentName, env, trigger) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var commitInfo, _a, packageManagerInfo;
+    var commitInfo, _a, packageManagerInfo, context;
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
@@ -277,40 +213,12 @@ var createJobs = function (type, envs, config, componentName, trigger) {
           return [4 /*yield*/, (0, packageManager_1.getPackageManagerInfo)(config, componentName)];
         case 2:
           packageManagerInfo = _b.sent();
-          return [2 /*return*/, envs.reduce(function (acc, env) {
-            return __awaiter(void 0, void 0, void 0, function () {
-              var context, jobs, result, _a, _b, _c, _d, _e;
-              return __generator(this, function (_f) {
-                switch (_f.label) {
-                  case 0:
-                    return [4 /*yield*/, (0, context_1.createContext)(config, componentName, env, commitInfo, packageManagerInfo)];
-                  case 1:
-                    context = _f.sent();
-                    jobs = addStageNeeds(createRawJobs(context));
-                    _a = [{}];
-                    return [4 /*yield*/, acc];
-                  case 2:
-                    _b = [__assign.apply(void 0, _a.concat([_f.sent()]))];
-                    _d = (_c = jobs).reduce;
-                    _e = [function (acc, job) {
-                      var _a;
-                      var jobWithResolvedReferences = replaceReferences(job, componentName, env, jobs);
-                      var jobName = getFullJobName(job.name, componentName, job.envMode !== "none" ? env : undefined);
-                      if (type === "gitlab") {
-                        return __assign(__assign({}, acc), (_a = {}, _a[jobName] = (0, makeGitlabJob_1.makeGitlabJob)(jobWithResolvedReferences), _a));
-                      }
-                      throw new Error("not supported");
-                    }];
-                    return [4 /*yield*/, Promise.resolve({})];
-                  case 3:
-                    result = __assign.apply(void 0, _b.concat([_d.apply(_c, _e.concat([_f.sent()]))]));
-                    return [2 /*return*/, result];
-                }
-              });
-            });
-          }, {})];
+          return [4 /*yield*/, (0, context_1.createContext)(config, componentName, env, commitInfo, packageManagerInfo)];
+        case 3:
+          context = _b.sent();
+          return [2 /*return*/, createRawJobs(context)];
       }
     });
   });
 };
-exports.createJobs = createJobs;
+exports.createJobsForComponent = createJobsForComponent;

package/dist/pipeline/gitlab/createGitlabJobs.d.ts

@@ -0,0 +1,14 @@
+import type { GitlabJobDef } from "../../types";
+import type { CatladderJob } from "../../types/jobs";
+import type { AllCatladderJobs } from "../createAllJobs";
+declare type AllGitlabJobs = Record<string, GitlabJobDef>;
+export declare const makeGitlabJob: (componentName: string, env: string, {
+  envMode,
+  needsStages,
+  needsOtherComponent,
+  name,
+  needs,
+  ...job
+}: CatladderJob<string>, allJobs: AllCatladderJobs) => [fullName: string, job: GitlabJobDef];
+export declare const createGitlabJobs: (allJobs: AllCatladderJobs) => Promise<AllGitlabJobs>;
+export {};