@catladder/pipeline 0.0.0-fix-command-710f75f1 → 0.0.0-fix-error-sql-db-delete-a719775a

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,76 +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 needsFromNeeds = (_a = job.needs) === null || _a === void 0 ? void 0 : _a.map(function (n) {
-    return (0, lodash_1.isObject)(n) ? {
-      job: getFullReferencedJobName(n.job, componentName, env, allRawJobs),
-      artifacts: n.artifacts
-    } : getFullReferencedJobName(n, componentName, env, allRawJobs);
-  });
-  var needsFromOtherComponents = (_b = job.needsOtherComponent) === null || _b === void 0 ? void 0 : _b.map(function (other) {
-    return {
-      artifacts: other.artifacts,
-      job: getFullReferencedJobName(other.job, other.componentName, env, allRawJobs)
-    };
-  });
-  var needs = __spreadArray(__spreadArray([], __read(needsFromNeeds !== null && needsFromNeeds !== void 0 ? needsFromNeeds : []), false), __read(needsFromOtherComponents !== null && needsFromOtherComponents !== void 0 ? needsFromOtherComponents : []), false);
-  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:
@@ -282,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 {};

package/dist/pipeline/gitlab/createGitlabJobs.js

@@ -0,0 +1,260 @@
+"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) {
+      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
+    };
+  }
+};
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+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.createGitlabJobs = exports.makeGitlabJob = void 0;
+var lodash_1 = require("lodash");
+var defaults_1 = require("../../defaults");
+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, allJobs) {
+  var _a, _b;
+  var referencedJob = (_b = (_a = allJobs[componentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.find(function (j) {
+    return j.name === referencedJobName;
+  });
+  if (!referencedJob) {
+    throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
+  }
+  var envToSet = referencedJob.envMode !== "none" ? env : null;
+  return getFullJobName(referencedJobName, componentName, envToSet);
+};
+var getJobName = function (need) {
+  return (0, lodash_1.isObject)(need) ? need.job : need;
+};
+var makeGitlabJob = function (componentName, env, _a, allJobs) {
+  var _b;
+  var envMode = _a.envMode,
+    needsStages = _a.needsStages,
+    needsOtherComponent = _a.needsOtherComponent,
+    name = _a.name,
+    needs = _a.needs,
+    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
+  var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
+  var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
+    var _a, _b, _c, _d;
+    var referencedComponentName = componentName;
+    var allJobNamesFromThatStage = (_d = (_c = (_b = (_a = allJobs[referencedComponentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) {
+      return j.stage === n.stage;
+    })) === null || _c === void 0 ? void 0 : _c.map(function (j) {
+      return j.name;
+    })) !== null && _d !== void 0 ? _d : [];
+    return allJobNamesFromThatStage.map(function (job) {
+      var _a;
+      return {
+        job: job,
+        artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
+        componentName: referencedComponentName
+      };
+    });
+  });
+  var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false), __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false);
+  var gitlabNeeds = 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, allJobs),
+      artifacts: n.artifacts
+    } : getFullReferencedJobName(n, componentName, env, allJobs);
+  }).sort(function (a, b) {
+    return getJobName(a).localeCompare(getJobName(b));
+  });
+  var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
+  var gitlabJob = __assign(__assign({}, job), {
+    stage: stage,
+    environment: ((_b = job.environment) === null || _b === void 0 ? void 0 : _b.on_stop) ? __assign(__assign({}, job.environment), {
+      on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allJobs)
+    }) : job.environment,
+    // sort in a predictable manner for snapshot tests
+    needs: gitlabNeeds,
+    retry: defaults_1.BASE_RETRY,
+    interruptible: true
+  });
+  return [fullJobName, gitlabJob];
+};
+exports.makeGitlabJob = makeGitlabJob;
+var createGitlabJobs = function (allJobs) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+      return [2 /*return*/, Object.keys(allJobs).reduce(function (accForComponents, componentName) {
+        var componentJobs = allJobs[componentName];
+        return __assign(__assign({}, accForComponents), Object.keys(componentJobs).reduce(function (accForEnvs, env) {
+          var jobs = componentJobs[env];
+          return __assign(__assign({}, accForEnvs), jobs.reduce(function (accForJobs, job) {
+            var _a;
+            var _b = __read((0, exports.makeGitlabJob)(componentName, env, job, allJobs), 2),
+              fullJobName = _b[0],
+              gitlabJob = _b[1];
+            return __assign(__assign({}, accForJobs), (_a = {}, _a[fullJobName] = gitlabJob, _a));
+          }, {}));
+        }, {}));
+      }, {})];
+    });
+  });
+};
+exports.createGitlabJobs = createGitlabJobs;

package/dist/pipeline/index.d.ts

@@ -1,2 +1,2 @@
 export * from "./createChildPipeline";
-export * from "./createJobs";
+export * from "./createJobsForComponent";

package/dist/pipeline/index.js

@@ -17,4 +17,4 @@ var __exportStar = this && this.__exportStar || function (m, exports) {
 };
 exports.__esModule = true;
 __exportStar(require("./createChildPipeline"), exports);
-__exportStar(require("./createJobs"), exports);
+__exportStar(require("./createJobsForComponent"), exports);