@catladder/pipeline 1.41.2 → 1.41.4

package/dist/context/resolveReferences.test.js

@@ -1,31 +1,194 @@
 "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 () {
-    var variables = {
-      a: "hello world",
-      b: "a replaced value looks like this: '${api:FOO}', nice!"
-    };
-    var otherVariables = {
-      api: {
-        FOO: "foo from api"
-      },
-      frontend: {
-        FOO: "foo from frontend"
-      }
-    };
-    var result = (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
-      var _a;
+    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, variableName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                var _a;
 
-      return (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName];
-    });
-    expect(result).toEqual({
-      a: "hello world",
-      b: "a replaced value looks like this: 'foo from api', nice!"
+                return __generator(this, function (_b) {
+                  return [2
+                  /*return*/
+                  , (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]];
+                });
+              });
+            })];
+
+          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 () {
@@ -40,81 +203,169 @@ describe("resolveReferences", function () {
     });
   });
   it("replaces self references mixed with other vars", function () {
-    var variables = {
-      FOO: "hello from ${api:FOO}",
-      BAR: "this: ${FOO}!"
-    };
-    var otherVariables = {
-      api: {
-        FOO: "foo from api"
-      }
-    };
-    var result = (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
-      var _a;
+    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, variableName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                var _a;
 
-      return (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName];
-    });
-    expect(result).toEqual({
-      FOO: "hello from foo from api",
-      BAR: "this: hello from foo from api!"
+                return __generator(this, function (_b) {
+                  return [2
+                  /*return*/
+                  , (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]];
+                });
+              });
+            })];
+
+          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 () {
-    var variables = {
-      a: "hello world",
-      b: "a not found value looks like this: '${api:FOO}'"
-    };
-    var otherVariables = {};
-    var result = (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
-      var _a;
+    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, variableName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                var _a;
 
-      return (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName];
-    });
-    expect(result).toEqual({
-      a: "hello world",
-      b: "a not found value looks like this: '${api:FOO}'"
+                return __generator(this, function (_b) {
+                  return [2
+                  /*return*/
+                  , (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]];
+                });
+              });
+            })];
+
+          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 () {
-    var variables = {
-      a: "value is ${frontend:FOO}!"
-    };
-    var otherVariables = {
-      api: {
-        FOO: "foo from api"
-      },
-      frontend: {
-        FOO: "hi, ${api:FOO}"
-      }
-    };
-    var result = (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
-      var _a, _b;
+    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, variableName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                var _a, _b;
 
-      return (_b = (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) !== null && _b !== void 0 ? _b : "";
-    });
-    expect(result).toEqual({
-      a: "value is hi, foo from api!"
+                return __generator(this, function (_c) {
+                  return [2
+                  /*return*/
+                  , (_b = (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) !== null && _b !== void 0 ? _b : ""];
+                });
+              });
+            })];
+
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              a: "value is hi, foo from api!"
+            });
+            return [2
+            /*return*/
+            ];
+        }
+      });
     });
   });
   it("prevents endless loops", function () {
-    var variables = {
-      a: "value is ${frontend:FOO}!"
-    };
-    var otherVariables = {
-      api: {
-        FOO: "api ${frontend:FOO}"
-      },
-      frontend: {
-        FOO: "frontend ${api:FOO}"
-      }
-    };
-    var result = (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
-      var _a, _b;
+    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, variableName) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                var _a, _b;
 
-      return (_b = (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) !== null && _b !== void 0 ? _b : "";
-    });
-    expect(result).toEqual({
-      a: "value is frontend api ${frontend:FOO}!"
+                return __generator(this, function (_c) {
+                  return [2
+                  /*return*/
+                  , (_b = (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]) !== null && _b !== void 0 ? _b : ""];
+                });
+              });
+            })];
+
+          case 1:
+            result = _a.sent();
+            expect(result).toEqual({
+              a: "value is frontend api ${frontend:FOO}!"
+            });
+            return [2
+            /*return*/
+            ];
+        }
+      });
     });
   });
 });

