@catladder/pipeline 0.0.0-node16-ddfae617 → 0.0.0-prettier-cbceeed9

package/dist/catladder-gitlab.js

@@ -4,66 +4,47 @@ 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;
 };
-
 var _a;
-
 exports.__esModule = true;
-
 var fs_1 = require("fs");
-
 var js_yaml_1 = require("js-yaml");
-
 var config_1 = require("./config");
-
 var constants_1 = require("./constants");
-
 var pipeline_1 = require("./pipeline");
-
 var _b = process.env,
-    CI_MERGE_REQUEST_ID = _b.CI_MERGE_REQUEST_ID,
-    CI_COMMIT_TAG = _b.CI_COMMIT_TAG,
-    CI_COMMIT_BRANCH = _b.CI_COMMIT_BRANCH,
-    CI_DEFAULT_BRANCH = _b.CI_DEFAULT_BRANCH;
+  CI_MERGE_REQUEST_ID = _b.CI_MERGE_REQUEST_ID,
+  CI_COMMIT_TAG = _b.CI_COMMIT_TAG,
+  CI_COMMIT_BRANCH = _b.CI_COMMIT_BRANCH,
+  CI_DEFAULT_BRANCH = _b.CI_DEFAULT_BRANCH;
 var isDefaultBranch = Boolean(CI_DEFAULT_BRANCH) && CI_COMMIT_BRANCH === CI_DEFAULT_BRANCH;
-var isHotfixBranch = false; // TODO:  $CI_COMMIT_BRANCH =~ /^[0-9]+\.([0-9]+|x)\.x$/
-
+var isHotfixBranch = CI_COMMIT_BRANCH ? /^[0-9]+\.([0-9]+|x)\.x$/.test(CI_COMMIT_BRANCH) : false;
 var isMergeRequest = Boolean(CI_MERGE_REQUEST_ID);
 var isTaggedRelease = Boolean(CI_COMMIT_TAG);
 console.info("catladder version ".concat(constants_1.PIPELINE_IMAGE_TAG));
 var trigger = isMergeRequest || isHotfixBranch ? "mr" : isDefaultBranch ? "mainBranch" : isTaggedRelease ? "taggedRelease" : null;
-
 if (trigger) {
   var config = (_a = (0, config_1.readConfigSync)()) === null || _a === void 0 ? void 0 : _a.config;
-
   if (!config) {
     throw new Error("no catladder config found");
   }
-
   (0, pipeline_1.createChildPipeline)("gitlab", trigger, config).then(function (_a) {
     var jobs = _a.jobs,
-        mainPipeline = __rest(_a, ["jobs"]); // need to spread out the jobs
-
-
+      mainPipeline = __rest(_a, ["jobs"]);
+    // need to spread out the jobs
     (0, fs_1.writeFileSync)("__pipeline.yml", (0, js_yaml_1.dump)(__assign(__assign({}, jobs), mainPipeline)), {
       encoding: "utf-8"
     });

package/dist/config/{configruedEnvs.test.js → __tests__/configruedEnvs.test.js}

@@ -1,9 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-
-var _1 = require(".");
-
+var __1 = require("..");
 describe("getAllEnvsByTrigger", function () {
   var cluster = {
     type: "gcloud",
@@ -69,43 +67,43 @@ describe("getAllEnvsByTrigger", function () {
   };
   describe("mainBranch", function () {
     it("always includes dev if not disabled", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app1", "mainBranch");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app1", "mainBranch");
       expect(envs).toEqual(["dev"]);
     });
     it("returns additional dev environments", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app2", "mainBranch");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app2", "mainBranch");
       expect(envs).toEqual(["dev", "dev2"]);
     });
     it("does not include disabled envs", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app3", "mainBranch");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app3", "mainBranch");
       expect(envs).toEqual([]);
     });
   });
   describe("mr", function () {
     it("always includes review if not disabled", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app1", "mr");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app1", "mr");
       expect(envs).toEqual(["review"]);
     });
     it("returns additional dev environments", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app2", "mr");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app2", "mr");
       expect(envs).toEqual(["review", "review2"]);
     });
     it("does not include disabled envs", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app3", "mr");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app3", "mr");
       expect(envs).toEqual([]);
     });
   });
   describe("taggedRelease", function () {
     it("always includes review if not disabled", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app1", "taggedRelease");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app1", "taggedRelease");
       expect(envs).toEqual(["stage", "prod"]);
     });
     it("returns additional dev environments", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app2", "taggedRelease");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app2", "taggedRelease");
       expect(envs).toEqual(["stage", "prod", "stage2", "prod2"]);
     });
     it("does not include disabled envs", function () {
-      var envs = (0, _1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app3", "taggedRelease");
+      var envs = (0, __1.getAllEnvsByTrigger)(SIMPLE_CONFIG, "app3", "taggedRelease");
       expect(envs).toEqual([]);
     });
   });

