@catladder/pipeline 0.0.0-inventory-2f61feef → 0.0.0-jdbc-e0855190

package/dist/build/base/createBuildJob.d.ts

@@ -3,6 +3,5 @@ import type { CatladderJob } from "../../types/jobs";
 export declare const createBuildJob: (context: Context, {
   script,
   variables,
-  artifacts,
   ...def
 }: Partial<CatladderJob>) => CatladderJob;

package/dist/build/base/createBuildJob.js

@@ -67,8 +67,6 @@ var lodash_1 = require("lodash");
 
 var __1 = require("../..");
 
-var reportingJob_1 = require("../../inventory/reportingJob");
-
 var utils_1 = require("../../utils");
 
 var yarn_1 = require("../node/yarn");
@@ -78,12 +76,11 @@ var constants_1 = require("./constants");
 var getBuildInfo_1 = require("./getBuildInfo");
 
 var createBuildJob = function (context, _a) {
-  var _b, _c, _d;
+  var _b, _c;
 
   var script = _a.script,
       variables = _a.variables,
-      artifacts = _a.artifacts,
-      def = __rest(_a, ["script", "variables", "artifacts"]);
+      def = __rest(_a, ["script", "variables"]);
 
   return (0, lodash_1.merge)({
     name: constants_1.APP_BUILD_JOB_NAME,
@@ -95,7 +92,7 @@ var createBuildJob = function (context, _a) {
     variables: __assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
     artifacts: {
-      paths: __spreadArray([context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/" + reportingJob_1.INVENTORY_ARTIFACTS_DIR], __read((_d = artifacts === null || artifacts === void 0 ? void 0 : artifacts.paths) !== null && _d !== void 0 ? _d : []), false)
+      paths: [context.componentConfig.dir + "/__build_info.json"]
     }
   }, def);
 };

package/dist/build/custom/buildJob.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from "../../types/context";
+import type { CatladderJob } from "../../types/jobs";
+export declare const createCustomBuildJobs: (context: Context) => CatladderJob[];

package/dist/build/custom/buildJob.js

@@ -0,0 +1,101 @@
+"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 __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.createCustomBuildJobs = void 0;
+
+var path_1 = require("path");
+
+var utils_1 = require("../../utils");
+
+var constants_1 = require("../base/constants");
+
+var createBuildJob_1 = require("../base/createBuildJob");
+
+var docker_1 = require("../docker");
+
+var types_1 = require("../types");
+
+var RUNNER_BUILD_VARIABLES = {
+  KUBERNETES_CPU_REQUEST: "0.5",
+  KUBERNETES_CPU_LIMIT: "2",
+  KUBERNETES_MEMORY_REQUEST: "2Gi",
+  KUBERNETES_MEMORY_LIMIT: "4Gi"
+};
+
+var createCustomBuildJobs = function (context) {
+  var _a, _b, _c, _d;
+
+  var buildConfig = context.componentConfig.build;
+
+  if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
+    throw new Error("deploy config is not custom");
+  }
+
+  var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
+    image: buildConfig.jobImage,
+    variables: __assign({}, RUNNER_BUILD_VARIABLES),
+    script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
+    artifacts: {
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+        return (0, path_1.join)(context.componentConfig.dir, path);
+      })) !== null && _c !== void 0 ? _c : []), false)
+    }
+  }) : null;
+  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+    script: [((_d = buildConfig.docker) === null || _d === void 0 ? void 0 : _d.type) === "nginx" ? "ensureNginxDockerfile" : "" // e.g. custom,
+    ].filter(Boolean),
+    variables: {},
+    needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
+  })] : []), false);
+};
+
+exports.createCustomBuildJobs = createCustomBuildJobs;

package/dist/build/custom/index.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from "../../types/context";
+import type { CatladderJob } from "../../types/jobs";
+export declare const createCustomJobs: (context: Context) => CatladderJob[];

package/dist/build/custom/index.js

@@ -0,0 +1,47 @@
+"use strict";
+
+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.createCustomJobs = void 0;
+
+var buildJob_1 = require("./buildJob");
+
+var createCustomJobs = function (context) {
+  return __spreadArray([], __read((0, buildJob_1.createCustomBuildJobs)(context)), false);
+};
+
+exports.createCustomJobs = createCustomJobs;

package/dist/build/index.d.ts

@@ -1,11 +1,12 @@
 import type { Context } from "../types/context";
+import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { BuildConfig, BuildConfigType } from "./types";
 export * from "./types";
 export * from "./node";
 export declare type BuildTypes = { [type in BuildConfigType]: {
   jobs: (context: Context) => CatladderJob[];
-  defaults: () => Partial<Extract<BuildConfig, {
+  defaults: (envContext: EnvironmentContext<BuildConfigType, any>) => Partial<Extract<BuildConfig, {
     type: type;
   }>>;
 } };

package/dist/build/index.js

@@ -20,6 +20,8 @@ var __exportStar = this && this.__exportStar || function (m, exports) {
 exports.__esModule = true;
 exports.BUILD_TYPES = void 0;
 
+var custom_1 = require("./custom");
+
 var node_1 = require("./node");
 
 __exportStar(require("./types"), exports);
@@ -59,5 +61,11 @@ exports.BUILD_TYPES = {
         startCommand: "node main.js"
       };
     }
+  },
+  custom: {
+    jobs: custom_1.createCustomJobs,
+    defaults: function () {
+      return {};
+    }
   }
 };

package/dist/build/node/buildJob.js

