@catladder/cli 0.0.0-refactor-docker-45f6e733 → 0.0.0-refactor-cache-61f8abb0

package/dist/pipeline/src/pipeline/generatePipelineFiles.js

@@ -1,98 +1,53 @@
 "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;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generatePipelineFiles = exports.generateLocalPipelineContent = exports.generateChildPipelineContent = void 0;
+const writeFiles_1 = require("../utils/writeFiles");
+const createChildPipeline_1 = require("./createChildPipeline");
+const createMainPipeline_1 = require("./createMainPipeline");
+const getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
+const sortGitLabJobDefProps_1 = require("./gitlab/sortGitLabJobDefProps");
+async function generateChildPipelineContent(config, pipelineType) {
+    const trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
+    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config);
+    const jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(([jobName, job]) => [
+        jobName,
+        (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
+    ]));
+    return {
+        image,
+        stages,
+        variables,
+        workflow,
+        ...pipelineRest,
+        // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
+        ...jobsWithSortedProps,
+    };
+}
+exports.generateChildPipelineContent = generateChildPipelineContent;
+async function generateLocalPipelineContent(config, pipelineType) {
+    const { jobs, image, stages, variables, workflow, ...pipelineRest } = await (0, createMainPipeline_1.createMainPipeline)(pipelineType, config);
+    const jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(([jobName, job]) => [
+        jobName,
+        (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
+    ]));
+    return {
+        image,
+        stages,
+        variables,
+        workflow,
+        ...pipelineRest,
+        // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
+        ...jobsWithSortedProps,
     };
-    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 (g && (g = 0, op[0] && (_ = 0)), _) 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.generateLocalPipelineContent = generateLocalPipelineContent;
+async function generatePipelineFiles(config, pipelineType, mode) {
+    if (mode === "childpipeline") {
+        const pipelineContent = await generateChildPipelineContent(config, pipelineType);
+        return (0, writeFiles_1.writeYamlfile)(`__pipeline.yml`, pipelineContent);
     }
-};
-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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePipelineFiles = void 0;
-var writeFiles_1 = require("../utils/writeFiles");
-var createChildPipeline_1 = require("./createChildPipeline");
-var createMainPipeline_1 = require("./createMainPipeline");
-var getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
-function generatePipelineFiles(config, pipelineType, mode) {
-    return __awaiter(this, void 0, void 0, function () {
-        var trigger, _a, jobs, image, stages, variables, workflow, mainPipeline, _b, jobs, image, stages, variables, workflow, mainPipeline;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    if (!(mode === "childpipeline")) return [3 /*break*/, 3];
-                    trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
-                    return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
-                case 1:
-                    _a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, mainPipeline = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
-                    // need to spread out the jobs, forgot why
-                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, mainPipeline), jobs))];
-                case 2:
-                    // need to spread out the jobs, forgot why
-                    _c.sent();
-                    return [3 /*break*/, 6];
-                case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
-                case 4:
-                    _b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, mainPipeline = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
-                    // need to spread out the jobs, forgot why
-                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, mainPipeline), jobs))];
-                case 5:
-                    // need to spread out the jobs, forgot why
-                    _c.sent();
-                    _c.label = 6;
-                case 6: return [2 /*return*/];
-            }
-        });
-    });
+    const pipelineContent = await generateLocalPipelineContent(config, pipelineType);
+    return (0, writeFiles_1.writeYamlfile)(`.gitlab-ci.yml`, pipelineContent);
 }
 exports.generatePipelineFiles = generatePipelineFiles;
 //# sourceMappingURL=generatePipelineFiles.js.map