package/dist/config/configruedEnvs.d.ts

@@ -1,4 +1,4 @@
-import { Config, PipelineTrigger } from "../types";
+import type { Config, PipelineTrigger } from "../types";
 export declare const getAllEnvs: (config: Config, componentName: string) => string[];
 export declare const getAllEnvsInAllComponents: (config: Config) => string[];
 export declare const getAllEnvsByTrigger: (config: Config, componentName: string, trigger: PipelineTrigger) => string[];

package/dist/config/configruedEnvs.js

@@ -4,10 +4,9 @@ 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) {
@@ -21,10 +20,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)) {
@@ -34,53 +31,41 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-
 exports.__esModule = true;
 exports.getAllEnvsByTrigger = exports.getAllEnvsInAllComponents = exports.getAllEnvs = void 0;
-
 var types_1 = require("../types");
-
 var getConfiguredAndDefaultEnvs = function (config, componentName, envTypes) {
   var _a, _b;
-
-  var configuredEnvs = (_a = config.components[componentName].env) !== null && _a !== void 0 ? _a : {}; // the default envs have the same name as the env types
+  var configuredEnvs = (_a = config.components[componentName].env) !== null && _a !== void 0 ? _a : {};
+  // the default envs have the same name as the env types
   // these can be disabled with settimg them to `false`
   // this is the list of all not disabled envs. These are always returned
-
   var enabledDefaultEnvs = envTypes.filter(function (e) {
     return configuredEnvs[e] !== false;
   });
   var configuredCustomEnvs = Object.entries((_b = config.components[componentName].env) !== null && _b !== void 0 ? _b : {}).filter(function (_a) {
     var _b = __read(_a, 2),
-        config = _b[1];
-
+      config = _b[1];
     return config && "type" in config && config.type && envTypes.includes(config.type);
   }).map(function (_a) {
     var _b = __read(_a, 1),
-        envName = _b[0];
-
+      envName = _b[0];
     return envName;
   });
   return __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(enabledDefaultEnvs), false), __read(configuredCustomEnvs), false))), false);
 };
-
 var getAllEnvs = function (config, componentName) {
   return getConfiguredAndDefaultEnvs(config, componentName, types_1.DEFAULT_ENV_TYPES);
 };
-
 exports.getAllEnvs = getAllEnvs;
-
 var getAllEnvsInAllComponents = function (config) {
   return __spreadArray([], __read(new Set(Object.keys(config.components).flatMap(function (c) {
     return (0, exports.getAllEnvs)(config, c);
   }))), false);
 };
-
 exports.getAllEnvsInAllComponents = getAllEnvsInAllComponents;
-
 var getAllEnvsByTrigger = function (config, componentName, trigger) {
   var envTypesByTrigger = (0, types_1.getEnvTypesByTrigger)(trigger);
   return getConfiguredAndDefaultEnvs(config, componentName, envTypesByTrigger);
 };
-
 exports.getAllEnvsByTrigger = getAllEnvsByTrigger;

package/dist/config/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("./configruedEnvs"), exports);
-
 __exportStar(require("./readConfig"), exports);

package/dist/config/readConfig.d.ts

