@catladder/pipeline 1.150.1 → 1.150.3

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-150-1-76b8c1d7" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v1-150-3-6b689f25" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/context/createComponentContext.js

@@ -165,9 +165,9 @@ var createComponentContext = function (ctx) {
           context = {
             fullConfig: ctx.config,
             componentConfig: componentConfig,
+            env: ctx.env,
             build: {
               dir: dir,
-              packageManagerInfo: packageManagerInfo,
               config: build
             },
             deploy: deploy ? {

package/dist/deploy/custom/deployJob.js

@@ -48,7 +48,7 @@ var createCustomDeployJobs = function (context) {
     throw new Error("deploy config is not custom");
   }
   // FIXME: custom deploy currently assumes yarn-based project
-  var yarnInstall = (0, yarn_1.getYarnInstall)(context.build, {
+  var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
     noCustomPostInstall: true
   });
   return (0, base_1.createDeployementJobs)(context, {

package/dist/pipeline/createAllJobs.d.ts

@@ -1,9 +1,9 @@
-import type { CatladderJobWithContext, Config, PipelineTrigger, PipelineType } from "../types";
-export type AllCatladderJobs = {
-  [componentName: string]: {
-    [env: string]: Array<CatladderJobWithContext>;
-  };
-};
+import type { ComponentContext, Config, PipelineTrigger, PipelineType } from "../types";
+import type { CatladderJob } from "../types/jobs";
+export type AllCatladderJobs = Array<{
+  context: ComponentContext;
+  jobs: Array<CatladderJob>;
+}>;
 export type AllJobsContext = {
   config: Config;
   trigger: PipelineTrigger;

package/dist/pipeline/createAllJobs.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) {
@@ -189,20 +179,13 @@ var createAllJobs = function (_a) {
           })];
         case 1:
           allComponentContext = _c.sent();
-          return [2 /*return*/, allComponentContext.reduce(function (acc, _a) {
-            var componentName = _a.componentName,
-              env = _a.env,
-              context = _a.context;
-            if (!acc[componentName]) {
-              acc[componentName] = {};
-            }
-            acc[componentName][env] = (0, createJobsForComponent_1.createJobsForComponentContext)(context).map(function (job) {
-              return __assign(__assign({}, job), {
-                context: context
-              });
-            });
-            return acc;
-          }, {})];
+          return [2 /*return*/, allComponentContext.map(function (_a) {
+            var context = _a.context;
+            return {
+              context: context,
+              jobs: (0, createJobsForComponent_1.createJobsForComponentContext)(context)
+            };
+          })];
       }
     });
   });

package/dist/pipeline/createMainPipeline.js