package/dist/deploy/cloudSql/index.d.ts

@@ -0,0 +1,8 @@
+import type { Context } from "../../types";
+export declare const hasCloudSQL: (context: Context) => boolean | undefined;
+export declare const getCloudSQLConfig: (context: Context) => {
+  enabled: boolean;
+  instanceId?: string | undefined;
+  projectId?: string | undefined;
+  region?: string | undefined;
+} | undefined;

package/dist/deploy/cloudSql/index.js

@@ -0,0 +1,30 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getCloudSQLConfig = exports.hasCloudSQL = void 0;
+
+var types_1 = require("../types");
+
+var hasCloudSQL = function (context) {
+  var _a, _b;
+
+  if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+    return (_b = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql) === null || _b === void 0 ? void 0 : _b.enabled;
+  }
+
+  return false;
+};
+
+exports.hasCloudSQL = hasCloudSQL;
+
+var getCloudSQLConfig = function (context) {
+  var _a;
+
+  if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+    return (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
+  }
+
+  throw new Error("cannot get cloud sql config");
+};
+
+exports.getCloudSQLConfig = getCloudSQLConfig;

package/dist/deploy/index.d.ts

@@ -9,5 +9,6 @@ export declare type DeployTypeDefinition<T extends DeployConfigType> = {
   defaults: () => Partial<DeployConfigGeneric<T>>;
   additionalSecretKeys: (config: DeployConfigGeneric<T>) => string[];
 };
+export * from "./cloudSql";
 export declare type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<T> };
 export declare const DEPLOY_TYPES: DeployTypes;

package/dist/deploy/index.js

@@ -30,6 +30,8 @@ __exportStar(require("./types"), exports);
 
 __exportStar(require("./utils"), exports);
 
+__exportStar(require("./cloudSql"), exports);
+
 exports.DEPLOY_TYPES = {
   kubernetes: kubernetes_1.KUBERNETES_DEPLOY_TYPE,
   custom: custom_1.CUSTOM_DEPLOY_TYPE

package/dist/deploy/kubernetes/kubeValues.d.ts

@@ -11,9 +11,9 @@ export declare const createKubeValues: (context: Context) => never[] | ({
     } & Record<string, unknown>)[] | undefined;
     hostAliases?: string[] | undefined;
     replicas?: number | undefined;
-    autoscale?: import("..").KubernetesAutoscale | undefined;
-    updateStrategy?: import("..").KubernetesUpdateStrategy | undefined;
-    resources?: import("..").KubernetesResourcesDef | undefined;
+    autoscale?: import("../types").KubernetesAutoscale | undefined;
+    updateStrategy?: import("../types").KubernetesUpdateStrategy | undefined;
+    resources?: import("../types").KubernetesResourcesDef | undefined;
     healthRoute?: string | undefined;
     startupProbe?: {
       httpGet?: {
@@ -57,7 +57,7 @@ export declare const createKubeValues: (context: Context) => never[] | ({
         successThreshold?: number | undefined;
       } | undefined;
     } | undefined;
-    worker?: import("..").KubernetesWorkerDef | undefined;
+    worker?: import("../types").KubernetesWorkerDef | undefined;
   } & Record<string, unknown>) | undefined;
 } & {
   [x: string]: unknown;
@@ -67,7 +67,7 @@ export declare const createKubeValues: (context: Context) => never[] | ({
     projectId?: string | undefined;
     region?: string | undefined;
   } | undefined;
-  mongodb?: import("..").DeployConfigMongodb | undefined;
+  mongodb?: import("../types").DeployConfigMongodb | undefined;
   mailhog?: {
     enabled: boolean;
   } | undefined;

package/dist/deploy/kubernetes/kubeValues.js

@@ -18,6 +18,8 @@ var lodash_1 = require("lodash");
 
 var utils_1 = require("../../utils");
 
+var cloudSql_1 = require("../cloudSql");
+
 var types_1 = require("../types");
 
 var cloudsql_1 = require("./cloudsql");
@@ -61,7 +63,7 @@ var createAppConfig = function (context, application) {
 };
 
 var createKubeValues = function (context) {
-  var _a, _b, _c, _d;
+  var _a, _b;
 
   var deployConfig = context.componentConfig.deploy;
 
@@ -78,15 +80,15 @@ var createKubeValues = function (context) {
   // we only merge the rest of the values in
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
-  var _e = values !== null && values !== void 0 ? values : {},
-      application = _e.application,
-      rest = __rest(_e, ["application"]);
+  var _c = values !== null && values !== void 0 ? values : {},
+      application = _c.application,
+      rest = __rest(_c, ["application"]);
 
   var env = (0, kubeEnv_1.createKubeEnv)(context);
   var defaultKubeValues = (0, lodash_1.merge)({
     env: env,
     application: createAppConfig(context, application)
-  }, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.cloudsql) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, cloudsql_1.createCloudsqlBaseConfig)(context) : {}, ((_d = (_c = deployConfig.values) === null || _c === void 0 ? void 0 : _c.mongodb) === null || _d === void 0 ? void 0 : _d.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
+  }, (0, cloudSql_1.hasCloudSQL)(context) ? (0, cloudsql_1.createCloudsqlBaseConfig)(context) : {}, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
   var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, rest));
   return kubeValues;
 };