package/dist/pipeline/src/pipeline/generatePipelineFiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoD;AACpD,6DAA4D;AAC5D,2DAA0D;AAC1D,8GAA6G;AAC7G,SAAsB,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;;;;;;yBAEjB,CAAA,IAAI,KAAK,eAAe,CAAA,EAAxB,wBAAwB;oBACpB,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;oBAGzD,qBAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAA;;oBADpD,KACJ,SAAwD,EADlD,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAEjE,0CAA0C;oBAC1C,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GACZ,IAAI,EACP,EAAA;;oBARF,0CAA0C;oBAC1C,SAOE,CAAC;;wBAGD,qBAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,EAAA;;oBAD1C,KACJ,SAA8C,EADxC,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAEjE,0CAA0C;oBAC1C,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GACZ,IAAI,EACP,EAAA;;oBARF,0CAA0C;oBAC1C,SAOE,CAAC;;;;;;CAEN;AAhCD,sDAgCC"}
+{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;AACA,oDAAoD;AACpD,+DAA4D;AAC5D,6DAA0D;AAC1D,gHAA6G;AAC7G,0EAAuE;AAEhE,KAAK,UAAU,4BAA4B,CAChD,MAAc,EACd,YAAe;IAEf,MAAM,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;IAC3D,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,GACjE,MAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAE3D,MAAM,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QAC3C,OAAO;QACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;KAC3B,CAAC,CACH,CAAC;IAEF,OAAO;QACL,KAAK;QACL,MAAM;QACN,SAAS;QACT,QAAQ;QACR,GAAG,YAAY;QACf,wIAAwI;QACxI,GAAG,mBAAmB;KACvB,CAAC;AACJ,CAAC;AAxBD,oEAwBC;AAEM,KAAK,UAAU,4BAA4B,CAChD,MAAc,EACd,YAAe;IAEf,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,GACjE,MAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAEjD,MAAM,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QAC3C,OAAO;QACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;KAC3B,CAAC,CACH,CAAC;IAEF,OAAO;QACL,KAAK;QACL,MAAM;QACN,SAAS;QACT,QAAQ;QACR,GAAG,YAAY;QACf,wIAAwI;QACxI,GAAG,mBAAmB;KACvB,CAAC;AACJ,CAAC;AAvBD,oEAuBC;AAEM,KAAK,UAAU,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;IAErB,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,MAAM,4BAA4B,CACxD,MAAM,EACN,YAAY,CACb,CAAC;QACF,OAAO,IAAA,0BAAa,EAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,eAAe,GAAG,MAAM,4BAA4B,CACxD,MAAM,EACN,YAAY,CACb,CAAC;IACF,OAAO,IAAA,0BAAa,EAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;AAC1D,CAAC;AAjBD,sDAiBC"}

package/dist/pipeline/src/pipeline/getPipelineStages.d.ts

@@ -1,8 +1,7 @@
 import type { Config } from "../types/config";
 /**
- *
-  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
+ * 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
  */
 export declare function getPipelineStages(config: Config): string[];

package/dist/pipeline/src/pipeline/getPipelineStages.js

@@ -1,44 +1,20 @@
 "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));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPipelineStages = void 0;
-var config_1 = require("../config");
-var jobs_1 = require("../types/jobs");
+const config_1 = require("../config");
+const jobs_1 = require("../types/jobs");
 /**
- *
-  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
+ * 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); }, []);
+    const allEnvs = (0, config_1.getAllEnvsInAllComponents)(config).filter((e) => e !== "local");
+    const stages = jobs_1.BASE_STAGES.reduce((acc, baseStage) => [
+        ...acc,
+        baseStage,
+        ...allEnvs.map((e) => `${baseStage} ${e}`),
+    ], []);
     return stages;
 }
 exports.getPipelineStages = getPipelineStages;

package/dist/pipeline/src/pipeline/getPipelineStages.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPipelineStages.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/getPipelineStages.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAsD;AAEtD,sCAA4C;AAE5C;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,IAAM,OAAO,GAAG,IAAA,kCAAyB,EAAC,MAAM,CAAC,CAAC;IAClD,IAAM,MAAM,GAAG,kBAAW,CAAC,MAAM,CAC/B,UAAC,GAAG,EAAE,SAAS,IAAK,4DACf,GAAG;QACN,SAAS;sBACN,OAAO,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,UAAG,SAAS,cAAI,CAAC,CAAE,EAAnB,CAAmB,CAAC,WAHxB,CAInB,EACD,EAAE,CACH,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAXD,8CAWC"}
+{"version":3,"file":"getPipelineStages.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/getPipelineStages.ts"],"names":[],"mappings":";;;AAAA,sCAAsD;AAEtD,wCAA4C;AAE5C;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,MAAM,OAAO,GAAG,IAAA,kCAAyB,EAAC,MAAM,CAAC,CAAC,MAAM,CACtD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CACrB,CAAC;IACF,MAAM,MAAM,GAAG,kBAAW,CAAC,MAAM,CAC/B,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC;QAClB,GAAG,GAAG;QACN,SAAS;QACT,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,IAAI,CAAC,EAAE,CAAC;KAC3C,EACD,EAAE,CACH,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,8CAaC"}

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

@@ -1,11 +1,11 @@
-import type { CatladderJobWithContext, GitlabJobDef, GitlabRule } from "../../types";
+import type { Context, 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: Context;
 }[];
 export declare const GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
-export declare const makeGitlabJob: (componentName: string, env: string, { environment, envMode, needsStages, needsOtherComponent, name, needs, jobTags, script, context, variables, runnerVariables, when, ...job }: CatladderJobWithContext<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
+export declare const makeGitlabJob: (context: Context, job: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
 export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;