@catladder/pipeline 0.0.0-refactore-catenv-command-validates-argument-78d05852 → 0.0.0-reference-database-url-1befbbee

package/dist/context/getEnvironmentContext.js

@@ -1,30 +1,40 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getEnvironmentContext = void 0;
+var BashExpression_1 = require("../bash/BashExpression");
 var getEnvConfig_1 = require("./getEnvConfig");
 var getEnvType_1 = require("./getEnvType");
-var getEnvironmentSlugPrefix = function (envConfig, env, commitInfo) {
-  var envType = (0, getEnvType_1.getEnvType)(env, envConfig);
-  return envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug) : "".concat(env);
+var getReviewSlug_1 = require("./getReviewSlug");
+var getEnvironmentSlugPrefix = function (env, reviewSlug) {
+  if (reviewSlug) {
+    return (0, BashExpression_1.joinBashExpressions)([env, reviewSlug], "-");
+  }
+  return env;
 };
-var getEnvironmentContext = function (config, env, componentName, commitInfo) {
+var getEnvironmentContext = function (_a) {
+  var env = _a.env,
+    componentName = _a.componentName,
+    config = _a.config,
+    pipelineType = _a.pipelineType;
   var envConfigRaw = (0, getEnvConfig_1.getEnvConfig)(config, componentName, env);
   var envType = (0, getEnvType_1.getEnvType)(env, envConfigRaw);
-  var environmentSlugPrefix = getEnvironmentSlugPrefix(envConfigRaw, env, commitInfo);
-  var environmentSlug = "".concat(environmentSlugPrefix, "-").concat(componentName);
-  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);
+  var reviewSlug = (0, getReviewSlug_1.getReviewSlug)(envConfigRaw, env, pipelineType);
+  var environmentSlugPrefix = getEnvironmentSlugPrefix(env, reviewSlug);
+  var environmentSlug = environmentSlugPrefix.concat("-".concat(componentName));
+  var fullName = (0, BashExpression_1.joinBashExpressions)([config.customerName, config.appName, environmentSlug], "-");
   return {
     envConfigRaw: envConfigRaw,
     deployConfigRaw: envConfigRaw.deploy,
     buildConfigRaw: envConfigRaw.build,
     environmentSlugPrefix: environmentSlugPrefix,
     environmentSlug: environmentSlug,
-    gitlabEnvironmentName: gitlabEnvironmentName,
+    reviewSlug: reviewSlug,
+    pipelineType: pipelineType,
     fullName: fullName,
     envType: envType,
-    commitInfo: commitInfo,
     componentName: componentName,
     env: env,
     fullConfig: config

package/dist/context/getEnvironmentVariables.d.ts

@@ -1,9 +1,26 @@
-import type { CommitInfo, Context, EnvironmentEnvVarPart as EnvironmentVariables } from "../types";
-import type { Config } from "../types/config";
-export declare type SecretEnvVar = {
+import type { ComponentContext, EnvironmentEnvVarPart as EnvironmentVariables } from "../types";
+import type { CreateComponentContextContext } from "..";
+import type { StringOrBashExpression } from "../bash/BashExpression";
+import type { EnvironmentContext } from "../types/environmentContext";
+export type SecretEnvVar = {
   key: string;
   hidden?: boolean;
 };
-export declare const getEnvironmentVariables: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, alreadyVisited?: Record<string, Record<string, boolean>>) => Promise<EnvironmentVariables>;
+declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
+  ENV_SHORT: string;
+  APP_DIR: string;
+  ENV_TYPE: "dev" | "review" | "stage" | "prod" | "local";
+};
+type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
+export type PredefinedVariables = BasePredefinedVariables & {
+  HOSTNAME: StringOrBashExpression;
+  ROOT_URL: StringOrBashExpression;
+  HOSTNAME_INTERNAL: StringOrBashExpression;
+  ROOT_URL_INTERNAL: StringOrBashExpression;
+};
+export declare const getEnvironmentVariables: (ctx: CreateComponentContextContext, options?: {
+  shouldResolveReferences?: boolean;
+}) => Promise<EnvironmentVariables>;
 export declare const getSecretVarName: (env: string, componentName: string, key: string) => string;
-export declare const getSecretVarNameForContext: (context: Context, key: string) => string;
+export declare const getSecretVarNameForContext: (context: ComponentContext, key: string) => string;
+export {};

package/dist/context/getEnvironmentVariables.js

@@ -65,7 +65,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
+    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]) {
@@ -156,96 +156,122 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getSecretVarNameForContext = exports.getSecretVarName = exports.getEnvironmentVariables = void 0;
-var lodash_1 = require("lodash");
 var deploy_1 = require("../deploy");
+var BashExpression_1 = require("../bash/BashExpression");
+var types_1 = require("../build/types");
+var VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
+var resolveAllReferences_1 = require("../variables/resolveAllReferences");
+var getBuildInfoVariables_1 = require("./getBuildInfoVariables");
 var getEnvironmentContext_1 = require("./getEnvironmentContext");
-var resolveReferences_1 = require("./resolveReferences");
-var envVars_1 = require("./utils/envVars");
 var transformJobOnlyVars_1 = require("./transformJobOnlyVars");
-var getEnvironmentVariables = function (config, componentName, env, commitInfo, alreadyVisited // to prevent endless loop
-) {
-  if (alreadyVisited === void 0) {
-    alreadyVisited = {};
+var envVars_1 = require("./utils/envVars");
+var getBasePredefinedVariables = function (ctx) {
+  return __assign({
+    ENV_SHORT: ctx.env,
+    APP_DIR: ctx.envConfigRaw.dir,
+    ENV_TYPE: ctx.envType
+  }, ctx.envType !== "local" ? (0, getBuildInfoVariables_1.getBuildInfoVariables)(ctx) : {});
+};
+var getEnvironmentVariables = function (ctx_1) {
+  var args_1 = [];
+  for (var _i = 1; _i < arguments.length; _i++) {
+    args_1[_i - 1] = arguments[_i];
   }
-  return __awaiter(void 0, void 0, void 0, function () {
-    var environmentContext, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, HOST_INTERNAL, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegacyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
-    var _a, _b;
-    var _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  return __awaiter(void 0, __spreadArray([ctx_1], __read(args_1), false), void 0, function (ctx, options) {
+    var environmentContext, config, env, componentName, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, HOSTNAME_INTERNAL, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, publicEnvVarsRawSanitized, publicEnvVarsUnresolved, publicEnvVars, _a, envVars;
+    var _b, _c;
+    var _d, _e, _f, _g, _h, _j, _k, _l;
+    if (options === void 0) {
+      options = {};
+    }
     return __generator(this, function (_m) {
       switch (_m.label) {
         case 0:
-          environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
+          environmentContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
+          config = ctx.config, env = ctx.env, componentName = ctx.componentName;
           envConfigRaw = environmentContext.envConfigRaw, deployConfigRaw = environmentContext.deployConfigRaw, buildConfigRaw = environmentContext.buildConfigRaw, envType = environmentContext.envType;
-          basePredefinedVariables = {
-            ENV_SHORT: env,
-            APP_DIR: envConfigRaw.dir,
-            ENV_TYPE: envType,
-            BUILD_INFO_ID: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.buildId,
-            BUILD_INFO_BUILD_TIME: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.buildTime,
-            BUILD_INFO_CURRENT_VERSION: commitInfo === null || commitInfo === void 0 ? void 0 : commitInfo.currentVersion
-          };
+          basePredefinedVariables = getBasePredefinedVariables(environmentContext);
           if (envType === "local") {
             devLocalConfig = envConfigRaw;
-            port = (_c = devLocalConfig.port) !== null && _c !== void 0 ? _c : 3000;
-            host = "localhost:" + port;
+            port = (_d = devLocalConfig.port) !== null && _d !== void 0 ? _d : 3000;
+            host = "localhost:" + port.toString();
             url = "http://" + host;
-            predefinedVariables = {
+            predefinedVariables = __assign(__assign({}, basePredefinedVariables), {
               ENV_SHORT: "local",
               ROOT_URL: url,
-              HOST_INTERNAL: host,
+              HOSTNAME: host,
+              HOSTNAME_INTERNAL: host,
               ROOT_URL_INTERNAL: "http://" + host,
               PORT: port.toString()
-            };
+            });
           } else {
             additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
-            HOST_INTERNAL = (_d = additionalEnvVars.HOST_INTERNAL) !== null && _d !== void 0 ? _d : "unknown-host.example.com";
-            host = (_e = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _e !== void 0 ? _e : HOST_INTERNAL;
-            url = "https://".concat(host);
-            predefinedVariables = __assign(__assign(__assign(__assign({}, basePredefinedVariables), config.components[componentName].build.type === "rails" ? {} : {
-              HOST: host
-            }), {
+            HOSTNAME_INTERNAL = (_e = additionalEnvVars.HOSTNAME_INTERNAL) !== null && _e !== void 0 ? _e : "unknown-host.example.com";
+            host = (_f = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _f !== void 0 ? _f : HOSTNAME_INTERNAL;
+            url = (0, BashExpression_1.joinBashExpressions)(["https://", host]);
+            predefinedVariables = __assign(__assign(__assign({}, basePredefinedVariables), {
+              HOSTNAME: host,
               ROOT_URL: url,
-              HOST_CANONICAL: HOST_INTERNAL,
-              ROOT_URL_INTERNAL: "https://" + HOST_INTERNAL
+              HOSTNAME_INTERNAL: HOSTNAME_INTERNAL,
+              ROOT_URL_INTERNAL: (0, BashExpression_1.joinBashExpressions)(["https://", HOSTNAME_INTERNAL])
             }), additionalEnvVars);
           }
-          publicEnvVarsRaw = (_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.public) !== null && _g !== void 0 ? _g : {};
+          publicEnvVarsRaw = (_h = (_g = envConfigRaw.vars) === null || _g === void 0 ? void 0 : _g.public) !== null && _h !== void 0 ? _h : {};
           additionalSecretKeys = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].additionalSecretKeys(environmentContext) : [];
-          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((0, envVars_1.stringListToSecreteEnvVarList)((_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.secret) !== null && _j !== void 0 ? _j : [])), false), __read(additionalSecretKeys), false);
+          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((0, envVars_1.stringListToSecreteEnvVarList)((_k = (_j = envConfigRaw.vars) === null || _j === void 0 ? void 0 : _j.secret) !== null && _k !== void 0 ? _k : [])), false), __read(additionalSecretKeys), false);
           secretEnvVars = (0, envVars_1.makeSecretEnvVarMapping)(env, componentName, secretEnvVarKeys);
-          legacyFromComponents = (_l = (_k = envConfigRaw.vars) === null || _k === void 0 ? void 0 : _k.fromComponents) !== null && _l !== void 0 ? _l : {};
-          publicEnvVarsRawWithLegacyFromComponents = (0, lodash_1.merge)({}, (0, resolveReferences_1.translateLegacyFromComponents)(legacyFromComponents), publicEnvVarsRaw);
-          publicEnvVarsRawSanitized = (0, envVars_1.stringifyValues)(publicEnvVarsRawWithLegacyFromComponents);
-          envVarsRaw = addIndexVar(__assign(__assign(__assign({}, predefinedVariables), secretEnvVars), publicEnvVarsRawSanitized));
-          return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(envVarsRaw, function (otherComponentName, alreadyVisited) {
+          publicEnvVarsRawSanitized = (0, envVars_1.stringifyValues)(publicEnvVarsRaw);
+          publicEnvVarsUnresolved = Object.fromEntries(Object.entries(publicEnvVarsRawSanitized).map(function (_a) {
+            var _b = __read(_a, 2),
+              key = _b[0],
+              value = _b[1];
+            return [key, (0, VariableValueContainingReferences_1.createVariableValueContainingReferencesFromString)(value, {
+              componentName: ctx.componentName
+            })];
+          }));
+          if (!((_l = options.shouldResolveReferences) !== null && _l !== void 0 ? _l : true)) return [3 /*break*/, 2];
+          return [4 /*yield*/, (0, resolveAllReferences_1.resolveAllReferences)(publicEnvVarsUnresolved, function (otherComponentName) {
             return __awaiter(void 0, void 0, void 0, function () {
               var otherEnvVars;
               return __generator(this, function (_a) {
                 switch (_a.label) {
                   case 0:
-                    return [4 /*yield*/, (0, exports.getEnvironmentVariables)(config, otherComponentName, env, commitInfo, alreadyVisited)];
+                    return [4 /*yield*/, (0, exports.getEnvironmentVariables)(__assign(__assign({}, ctx), {
+                      componentName: otherComponentName
+                    }), {
+                      shouldResolveReferences: false // we already do this here with replaceAllReferences recursivly until re replaced all
+                    })];
                   case 1:
                     otherEnvVars = _a.sent().envVars;
                     return [2 /*return*/, otherEnvVars];
                 }
               });
             });
-          }, alreadyVisited)];
+          })];
         case 1:
-          envVars = _m.sent();
-          _a = {
+          _a = _m.sent();
+          return [3 /*break*/, 3];
+        case 2:
+          _a = publicEnvVarsUnresolved;
+          _m.label = 3;
+        case 3:
+          publicEnvVars = _a;
+          envVars = addIndexVar(__assign(__assign(__assign({}, predefinedVariables), secretEnvVars), publicEnvVars));
+          _b = {
             envVars: envVars,
             secretEnvVarKeys: secretEnvVarKeys
           };
-          _b = {};
-          return [4 /*yield*/, (0, transformJobOnlyVars_1.transformJobOnlyVars)(env, componentName, buildConfigRaw && buildConfigRaw.jobVars || null)];
-        case 2:
-          _b.build = _m.sent();
+          _c = {};
+          return [4 /*yield*/, (0, transformJobOnlyVars_1.transformJobOnlyVars)(env, componentName, buildConfigRaw && (0, types_1.isStandaloneBuildConfig)(buildConfigRaw) && buildConfigRaw.jobVars || null)];
+        case 4:
+          _c.build = _m.sent();
           return [4 /*yield*/, (0, transformJobOnlyVars_1.transformJobOnlyVars)(env, componentName, deployConfigRaw && deployConfigRaw.jobVars || null)];
-        case 3:
-          return [2 /*return*/, (_a.jobOnlyVars = (_b.deploy = _m.sent(), _b), _a.host = host, _a.url = url, _a)];
+        case 5:
+          return [2 /*return*/, (_b.jobOnlyVars = (_c.deploy = _m.sent(), _c), _b)];
       }
     });
   });
@@ -264,6 +290,6 @@ var addIndexVar = function (vars) {
   });
 };
 var getSecretVarNameForContext = function (context, key) {
-  return (0, exports.getSecretVarName)(context.environment.shortName, context.componentName, key);
+  return (0, exports.getSecretVarName)(context.env, context.name, key);
 };
 exports.getSecretVarNameForContext = getSecretVarNameForContext;

package/dist/context/getLabels.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from "../types";
-export declare const getLabels: (context: Context) => {
+import type { ComponentContext } from "../types";
+export declare const getLabels: (context: ComponentContext) => {
   "customer-name": string | undefined;
   "component-name": string | undefined;
   "app-name": string | undefined;

package/dist/context/getLabels.js

@@ -15,25 +15,27 @@ var __importDefault = this && this.__importDefault || function (mod) {
     "default": mod
   };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getLabels = void 0;
 var slugify_1 = __importDefault(require("slugify"));
 var sanitize = function (value) {
   if (!value) return value;
   //"The value can only contain lowercase letters, numeric characters, underscores and dashes. The value can be at most 63 characters long. International characters are allowed."
   // slugify should do the job
-  return (0, slugify_1["default"])(value).toLowerCase();
+  return (0, slugify_1.default)(value).toLowerCase();
 };
 var getLabels = function (context) {
-  var _a, _b, _c;
+  var _a, _b;
   var labels = __assign({
     "customer-name": sanitize(context.fullConfig.customerName),
-    "component-name": sanitize(context.componentName),
+    "component-name": sanitize(context.name),
     "app-name": sanitize(context.fullConfig.appName),
     "env-type": sanitize(context.environment.envType),
-    "env-name": sanitize(context.environment.shortName),
-    "build-type": sanitize((_a = context.componentConfig.build) === null || _a === void 0 ? void 0 : _a.type)
-  }, (_c = (_b = context.fullConfig.meta) === null || _b === void 0 ? void 0 : _b.labels) !== null && _c !== void 0 ? _c : {});
+    "env-name": sanitize(context.env),
+    "build-type": context.build.type === "disabled" ? "disabled" : sanitize(context.build.buildType)
+  }, (_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {});
   return labels;
 };
 exports.getLabels = getLabels;

package/dist/context/getReviewSlug.d.ts

@@ -0,0 +1,4 @@
+import { type StringOrBashExpression } from "../bash/BashExpression";
+import type { PipelineType } from "../types";
+import type { EnvConfigWithComponent } from "../types/config";
+export declare const getReviewSlug: (envConfig: EnvConfigWithComponent, env: string, pipelineType?: PipelineType) => StringOrBashExpression | null;

package/dist/context/getReviewSlug.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getReviewSlug = void 0;
+var BashExpression_1 = require("../bash/BashExpression");
+var bashExpressionPerPipelineType_1 = require("../bash/bashExpressionPerPipelineType");
+var getEnvType_1 = require("./getEnvType");
+var REVIEW_SLUG = {
+  default: "unknown-review-slug",
+  gitlab: new BashExpression_1.BashExpression("$([ -n \"$CI_MERGE_REQUEST_IID\" ] && echo \"mr$CI_MERGE_REQUEST_IID\" || { [ -n \"$CI_COMMIT_REF_SLUG\" ] && echo \"$CI_COMMIT_REF_SLUG\" || echo \"unknown\"; })")
+};
+var getReviewSlug = function (envConfig, env, pipelineType) {
+  var envType = (0, getEnvType_1.getEnvType)(env, envConfig);
+  if (envType === "review") {
+    return (0, bashExpressionPerPipelineType_1.getBashExpressionPerPipelineType)(REVIEW_SLUG, pipelineType);
+  }
+  return null; // not a review app;
+};
+exports.getReviewSlug = getReviewSlug;

package/dist/context/index.d.ts

@@ -1,5 +1,3 @@
-import type { Config } from "../types/config";
-import type { CommitInfo, Context } from "../types/context";
+export * from "./createComponentContext";
 export * from "./getEnvironment";
-export * from "./getEnvironmentVariables";
-export declare const createContext: (config: Config, componentName: string, env: string, commitInfo?: CommitInfo | undefined, packageManagerInfo?: import("../types/context").YarnPackageManagerInfo | undefined) => Promise<Context>;
+export * from "./getEnvironmentVariables";

package/dist/context/index.js

@@ -2,12 +2,16 @@
 
 var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
-  Object.defineProperty(o, k2, {
-    enumerable: true,
-    get: function () {
-      return m[k];
-    }
-  });
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function () {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
 } : function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   o[k2] = m[k];
@@ -15,160 +19,9 @@ var __createBinding = this && this.__createBinding || (Object.create ? function
 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);
 };
-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;
-exports.createContext = void 0;
-var build_1 = require("../build");
-var deploy_1 = require("../deploy");
-var utils_1 = require("../utils");
-var getEnvironment_1 = require("./getEnvironment");
-var getEnvironmentContext_1 = require("./getEnvironmentContext");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+__exportStar(require("./createComponentContext"), exports);
 __exportStar(require("./getEnvironment"), exports);
-__exportStar(require("./getEnvironmentVariables"), exports);
-var createContext = function (config, componentName, env, commitInfo, packageManagerInfo) {
-  return __awaiter(void 0, void 0, void 0, function () {
-    var envContext, componentConfigWithoutDefaults, defaults, componentConfig;
-    var _a;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
-        case 0:
-          if (!/^[a-z0-9-]+$/.test(componentName)) {
-            throw new Error("componentName may only contain lower case letters, numbers and -");
-          }
-          envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(config, env, componentName, commitInfo);
-          componentConfigWithoutDefaults = envContext.envConfigRaw;
-          defaults = componentConfigWithoutDefaults.deploy ? {
-            build: build_1.BUILD_TYPES[componentConfigWithoutDefaults.build.type].defaults(envContext),
-            deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults(envContext)
-          } : {
-            build: {},
-            deploy: {}
-          };
-          componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
-          _a = {
-            fullConfig: config,
-            componentConfig: componentConfig,
-            componentName: componentName
-          };
-          return [4 /*yield*/, (0, getEnvironment_1.getEnvironment)(config, componentName, env, commitInfo)];
-        case 1:
-          return [2 /*return*/, (_a.environment = _b.sent(), _a.commitInfo = commitInfo, _a.packageManagerInfo = packageManagerInfo, _a)];
-      }
-    });
-  });
-};
-exports.createContext = createContext;
+__exportStar(require("./getEnvironmentVariables"), exports);

package/dist/context/transformJobOnlyVars.d.ts

@@ -1,4 +1,4 @@
-import type { EnvironmentEnvVars } from "..";
+import type { SecretEnvVar, UnspecifiedEnvVars } from "..";
 import type { EnvVars } from "../types/config";
 /**
  * transform EnvVars for environment.
@@ -7,4 +7,7 @@ import type { EnvVars } from "../types/config";
  * @param vars
  * @returns
  */
-export declare const transformJobOnlyVars: (env: string, componentName: string, vars: EnvVars | null) => Promise<EnvironmentEnvVars>;
+export declare const transformJobOnlyVars: (env: string, componentName: string, vars: EnvVars | null) => Promise<{
+  envVars: UnspecifiedEnvVars;
+  secretEnvVarKeys: SecretEnvVar[];
+}>;

package/dist/context/transformJobOnlyVars.js

@@ -65,7 +65,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
+    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]) {
@@ -125,7 +125,9 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.transformJobOnlyVars = void 0;
 var envVars_1 = require("./utils/envVars");
 /**

package/dist/context/utils/envVars.d.ts

@@ -4,5 +4,5 @@ export declare const stringifyValues: (obj: Record<string, unknown>) => {
 };
 export declare const stringListToSecreteEnvVarList: (keys: string[]) => SecretEnvVar[];
 export declare const makeSecretEnvVarMapping: (env: string, componentName: string, secretEnvVars: SecretEnvVar[]) => {
-  [k: string]: string;
+  [k: string]: import("../../bash/BashExpression").BashExpression;
 };

package/dist/context/utils/envVars.js

@@ -22,10 +22,13 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.makeSecretEnvVarMapping = exports.stringListToSecreteEnvVarList = exports.stringifyValues = void 0;
 var lodash_1 = require("lodash");
 var getEnvironmentVariables_1 = require("../getEnvironmentVariables");
+var BashExpression_1 = require("../../bash/BashExpression");
 var stringifyValues = function (obj) {
   return Object.fromEntries(Object.entries(obj).map(function (_a) {
     var _b = __read(_a, 2),
@@ -46,7 +49,7 @@ exports.stringListToSecreteEnvVarList = stringListToSecreteEnvVarList;
 var makeSecretEnvVarMapping = function (env, componentName, secretEnvVars) {
   return Object.fromEntries(secretEnvVars.map(function (_a) {
     var key = _a.key;
-    return [key, "$".concat((0, getEnvironmentVariables_1.getSecretVarName)(env, componentName, key))];
+    return [key, (0, BashExpression_1.getBashVariable)((0, getEnvironmentVariables_1.getSecretVarName)(env, componentName, key))];
   }));
 };
 exports.makeSecretEnvVarMapping = makeSecretEnvVarMapping;

package/dist/defaults/index.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.BASE_RETRY = void 0;
 exports.BASE_RETRY = {
   max: 2,

package/dist/deploy/base/deploy.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from "../../types/context";
+import type { DeployJobDefinition } from "../../types";
+import { type ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export declare type DeployJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "cache" | "artifacts" | "services">;
-export declare const createDeployJob: (context: Context, jobDefinition: DeployJobDefinition) => CatladderJob;
+export declare const createDeployJob: (context: ComponentContext, jobDefinition: DeployJobDefinition) => CatladderJob;