@catladder/pipeline 1.55.0 → 1.56.0

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-55-0-40141b86" || "";
+exports.PIPELINE_IMAGE_TAG = "v1-56-0-4063dbc1" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

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,26 @@
+"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);
+  }
+
+  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;

package/dist/context/getEnvType.js

@@ -0,0 +1,18 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getEnvType = void 0;
+
+var types_1 = require("../types");
+
+var getEnvType = function (env, envConfig) {
+  if (envConfig.type) return envConfig.type;
+
+  if ((0, types_1.isKnowEnvType)(env)) {
+    return env;
+  }
+
+  throw new Error("unknown env type: " + env);
+};
+
+exports.getEnvType = getEnvType;

package/dist/context/getEnvironment.d.ts

@@ -1,5 +1,3 @@
 import type { Config } from "../types/config";
-import type { CommitInfo, Context, Environment } from "../types/context";
-export declare const getEnvironment: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, alreadyVisited?: Record<string, Record<string, boolean>>) => Promise<Environment>;
-export declare const getSecretVarName: (env: string, componentName: string, key: string) => string;
-export declare const getSecretVarNameForContext: (context: Context, key: string) => string;
+import type { CommitInfo, Environment } from "../types/context";
+export declare const getEnvironment: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined) => Promise<Environment>;

package/dist/context/getEnvironment.js

@@ -1,19 +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) {
@@ -155,153 +141,28 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 
-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.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironment = void 0;
-
-var lodash_1 = require("lodash");
-
-var deploy_1 = require("../deploy");
-
-var config_1 = require("../types/config");
+exports.getEnvironment = void 0;
 
-var utils_1 = require("../utils");
+var getEnvironmentContext_1 = require("./getEnvironmentContext");
 
-var resolveReferences_1 = require("./resolveReferences");
-
-var getEnvironment = function (config, componentName, env, commitInfo, alreadyVisited // to prevent endless loop
-) {
-  if (alreadyVisited === void 0) {
-    alreadyVisited = {};
-  }
+var getEnvironmentVariables_1 = require("./getEnvironmentVariables");
 
+var getEnvironment = function (config, componentName, env, commitInfo) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var envConfig, envType, basePredefinedVariables, gitlabEnvironmentName, environmentSlug, predefinedVariables, host, url, fullName, envVarContext, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegasyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
-
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, envVars, secretEnvVarKeys, host, url, envContext, envType;
 
-    return __generator(this, function (_l) {
-      switch (_l.label) {
+    return __generator(this, function (_b) {
+      switch (_b.label) {
         case 0:
-          envConfig = getEnvConfig(config, componentName, env);
-          envType = (_a = envConfig === null || envConfig === void 0 ? void 0 : envConfig.type) !== null && _a !== void 0 ? _a : (0, config_1.isKnowEnvType)(env) ? env : null;
-
-          if (!envType) {
-            throw new Error("Missing type in environment " + env + " in component " + componentName);
-          }
-
-          basePredefinedVariables = {
-            ENV_SHORT: env,
-            APP_DIR: envConfig.dir,
-            ENV_TYPE: envType
-          };
-          gitlabEnvironmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
-          environmentSlug = envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
-          fullName = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
-          envVarContext = {
-            deployConfig: envConfig.deploy,
-            fullName: fullName,
-            envType: envType,
-            commitInfo: commitInfo,
-            componentName: componentName,
-            env: env,
-            fullConfig: config
-          };
-
-          if (envType === "local") {
-            devLocalConfig = envConfig;
-            port = (_b = devLocalConfig.port) !== null && _b !== void 0 ? _b : 3000;
-            host = "localhost:" + port;
-            url = "http://" + host;
-            predefinedVariables = {
-              ENV_SHORT: "local",
-              ROOT_URL: url,
-              PORT: port.toString()
-            };
-          } else {
-            additionalEnvVars = envConfig.deploy ? deploy_1.DEPLOY_TYPES[envConfig.deploy.type].getAdditionalEnvVars(envVarContext) : {};
-            host = (_d = (_c = envConfig === null || envConfig === void 0 ? void 0 : envConfig.host) !== null && _c !== void 0 ? _c : additionalEnvVars.HOST_CANONICAL) !== null && _d !== void 0 ? _d : "unknown-host.example.com";
-            url = "https://".concat(host);
-            predefinedVariables = __assign(__assign(__assign({}, basePredefinedVariables), {
-              HOST: host,
-              ROOT_URL: url
-            }), additionalEnvVars);
-          }
-
-          publicEnvVarsRaw = (_f = (_e = envConfig.vars) === null || _e === void 0 ? void 0 : _e.public) !== null && _f !== void 0 ? _f : {};
-          additionalSecretKeys = envConfig.deploy ? deploy_1.DEPLOY_TYPES[envConfig.deploy.type].additionalSecretKeys(envVarContext) : [];
-          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_h = (_g = envConfig.vars) === null || _g === void 0 ? void 0 : _g.secret) !== null && _h !== void 0 ? _h : []), false), __read(additionalSecretKeys), false);
-          secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
-            return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
-          }));
-          legacyFromComponents = (_k = (_j = envConfig.vars) === null || _j === void 0 ? void 0 : _j.fromComponents) !== null && _k !== void 0 ? _k : {};
-          publicEnvVarsRawWithLegasyFromComponents = (0, lodash_1.merge)({}, (0, resolveReferences_1.translateLegacyFromComponents)(legacyFromComponents), publicEnvVarsRaw);
-          publicEnvVarsRawSanitized = Object.fromEntries(Object.entries(publicEnvVarsRawWithLegasyFromComponents).map(function (_a) {
-            var _b = __read(_a, 2),
-                key = _b[0],
-                value = _b[1];
-
-            return [key, (0, lodash_1.isObject)(value) ? JSON.stringify(value) : "".concat(value)];
-          }));
-          envVarsRaw = addIndexVar(__assign(__assign(__assign({}, predefinedVariables), secretEnvVars), publicEnvVarsRawSanitized));
           return [4
           /*yield*/
-          , (0, resolveReferences_1.resolveReferences)(envVarsRaw, function (componentName, variableName, alreadyVisited) {
-            return __awaiter(void 0, void 0, void 0, function () {
-              var envVars;
-              return __generator(this, function (_a) {
-                switch (_a.label) {
-                  case 0:
-                    return [4
-                    /*yield*/
-                    , (0, exports.getEnvironment)(config, componentName, env, commitInfo, alreadyVisited)];
-
-                  case 1:
-                    envVars = _a.sent().envVars;
-                    return [2
-                    /*return*/
-                    , envVars[variableName]];
-                }
-              });
-            });
-          }, alreadyVisited)];
+          , (0, getEnvironmentVariables_1.getEnvironmentVariables)(config, componentName, env, commitInfo)];
 
         case 1:
-          envVars = _l.sent();
+          _a = _b.sent(), envVars = _a.envVars, secretEnvVarKeys = _a.secretEnvVarKeys, host = _a.host, url = _a.url;
+          envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          envType = envContext.envType;
           return [2
           /*return*/
           , {
@@ -309,11 +170,11 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
             host: host,
             url: url,
             gitlabEnvironment: {
-              name: gitlabEnvironmentName,
+              name: envContext.gitlabEnvironmentName,
               url: url
             },
-            fullName: fullName,
-            slug: environmentSlug,
+            fullName: envContext.fullName,
+            slug: envContext.environmentSlug,
             shortName: env,
             envVars: envVars,
             secretEnvVarKeys: secretEnvVarKeys
@@ -323,45 +184,4 @@ var getEnvironment = function (config, componentName, env, commitInfo, alreadyVi
   });
 };
 
-exports.getEnvironment = getEnvironment;
-
-var sanitizeForEnVar = function (s) {
-  return s.replace(/-/g, "_");
-};
-
-var getSecretVarName = function (env, componentName, key) {
-  return "CL_".concat(sanitizeForEnVar(env), "_").concat(sanitizeForEnVar(componentName), "_").concat(key);
-}; // remove dash from component name
-
-
-exports.getSecretVarName = getSecretVarName;
-
-var addIndexVar = function (vars) {
-  return __assign(__assign({}, vars), {
-    _ALL_ENV_VAR_KEYS: JSON.stringify(Object.keys(vars))
-  });
-};
-
-var getSecretVarNameForContext = function (context, key) {
-  return (0, exports.getSecretVarName)(context.environment.shortName, context.componentName, key);
-};
-
-exports.getSecretVarNameForContext = getSecretVarNameForContext;
-
-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);
-  }
-
-  return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
-};
+exports.getEnvironment = getEnvironment;

package/dist/context/getEnvironmentContext.d.ts

@@ -0,0 +1,4 @@
+import type { Config } from "../types/config";
+import type { CommitInfo } from "../types/context";
+import type { EnvironmentContext } from "../types/environmentContext";
+export declare const getEnvironmentContext: (config: Config, env: string, componentName: string, commitInfo?: CommitInfo | undefined) => EnvironmentContext<any, any>;

package/dist/context/getEnvironmentContext.js

@@ -0,0 +1,36 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getEnvironmentContext = void 0;
+
+var getEnvConfig_1 = require("./getEnvConfig");
+
+var getEnvType_1 = require("./getEnvType");
+
+var getEnvironmentSlug = function (envConfig, env, componentName, commitInfo) {
+  var envType = (0, getEnvType_1.getEnvType)(env, envConfig);
+  return envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
+};
+
+var getEnvironmentContext = function (config, env, componentName, commitInfo) {
+  var envConfigRaw = (0, getEnvConfig_1.getEnvConfig)(config, componentName, env);
+  var envType = (0, getEnvType_1.getEnvType)(env, envConfigRaw);
+  var environmentSlug = getEnvironmentSlug(envConfigRaw, env, componentName, commitInfo);
+  var gitlabEnvironmentName = envType === "review" && commitInfo ? "".concat(env, "/").concat(commitInfo.refName, "/").concat(componentName) : "".concat(env, "/").concat(componentName);
+  var fullName = "".concat(config.customerName, "-").concat(config.appName, "-").concat(environmentSlug);
+  return {
+    envConfigRaw: envConfigRaw,
+    deployConfigRaw: envConfigRaw.deploy,
+    buildConfigRaw: envConfigRaw.build,
+    environmentSlug: environmentSlug,
+    gitlabEnvironmentName: gitlabEnvironmentName,
+    fullName: fullName,
+    envType: envType,
+    commitInfo: commitInfo,
+    componentName: componentName,
+    env: env,
+    fullConfig: config
+  };
+};
+
+exports.getEnvironmentContext = getEnvironmentContext;

package/dist/context/getEnvironmentVariables.d.ts

@@ -0,0 +1,10 @@
+import type { CommitInfo, Context } from "../types";
+import type { Config } from "../types/config";
+export declare const getEnvironmentVariables: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, alreadyVisited?: Record<string, Record<string, boolean>>) => Promise<{
+  envVars: Record<string, string>;
+  secretEnvVarKeys: string[];
+  host: string;
+  url: string;
+}>;
+export declare const getSecretVarName: (env: string, componentName: string, key: string) => string;
+export declare const getSecretVarNameForContext: (context: Context, key: string) => string;