package/dist/pipeline/createJobs.js

@@ -367,23 +367,51 @@ var createJobs = function (type, envs, config, componentName, trigger) {
           return [2
           /*return*/
           , envs.reduce(function (acc, env) {
-            var context = (0, context_1.createContext)(config, componentName, env, commitInfo, packageManagerInfo);
-            var jobs = addStageNeeds(createRawJobs(context));
-
-            var result = __assign(__assign({}, acc), jobs.reduce(function (acc, job) {
-              var _a;
-
-              var jobWithResolvedReferences = replaceReferences(job, componentName, env, jobs);
-              var jobName = getFullJobName(job.name, componentName, job.envMode !== "none" ? env : undefined);
-
-              if (type === "gitlab") {
-                return __assign(__assign({}, acc), (_a = {}, _a[jobName] = (0, makeGitlabJob_1.makeGitlabJob)(jobWithResolvedReferences), _a));
-              }
-
-              throw new Error("not supported");
-            }, {}));
-
-            return result;
+            return __awaiter(void 0, void 0, void 0, function () {
+              var context, jobs, result, _a, _b, _c, _d, _e;
+
+              return __generator(this, function (_f) {
+                switch (_f.label) {
+                  case 0:
+                    return [4
+                    /*yield*/
+                    , (0, context_1.createContext)(config, componentName, env, commitInfo, packageManagerInfo)];
+
+                  case 1:
+                    context = _f.sent();
+                    jobs = addStageNeeds(createRawJobs(context));
+                    _a = [{}];
+                    return [4
+                    /*yield*/
+                    , acc];
+
+                  case 2:
+                    _b = [__assign.apply(void 0, _a.concat([_f.sent()]))];
+                    _d = (_c = jobs).reduce;
+                    _e = [function (acc, job) {
+                      var _a;
+
+                      var jobWithResolvedReferences = replaceReferences(job, componentName, env, jobs);
+                      var jobName = getFullJobName(job.name, componentName, job.envMode !== "none" ? env : undefined);
+
+                      if (type === "gitlab") {
+                        return __assign(__assign({}, acc), (_a = {}, _a[jobName] = (0, makeGitlabJob_1.makeGitlabJob)(jobWithResolvedReferences), _a));
+                      }
+
+                      throw new Error("not supported");
+                    }];
+                    return [4
+                    /*yield*/
+                    , Promise.resolve({})];
+
+                  case 3:
+                    result = __assign.apply(void 0, _b.concat([_d.apply(_c, _e.concat([_f.sent()]))]));
+                    return [2
+                    /*return*/
+                    , result];
+                }
+              });
+            });
           }, {})];
       }
     });