@catladder/pipeline 1.75.4 → 1.76.0

package/dist/pipeline/createJobs.js

@@ -4,23 +4,18 @@ 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 {
@@ -29,7 +24,6 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
         reject(e);
       }
     }
-
     function rejected(value) {
       try {
         step(generator["throw"](value));
@@ -37,29 +31,26 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
         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];
+      label: 0,
+      sent: function () {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
     },
-    trys: [],
-    ops: []
-  },
-      f,
-      y,
-      t,
-      g;
+    f,
+    y,
+    t,
+    g;
   return g = {
     next: verb(0),
     "throw": verb(1),
@@ -67,78 +58,59 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }, 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];
@@ -146,7 +118,6 @@ var __generator = this && this.__generator || function (thisArg, body) {
     } finally {
       f = t = 0;
     }
-
     if (op[0] & 5) throw op[1];
     return {
       value: op[0] ? op[1] : void 0,
@@ -154,26 +125,21 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-
 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;
-
+    r,
+    ar = [],
+    e;
   try {
     while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
   } catch (error) {
@@ -187,10 +153,8 @@ var __read = this && this.__read || function (o, n) {
       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)) {
@@ -200,85 +164,62 @@ 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;
-
-var child_process_promise_1 = require("child-process-promise");
-
 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) {
     var _b;
-
     var variables = _a.variables,
-        job = __rest(_a, ["variables"]);
-
+      job = __rest(_a, ["variables"]);
     return __assign({
       variables: __assign(__assign({}, (_b = context.environment.envVars) !== null && _b !== void 0 ? _b : {}), variables !== null && variables !== void 0 ? variables : {})
     }, job);
   });
 };
-
 var getCustomJobs = function (context) {
   if (!context.componentConfig.customJobs) {
     return [];
   }
-
   var rawJobs = (0, lodash_1.isFunction)(context.componentConfig.customJobs) ? context.componentConfig.customJobs(context) : context.componentConfig.customJobs;
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
-
 var createRawJobs = function (context) {
   if (context.componentConfig.deploy === false) {
     return [];
   }
-
   var buildJobs = build_1.BUILD_TYPES[context.componentConfig.build.type].jobs(context);
   var deployJobs = deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(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
+};
+// 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) ? {
@@ -292,9 +233,7 @@ var replaceReferences = function (job, componentName, env, allRawJobs) {
       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,
@@ -302,25 +241,20 @@ var replaceReferences = function (job, componentName, env, allRawJobs) {
       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
-
-
+};
+// 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,
@@ -333,82 +267,49 @@ var addStageNeeds = function (jobs) {
     });
   });
 };
-
 var createJobs = function (type, envs, config, componentName, trigger) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var commitInfo, packageManagerInfo;
-
-    var _a;
-
-    var _b;
-
-    return __generator(this, function (_c) {
-      switch (_c.label) {
+    var commitInfo, _a, packageManagerInfo;
+    return __generator(this, function (_b) {
+      switch (_b.label) {
         case 0:
-          _a = {
-            refName: (_b = process.env.CI_COMMIT_REF_NAME) !== null && _b !== void 0 ? _b : "unknown",
-            reviewSlug: process.env.CI_MERGE_REQUEST_IID ? "mr".concat(process.env.CI_MERGE_REQUEST_IID) : "unknown",
-            buildTime: new Date().toISOString()
-          };
-          return [4
-          /*yield*/
-          , (0, child_process_promise_1.exec)("git describe --tags || git rev-parse HEAD").then(function (s) {
-            return s.stdout.trim();
-          })];
-
+          _a = [{}];
+          return [4 /*yield*/, (0, getCommitInfo_1.getBaseCommitInfo)()];
         case 1:
-          commitInfo = (_a.buildId = _c.sent(), _a.trigger = trigger, _a);
-          return [4
-          /*yield*/
-          , (0, packageManager_1.getPackageManagerInfo)(config, componentName)];
-
+          commitInfo = __assign.apply(void 0, [__assign.apply(void 0, _a.concat([_b.sent()])), {
+            trigger: trigger
+          }]);
+          return [4 /*yield*/, (0, packageManager_1.getPackageManagerInfo)(config, componentName)];
         case 2:
-          packageManagerInfo = _c.sent();
-          return [2
-          /*return*/
-          , envs.reduce(function (acc, env) {
+          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)];
-
+                    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];
-
+                    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({})];
-
+                    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 [2 /*return*/, result];
                 }
               });
             });
@@ -417,5 +318,4 @@ var createJobs = function (type, envs, config, componentName, trigger) {
     });
   });
 };
-
 exports.createJobs = createJobs;

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

@@ -5,5 +5,6 @@ export declare const makeGitlabJob: ({
   needsStages,
   needsOtherComponent,
   name,
+  needs,
   ...rest
 }: CatladderJob<string>) => GitlabJobDef;

package/dist/pipeline/gitlab/makeGitlabJob.js

@@ -4,43 +4,41 @@ 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 __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;
 };
-
 exports.__esModule = true;
 exports.makeGitlabJob = void 0;
-
+var lodash_1 = require("lodash");
 var defaults_1 = require("../../defaults");
-
+var getJobName = function (need) {
+  return (0, lodash_1.isObject)(need) ? need.job : need;
+};
 var makeGitlabJob = function (_a) {
   var envMode = _a.envMode,
-      needsStages = _a.needsStages,
-      needsOtherComponent = _a.needsOtherComponent,
-      name = _a.name,
-      rest = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name"]);
-
+    needsStages = _a.needsStages,
+    needsOtherComponent = _a.needsOtherComponent,
+    name = _a.name,
+    needs = _a.needs,
+    rest = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
   return __assign(__assign({}, rest), {
+    // sort in a predictable manner for snapshot tests
+    needs: needs === null || needs === void 0 ? void 0 : needs.sort(function (a, b) {
+      return getJobName(a).localeCompare(getJobName(b));
+    }),
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   });
 };
-
 exports.makeGitlabJob = makeGitlabJob;

package/dist/pipeline/index.js

@@ -12,13 +12,9 @@ var __createBinding = this && this.__createBinding || (Object.create ? function
   if (k2 === undefined) k2 = k;
   o[k2] = m[k];
 });
-
 var __exportStar = this && this.__exportStar || function (m, exports) {
   for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-
 exports.__esModule = true;
-
 __exportStar(require("./createChildPipeline"), exports);
-
 __exportStar(require("./createJobs"), exports);