@@ -203,10 +203,10 @@ var createMainPipeline = function (pipelineType, config) {
           .sort(function (a, b) {
             var componentNames = Object.keys(config.components);
             var aIndex = componentNames.findIndex(function (c) {
-              return c === a.componentName;
+              return c === a.context.componentName;
             });
             var bIndex = componentNames.findIndex(function (c) {
-              return c === b.componentName;
+              return c === b.context.componentName;
             });
             return aIndex - bIndex;
           }).reduce(function (acc, _a) {

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

@@ -1,13 +1,13 @@
-import type { CatladderJobWithContext, GitlabJobDef, GitlabRule } from "../../types";
+import type { ComponentContext, GitlabJobDef, GitlabRule } from "../../types";
+import type { CatladderJob } from "../../types/jobs";
 import type { AllCatladderJobs } from "../createAllJobs";
 export type AllGitlabJobs = {
   name: string;
   gitlabJob: GitlabJobDef;
-  componentName: string;
-  env: string;
+  context: ComponentContext;
 }[];
 export declare const GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
-export declare const makeGitlabJob: (componentName: string, env: string, {
+export declare const makeGitlabJob: (context: ComponentContext, {
   environment,
   envMode,
   needsStages,
@@ -16,10 +16,9 @@ export declare const makeGitlabJob: (componentName: string, env: string, {
   needs,
   jobTags,
   script,
-  context,
   variables,
   runnerVariables,
   when,
   ...job
-}: CatladderJobWithContext<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
+}: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
 export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;

package/dist/pipeline/gitlab/createGitlabJobs.js

@@ -183,7 +183,9 @@ var getFullJobName = function (name, componentName, env) {
 };
 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) {
+  var referencedJob = (_b = (_a = allJobs.find(function (j) {
+    return j.context.componentName === componentName && j.context.env === env;
+  })) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find(function (j) {
     return j.name === referencedJobName;
   });
   if (!referencedJob) {
@@ -195,7 +197,7 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
 var getJobName = function (need) {
   return (0, lodash_1.isObject)(need) ? need.job : need;
 };
-var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
+var makeGitlabJob = function (context, _a, allJobs, baseRules) {
   var _b, _c;
   var environment = _a.environment,
     envMode = _a.envMode,
@@ -205,20 +207,23 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
     needs = _a.needs,
     jobTags = _a.jobTags,
     script = _a.script,
-    context = _a.context,
     variables = _a.variables,
     runnerVariables = _a.runnerVariables,
     when = _a.when,
-    job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "context", "variables", "runnerVariables", "when"]);
-  var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
+    job = __rest(_a, ["environment", "envMode", "needsStages", "needsOtherComponent", "name", "needs", "jobTags", "script", "variables", "runnerVariables", "when"]);
+  var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(context.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) {
+    var _a, _b, _c;
+    var referencedComponentName = context.componentName;
+    var allJobNamesFromThatStage = (_c = (_b = (_a = allJobs.filter(function (j) {
+      return j.context.componentName === referencedComponentName && j.context.env === context.env;
+    }).flatMap(function (j) {
+      return j.jobs;
+    })) === null || _a === void 0 ? void 0 : _a.filter(function (j) {
       return j.stage === n.stage;
-    })) === null || _c === void 0 ? void 0 : _c.map(function (j) {
+    })) === null || _b === void 0 ? void 0 : _b.map(function (j) {
       return j.name;
-    })) !== null && _d !== void 0 ? _d : [];
+    })) !== null && _c !== void 0 ? _c : [];
     return allJobNamesFromThatStage.map(function (job) {
       var _a;
       return {
@@ -232,16 +237,16 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
   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),
+      job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : context.componentName, context.env, allJobs),
       artifacts: n.artifacts
-    } : getFullReferencedJobName(n, componentName, env, allJobs);
+    } : getFullReferencedJobName(n, context.componentName, context.env, allJobs);
   }).sort(function (a, b) {
     return getJobName(a).localeCompare(getJobName(b));
   });
   var deduplicatedGitlabNeeds = __spreadArray([], __read(new Map(gitlabNeeds.map(function (n) {
     return [(0, lodash_1.isObject)(n) ? n.job : n, n];
   })).values()), false);
-  var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
+  var fullJobName = getFullJobName(name, context.componentName, envMode !== "none" ? context.env : undefined);
   // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
   // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
   var PIPELINE_RUNNER_VARIABLES = ["KUBERNETES_CPU_REQUEST", "KUBERNETES_MEMORY_REQUEST", "KUBERNETES_CPU_LIMIT", "KUBERNETES_MEMORY_LIMIT"];
@@ -278,7 +283,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
     needs: deduplicatedGitlabNeeds,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
-  }), componentName, env, allJobs);
+  }), context.componentName, context.env, allJobs);
   return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
 };
 exports.makeGitlabJob = makeGitlabJob;
@@ -318,21 +323,18 @@ allJobs) {
 var createGitlabJobs = function (allJobs, baseRules) {
   return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
-      return [2 /*return*/, Object.keys(allJobs).flatMap(function (componentName) {
-        var componentJobs = allJobs[componentName];
-        return Object.keys(componentJobs).flatMap(function (env) {
-          var jobs = componentJobs[env];
-          return jobs.flatMap(function (job) {
-            var _a = __read((0, exports.makeGitlabJob)(componentName, env, job, allJobs, baseRules), 2),
-              fullJobName = _a[0],
-              gitlabJob = _a[1];
-            return {
-              name: fullJobName,
-              gitlabJob: gitlabJob,
-              componentName: componentName,
-              env: env
-            };
-          });
+      return [2 /*return*/, allJobs.flatMap(function (_a) {
+        var context = _a.context,
+          jobs = _a.jobs;
+        return jobs.map(function (job) {
+          var _a = __read((0, exports.makeGitlabJob)(context, job, allJobs, baseRules), 2),
+            fullJobName = _a[0],
+            gitlabJob = _a[1];
+          return {
+            name: fullJobName,
+            gitlabJob: gitlabJob,
+            context: context
+          };
         });
       })];
     });