@@ -1,4 +1,4 @@
-import { Config } from "../types";
+import type { Config } from "../types";
 export declare const readConfigSync: (directory?: string) => {
   config: Config;
   path: string;

package/dist/config/readConfig.js

@@ -2,28 +2,21 @@
 
 exports.__esModule = true;
 exports.readConfigSync = void 0;
-
 var fs_1 = require("fs");
-
 var ts_node_1 = require("ts-node");
-
-var js_yaml_1 = require("js-yaml"); // allows us to load ts files
-
-
+var js_yaml_1 = require("js-yaml");
+// allows us to load ts files
 var fullPath = function (directory, ext) {
   return directory + "/catladder." + ext;
 };
-
 function requireUncached(module) {
   delete require.cache[require.resolve(module)];
   return require(module);
 }
-
 var readConfigSync = function (directory) {
   if (directory === void 0) {
     directory = process.cwd();
   }
-
   (0, ts_node_1.register)({
     cwd: directory,
     transpileOnly: true,
@@ -34,10 +27,8 @@ var readConfigSync = function (directory) {
   var found = ["ts", "js", "yml", "yaml"].find(function (extension) {
     return (0, fs_1.existsSync)(fullPath(directory, extension));
   });
-
   if (found) {
     var filePath = fullPath(directory, found);
-
     if (found === "ts" || found === "js") {
       return {
         path: filePath,
@@ -55,8 +46,6 @@ var readConfigSync = function (directory) {
       };
     }
   }
-
   return null;
 };
-
 exports.readConfigSync = readConfigSync;

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "node16-ddfae617" || "";
+exports.PIPELINE_IMAGE_TAG = "prettier-cbceeed9" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/__tests__/resolveReferences.test.js

@@ -0,0 +1,336 @@
+"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;
+var resolveReferences_1 = require("../resolveReferences");
+describe("resolveReferences", function () {
+  it("replaces occurences of ${componentName:VARIABLE_NAME}", function () {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var variables, otherVariables, result;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            variables = {
+              a: "hello world",
+              b: "a replaced value looks like this: '${api:FOO}', nice!"
+            };
+            otherVariables = {
+              api: {
+                FOO: "foo from api"
+              },
+              frontend: {
+                FOO: "foo from frontend"
+              }
+            };
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
+                });
+              });
+            })];
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              a: "hello world",
+              b: "a replaced value looks like this: 'foo from api', nice!"
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  });
+
+  it("replaces self references with structure ${VARIABLE_NAME}", function () {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var variables, result;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            variables = {
+              FOO: "hello world",
+              BAR: "this: ${FOO}!"
+            };
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables)];
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              FOO: "hello world",
+              BAR: "this: hello world!"
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  });
+
+  it("replaces self references mixed with other vars", function () {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var variables, otherVariables, result;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            variables = {
+              FOO: "hello from ${api:FOO}",
+              BAR: "this: ${FOO}!"
+            };
+            otherVariables = {
+              api: {
+                FOO: "foo from api"
+              }
+            };
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
+                });
+              });
+            })];
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              FOO: "hello from foo from api",
+              BAR: "this: hello from foo from api!"
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  });
+
+  it("keeps variables as is if not found (when null is returned)", function () {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var variables, otherVariables, result;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            variables = {
+              a: "hello world",
+              b: "a not found value looks like this: '${api:FOO}'"
+            };
+            otherVariables = {};
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
+                });
+              });
+            })];
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              a: "hello world",
+              b: "a not found value looks like this: '${api:FOO}'"
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  });
+
+  it("replaces mulitple levels deep", function () {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var variables, otherVariables, result;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            variables = {
+              a: "value is ${frontend:FOO}!"
+            };
+            otherVariables = {
+              api: {
+                FOO: "foo from api"
+              },
+              frontend: {
+                FOO: "hi, ${api:FOO}"
+              }
+            };
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
+                });
+              });
+            })];
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              a: "value is hi, foo from api!"
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  });
+
+  it("prevents endless loops", function () {
+    return __awaiter(void 0, void 0, void 0, function () {
+      var variables, otherVariables, result;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            variables = {
+              a: "value is ${frontend:FOO}!"
+            };
+            otherVariables = {
+              api: {
+                FOO: "api ${frontend:FOO}"
+              },
+              frontend: {
+                FOO: "frontend ${api:FOO}"
+              }
+            };
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
+                });
+              });
+            })];
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              a: "value is frontend api ${frontend:FOO}!"
+            });
+            return [2 /*return*/];
+        }
+      });
+    });
+  });
+});
+
+describe("translateLegacyFromComponents", function () {
+  it("translatetes the old `fromComponents` approach to ${componentName:variableName}", function () {
+    var fromComponents = {
+      api: {
+        API_FOO: "FOO",
+        API_BAR: "BAR"
+      },
+      www: {
+        WWW_X: "X",
+        WWW_Y: "Y"
+      }
+    };
+    var result = (0, resolveReferences_1.translateLegacyFromComponents)(fromComponents);
+    expect(result).toEqual({
+      API_FOO: "${api:FOO}",
+      API_BAR: "${api:BAR}",
+      WWW_X: "${www:X}",
+      WWW_Y: "${www:Y}"
+    });
+  });
+});

package/dist/context/getEnvConfig.d.ts

@@ -0,0 +1,2 @@
+import type { Config, EnvConfigWithComponent } from "../types/config";
+export declare const getEnvConfig: (config: Config, componentName: string, env: string) => EnvConfigWithComponent;

package/dist/context/getEnvConfig.js

@@ -0,0 +1,18 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getEnvConfig = void 0;
+var utils_1 = require("../utils");
+var getEnvConfig = function (config, componentName, env) {
+  var _a, _b;
+  var defaultConfig = config.components[componentName];
+  if (!defaultConfig) {
+    throw new Error("unknown component " + componentName);
+  }
+  var envCustomizations = (_b = (_a = defaultConfig.env) === null || _a === void 0 ? void 0 : _a[env]) !== null && _b !== void 0 ? _b : {};
+  if (envCustomizations === false) {
+    throw new Error("env is disabled: " + env + ":" + componentName);
+  }
+  return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+};
+exports.getEnvConfig = getEnvConfig;

package/dist/context/getEnvType.d.ts

@@ -0,0 +1,4 @@
+import type { EnvType } from "../types";
+export declare const getEnvType: (env: string, envConfig: {
+  type?: EnvType;
+}) => EnvType;