@@ -70,10 +70,8 @@ var constants_2 = require("./constants");
 
 var yarn_1 = require("./yarn");
 
-var reportingJob_1 = require("../../inventory/reportingJob");
-
 var createNodeBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e;
 
   var buildConfig = context.componentConfig.build;
 
@@ -82,17 +80,14 @@ var createNodeBuildJobs = function (context) {
   }
 
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
-  var yarnReportDependenciesListCommand = ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) ? "npm ls --depth 0 --json -prod | jq '.dependencies | to_entries | .[] | {artifact: .key, version: .value.version, type: \"npm\"}'" : "yarn info --json -A| jq '{version: .children.Version, artifact: .value, type: \"npm\" }'";
-  var debugcom = ((_b = context.packageManagerInfo) === null || _b === void 0 ? void 0 : _b.isClassic) ? "npm ls --depth 0 --json -prod" : "yarn info --json -A";
-  var yarnReportDependenciesCommand = ["mkdir -p ".concat(reportingJob_1.INVENTORY_ARTIFACTS_DIR_DEPENDENCIES), yarnReportDependenciesListCommand + " > " + reportingJob_1.INVENTORY_ARTIFACTS_DIR_DEPENDENCIES + "/app.jsonl"];
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_c = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _c !== void 0 ? _c : []), false), [debugcom], false), __read(yarnReportDependenciesCommand), false),
+    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
     artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_e = (_d = buildConfig.artifactsPaths) === null || _d === void 0 ? void 0 : _d.map(function (path) {
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
         return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _e !== void 0 ? _e : []), false)
+      })) !== null && _c !== void 0 ? _c : []), false)
     }
   }) : null;
   return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
@@ -107,9 +102,9 @@ var createNodeBuildJobs = function (context) {
         prodOnly: true,
         noScripts: true
       }),
-      DOCKER_COPY_WORKSPACE_FILES: (_g = (_f = context.packageManagerInfo) === null || _f === void 0 ? void 0 : _f.pathsToCopyInDocker.map(function (dir) {
+      DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-      })) === null || _g === void 0 ? void 0 : _g.join("\n")
+      })) === null || _e === void 0 ? void 0 : _e.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
   })] : []), false);

package/dist/build/node/cache.js

@@ -41,14 +41,21 @@ exports.getNextCache = exports.getNodeCache = exports.getNodeModulesCache = expo
 var path_1 = require("path");
 
 var getYarnCache = function (context, policy) {
+  var _a;
+
   if (policy === void 0) {
     policy = "pull-push";
   }
 
-  return [{
+  var componentIsInWorkspace = (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace;
+  return [componentIsInWorkspace ? {
     key: "yarn",
     policy: policy,
     paths: [".yarn"]
+  } : {
+    key: context.componentConfig.dir + "-yarn",
+    policy: policy,
+    paths: [(0, path_1.join)(context.componentConfig.dir, ".yarn")]
   }];
 };
 

package/dist/build/node/yarn.js

@@ -53,7 +53,7 @@ var getYarnInstallCommand = function (context, options) {
 
     return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v);
   });
-  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production") // needs yarn plugin import workspace-tools
+  return (options === null || options === void 0 ? void 0 : options.prodOnly) ? "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "").concat(doesNotShipWithBuiltInPlugins ? "yarn plugin import workspace-tools && " : " ", "yarn workspaces focus --production && yarn rebuild") // needs yarn plugin import workspace-tools
   : "".concat((options === null || options === void 0 ? void 0 : options.noScripts) ? "YARN_ENABLE_SCRIPTS=false " : "", "yarn install --immutable");
 };
 

package/dist/build/types.d.ts

@@ -66,18 +66,39 @@ export declare type BuildConfigMeteor = BuildConfigNodeBase & {
 
   installScripts?: boolean;
 };
+export declare type BuildConfigCustomDocker = BuildConfigBase["docker"] & ({
+  /**
+   * use the built-in nginx image for simple static apps
+   */
+  type: "nginx";
+} | {
+  /**
+   * custom docker build, expect that a Dockerfile in your directory
+   */
+  type: "custom";
+});
+export declare type BuildConfigCustom = BuildConfigBase & {
+  type: "custom";
+  jobImage: string;
+  docker: BuildConfigCustomDocker;
+};
 export declare type BuildConfigStorybook = BuildConfigNodeBase & {
   type: "storybook";
   startCommand?: never;
 };
-export declare type BuildConfig = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor;
+export declare type BuildConfig = BuildConfigNode | BuildConfigNodeStatic | BuildConfigStorybook | BuildConfigMeteor | BuildConfigCustom;
 export declare type BuildConfigType = BuildConfig["type"];
-export declare const isOfBuildType: <T extends ("node" | "node-static" | "meteor" | "storybook")[]>(t: BuildConfig, ...types: T) => t is Extract<BuildConfigNode, {
+export declare type BuildConfigGeneric<T extends BuildConfigType> = Extract<BuildConfig, {
+  type: T;
+}>;
+export declare const isOfBuildType: <T extends ("node" | "node-static" | "meteor" | "custom" | "storybook")[]>(t: BuildConfig, ...types: T) => t is Extract<BuildConfigNode, {
   type: T[number];
 }> | Extract<BuildConfigNodeStatic, {
   type: T[number];
 }> | Extract<BuildConfigMeteor, {
   type: T[number];
+}> | Extract<BuildConfigCustom, {
+  type: T[number];
 }> | Extract<BuildConfigStorybook, {
   type: T[number];
 }>;