@catladder/pipeline 1.149.3 → 1.150.0

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v1-149-3-26c67bb0" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v1-150-0-019658c9" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/deploy/cloudRun/createJobs/cloudRunServices.js

@@ -72,6 +72,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
     cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu,
     memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
+    timeout: customConfig === null || customConfig === void 0 ? void 0 : customConfig.timeout,
     "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
     ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
     "cpu-boost": true,

package/dist/deploy/types/googleCloudRun.d.ts

@@ -89,6 +89,14 @@ export type DeployConfigCloudRunService = {
    * memory limit. Defaults to 512MB
    */
   memory?: Memory;
+  /**
+   * timeout of the service, defaults to 5 minutes.
+   *
+   * you can specify something like 10m30s. if its just a number, it will be interpreted as seconds
+   *
+   * max supported is 60min
+   */
+  timeout?: string;
   /**
    *
    * set the execution environment.

package/dist/pipeline/createAllJobs.js

@@ -1,5 +1,15 @@
 "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) {
@@ -120,54 +130,79 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createAllJobs = void 0;
 var config_1 = require("../config");
+var context_1 = require("../context");
 var createJobsForComponent_1 = require("./createJobsForComponent");
-var createAllJobs = function (_a) {
+var createAllComponentContext = function (_a) {
   return __awaiter(void 0, [_a], void 0, function (_b) {
-    var _c, _d;
     var config = _b.config,
       trigger = _b.trigger,
       pipelineType = _b.pipelineType;
-    return __generator(this, function (_e) {
-      switch (_e.label) {
+    return __generator(this, function (_c) {
+      switch (_c.label) {
         case 0:
-          _d = (_c = Object).fromEntries;
-          return [4 /*yield*/, Promise.all(Object.keys(config.components).map(function (componentName) {
-            return __awaiter(void 0, void 0, void 0, function () {
-              var envs, _a, _b, _c;
-              return __generator(this, function (_d) {
-                switch (_d.label) {
-                  case 0:
-                    envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
-                    _a = [componentName];
-                    _c = (_b = Object).fromEntries;
-                    return [4 /*yield*/, Promise.all(envs.map(function (env) {
-                      return __awaiter(void 0, void 0, void 0, function () {
-                        var _a;
-                        return __generator(this, function (_b) {
-                          switch (_b.label) {
-                            case 0:
-                              _a = [env];
-                              return [4 /*yield*/, (0, createJobsForComponent_1.createJobsForComponent)({
-                                config: config,
-                                componentName: componentName,
-                                env: env,
-                                trigger: trigger,
-                                pipelineType: pipelineType
-                              })];
-                            case 1:
-                              return [2 /*return*/, _a.concat([_b.sent()])];
-                          }
-                        });
-                      });
-                    }))];
-                  case 1:
-                    return [2 /*return*/, _a.concat([_c.apply(_b, [_d.sent()])])];
-                }
+          return [4 /*yield*/, Promise.all(Object.keys(config.components).flatMap(function (componentName) {
+            var envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
+            return envs.map(function (env) {
+              return __awaiter(void 0, void 0, void 0, function () {
+                var context;
+                return __generator(this, function (_a) {
+                  switch (_a.label) {
+                    case 0:
+                      return [4 /*yield*/, (0, context_1.createComponentContext)({
+                        config: config,
+                        componentName: componentName,
+                        env: env,
+                        trigger: trigger,
+                        pipelineType: pipelineType
+                      })];
+                    case 1:
+                      context = _a.sent();
+                      return [2 /*return*/, {
+                        env: env,
+                        componentName: componentName,
+                        context: context
+                      }];
+                  }
+                });
               });
             });
           }))];
         case 1:
-          return [2 /*return*/, _d.apply(_c, [_e.sent()])];
+          return [2 /*return*/, _c.sent()];
+      }
+    });
+  });
+};
+var createAllJobs = function (_a) {
+  return __awaiter(void 0, [_a], void 0, function (_b) {
+    var allComponentContext;
+    var config = _b.config,
+      trigger = _b.trigger,
+      pipelineType = _b.pipelineType;
+    return __generator(this, function (_c) {
+      switch (_c.label) {
+        case 0:
+          return [4 /*yield*/, createAllComponentContext({
+            config: config,
+            trigger: trigger,
+            pipelineType: pipelineType
+          })];
+        case 1:
+          allComponentContext = _c.sent();
+          return [2 /*return*/, allComponentContext.reduce(function (acc, _a) {
+            var componentName = _a.componentName,
+              env = _a.env,
+              context = _a.context;
+            if (!acc[componentName]) {
+              acc[componentName] = {};
+            }
+            acc[componentName][env] = (0, createJobsForComponent_1.createJobsForComponentContext)(context).map(function (job) {
+              return __assign(__assign({}, job), {
+                context: context
+              });
+            });
+            return acc;
+          }, {})];
       }
     });
   });

package/dist/pipeline/createJobsForComponent.d.ts

@@ -1,3 +1,3 @@
-import type { CreateComponentContextContext } from "../context";
-import type { CatladderJobWithContext } from "../types/context";
-export declare const createJobsForComponent: (contextContext: CreateComponentContextContext) => Promise<Array<CatladderJobWithContext>>;
+import type { ComponentContext } from "../types/context";
+import type { CatladderJob } from "../types/jobs";
+export declare const createJobsForComponentContext: (context: ComponentContext) => CatladderJob[];

package/dist/pipeline/createJobsForComponent.js

@@ -10,121 +10,6 @@ var __assign = this && this.__assign || function () {
   };
   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
-    };
-  }
-};
 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];
@@ -167,9 +52,8 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createJobsForComponent = void 0;
+exports.createJobsForComponentContext = void 0;
 var build_1 = require("../build");
-var context_1 = require("../context");
 var deploy_1 = require("../deploy");
 var injectDefaultVarsInCustomJobs = function (context, jobs) {
   return jobs.map(function (_a) {
@@ -188,29 +72,11 @@ var getCustomJobs = function (context) {
   var rawJobs = context.customJobs;
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
-var createRawJobs = function (context) {
+var createJobsForComponentContext = function (context) {
   var _a, _b;
   var buildJobs = build_1.BUILD_TYPES[context.build.config.type].jobs(context);
   var deployJobs = ((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config) ? deploy_1.DEPLOY_TYPES[(_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.type].jobs(context) : [];
   var customJobs = getCustomJobs(context);
   return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
 };
-var createJobsForComponent = function (contextContext) {
-  return __awaiter(void 0, void 0, void 0, function () {
-    var context;
-    return __generator(this, function (_a) {
-      switch (_a.label) {
-        case 0:
-          return [4 /*yield*/, (0, context_1.createComponentContext)(contextContext)];
-        case 1:
-          context = _a.sent();
-          return [2 /*return*/, createRawJobs(context).map(function (job) {
-            return __assign(__assign({}, job), {
-              context: context
-            });
-          })];
-      }
-    });
-  });
-};
-exports.createJobsForComponent = createJobsForComponent;
+exports.createJobsForComponentContext = createJobsForComponentContext;