@catladder/pipeline 0.0.0-refactor-gcloud-api-5bd4bbed → 0.0.0-refactor-needs-aae6e67d

package/dist/context/getEnvironmentContext.js

@@ -4,20 +4,22 @@ 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 getEnvironmentSlugPrefix = function (envConfig, env, commitInfo) {
   var envType = (0, getEnvType_1.getEnvType)(env, envConfig);
-  return envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug, "-").concat(componentName) : "".concat(env, "-").concat(componentName);
+  return envType === "review" && commitInfo ? "".concat(env, "-").concat(commitInfo.reviewSlug) : "".concat(env);
 };
 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 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);
   return {
     envConfigRaw: envConfigRaw,
     deployConfigRaw: envConfigRaw.deploy,
     buildConfigRaw: envConfigRaw.build,
+    environmentSlugPrefix: environmentSlugPrefix,
     environmentSlug: environmentSlug,
     gitlabEnvironmentName: gitlabEnvironmentName,
     fullName: fullName,

package/dist/context/getEnvironmentVariables.js

@@ -215,7 +215,7 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
             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 (otherComponentName, variableName, alreadyVisited) {
+          return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(envVarsRaw, function (otherComponentName, alreadyVisited) {
             return __awaiter(void 0, void 0, void 0, function () {
               var otherEnvVars;
               return __generator(this, function (_a) {
@@ -224,7 +224,7 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
                     return [4 /*yield*/, (0, exports.getEnvironmentVariables)(config, otherComponentName, env, commitInfo, alreadyVisited)];
                   case 1:
                     otherEnvVars = _a.sent().envVars;
-                    return [2 /*return*/, otherEnvVars[variableName]];
+                    return [2 /*return*/, otherEnvVars];
                 }
               });
             });

package/dist/context/resolveReferences.d.ts

@@ -1,4 +1,4 @@
-export declare const resolveReferences: (vars: Record<string, string>, getOtherVariables?: ((componentName: string, variableName: string, alreadyVisited: Record<string, Record<string, boolean>>) => Promise<string | null>) | undefined, alreadyVisitedBase?: Record<string, Record<string, boolean>>) => Promise<Record<string, string>>;
+export declare const resolveReferences: (vars: Record<string, string>, getOtherVariables?: ((componentName: string, alreadyVisited: Record<string, Record<string, boolean>>) => Promise<Record<string, string | null>>) | undefined, alreadyVisitedBase?: Record<string, Record<string, boolean>>) => Promise<Record<string, string>>;
 export declare const translateLegacyFromComponents: (fromComponents: Record<string, Record<string, string>>) => {
   [k: string]: string;
 };

package/dist/context/resolveReferences.js

@@ -179,7 +179,9 @@ var resolveReferences = function (vars, getOtherVariables, alreadyVisitedBase) {
 
                               newAlreadyVisited = (0, lodash_1.merge)({}, alreadyVisited, (_c = {}, _c[componentName] = (_d = {}, _d[variableName] = true, _d), _c));
                               if (!componentName) return [3 /*break*/, 2];
-                              return [4 /*yield*/, getOtherVariables === null || getOtherVariables === void 0 ? void 0 : getOtherVariables(componentName, variableName, newAlreadyVisited)];
+                              return [4 /*yield*/, getOtherVariables === null || getOtherVariables === void 0 ? void 0 : getOtherVariables(componentName, newAlreadyVisited).then(function (r) {
+                                return r === null || r === void 0 ? void 0 : r[variableName];
+                              })];
                             case 1:
                               _a = (_f = _g.sent()) !== null && _f !== void 0 ? _f : null;
                               return [3 /*break*/, 3];

package/dist/deploy/base.js

@@ -38,7 +38,7 @@ var getBaseDeploymentJob = function (context) {
   return {
     name: exports.DEPLOY_JOB_NAME,
     envMode: "stagePerEnv",
-    needsOtherComponent: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+    needs: context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,

package/dist/deploy/cloudRun/deployJob.js

@@ -120,19 +120,21 @@ var createGoogleCloudRunDeployJobs = function (context) {
     };
   });
   var getServiceDeployScript = function (service, nameSuffix) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     var customConfig = service !== true ? service : undefined;
     var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
     var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
-      command: command ? '"' + command.split(" ").join(",") + '"' : undefined
+      // command as empty string resets it to default (uses the image's entrypoint)
+      command: command ? '"' + command.split(" ").join(",") + '"' : '""'
     }, commonDeployArgs), {
       "env-vars-file": "____envvars.yaml",
-      "min-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances,
-      "max-instances": customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances,
-      "no-cpu-throttling": customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling
+      "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
+      "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
+      "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
+      memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
+      "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true
     }));
-    var authenticationString = ((_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _b !== void 0 ? _b : true) ? "--allow-unauthenticated" : "--no-allow-unauthenticated";
-    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString, " ").concat(authenticationString);
+    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString);
   };
   var getJobCreateScriptsForJob = function (jobName, job) {
     // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦

package/dist/deploy/cloudRun/index.js

@@ -50,15 +50,15 @@ var jobName_1 = require("./utils/jobName");
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
-  var _b, _c, _d;
+  var _b, _c, _d, _e;
   var deployConfigRaw = _a.deployConfigRaw,
-    environmentSlug = _a.environmentSlug,
+    environmentSlugPrefix = _a.environmentSlugPrefix,
     env = _a.env,
     componentName = _a.componentName,
     fullConfig = _a.fullConfig;
   if (deployConfigRaw && deployConfigRaw.cloudSql) {
-    var DB_NAME = [(_b = deployConfigRaw.cloudSql.dbNamePrefix) !== null && _b !== void 0 ? _b : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlug].filter(Boolean).join("-");
-    var additionalQueryParamsString = Object.entries((_c = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _c !== void 0 ? _c : {}).map(function (_a) {
+    var DB_NAME = [(_b = deployConfigRaw.cloudSql.dbNamePrefix) !== null && _b !== void 0 ? _b : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlugPrefix, (_c = deployConfigRaw.cloudSql.dbBaseName) !== null && _c !== void 0 ? _c : componentName].filter(Boolean).join("-");
+    var additionalQueryParamsString = Object.entries((_d = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
       var _b = __read(_a, 2),
         key = _b[0],
         value = _b[1];
@@ -67,7 +67,7 @@ var getCloudSqlVariables = function (_a) {
     return {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
-      DB_USER: (_d = deployConfigRaw.cloudSql.dbUser) !== null && _d !== void 0 ? _d : "postgres",
+      DB_USER: (_e = deployConfigRaw.cloudSql.dbUser) !== null && _e !== void 0 ? _e : "postgres",
       DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
       DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
       DATABASE_JDBC_URL: "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD".concat(additionalQueryParamsString)
@@ -93,11 +93,12 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
     return __spreadArray([exports.GCLOUD_DEPLOY_CREDENTIALS_KEY], __read(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? ["DB_PASSWORD"] : []), false);
   },
   getAdditionalEnvVars: function (ctx) {
+    var _a;
     var fullName = ctx.fullName,
       env = ctx.env,
       componentName = ctx.componentName,
       deployConfigRaw = ctx.deployConfigRaw;
-    var HOST_CANONICAL = fullName.toLowerCase() + "-" + process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)];
+    var HOST_CANONICAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
     var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
         name = _b[0],

package/dist/deploy/cloudRun/utils/createArgsString.d.ts

@@ -8,4 +8,4 @@
  * @param args args record
  * @returns
  */
-export declare const createArgsString: (args: Record<string, string | number | true | undefined>) => string;
+export declare const createArgsString: (args: Record<string, string | number | true | false | undefined>) => string;

package/dist/deploy/cloudRun/utils/createArgsString.js

@@ -44,7 +44,12 @@ var createArgsString = function (args) {
     var _b = __read(_a, 2),
       key = _b[0],
       value = _b[1];
-    return "--".concat(key).concat(value !== true ? "=".concat(value) : "");
+    if (value === true) {
+      return "--".concat(key);
+    } else if (value === false) {
+      return "--no-".concat(key);
+    }
+    return "--".concat(key, "=").concat(value);
   }).join(" ");
 };
 exports.createArgsString = createArgsString;

package/dist/deploy/kubernetes/deployJob.js

@@ -51,7 +51,7 @@ var base_1 = require("../base");
 var types_1 = require("../types");
 var kubeValues_1 = require("./kubeValues");
 var createKubernetesDeployJobs = function (context) {
-  var _a, _b;
+  var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
   if (deployConfig === false) {
     return [];
@@ -75,10 +75,10 @@ var createKubernetesDeployJobs = function (context) {
         quotingType: "'",
         forceQuotes: true
       }),
-      HELM_GITLAB_CHART_NAME: "the-panter-chart",
-      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_a = deployConfig.additionalHelmArgs) !== null && _a !== void 0 ? _a : []), false).join(" "),
+      HELM_GITLAB_CHART_NAME: (_a = deployConfig.chartName) !== null && _a !== void 0 ? _a : "/helm-charts/the-panter-chart",
+      HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_b = deployConfig.additionalHelmArgs) !== null && _b !== void 0 ? _b : []), false).join(" "),
       COMPONENT_NAME: context.componentName,
-      BUILD_ID: (_b = context.commitInfo) === null || _b === void 0 ? void 0 : _b.buildId
+      BUILD_ID: (_c = context.commitInfo) === null || _c === void 0 ? void 0 : _c.buildId
     })
   };
   var baseDeploymentJob = (0, base_1.getBaseDeploymentJob)(context);

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

@@ -58,6 +58,9 @@ export declare const createKubeValues: (context: Context) => never[] | ({
       } | undefined;
     } | undefined;
     worker?: import("../types").KubernetesWorkerDef | undefined;
+    jobDefaults?: {
+      resources: import("../types").KubernetesResourcesDef;
+    } | undefined;
   }> | undefined;
 } & {
   cloudsql?: {

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

@@ -76,6 +76,9 @@ export declare const processSecretsAsFiles: <T extends {
       } | undefined;
     } | undefined;
     worker?: import("../types").KubernetesWorkerDef | undefined;
+    jobDefaults?: {
+      resources: import("../types").KubernetesResourcesDef;
+    } | undefined;
   }> | undefined;
   secretsFromOtherComponent?: {
     [envVar: string]: string;

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

@@ -1,3 +1,4 @@
+import type { GitlabJobImage } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
 import type { DeployConfigBase } from "./base";
 export declare type DeployConfigCustom = {
@@ -24,7 +25,7 @@ export declare type DeployConfigCustom = {
   /**
    * image to use
    */
-  jobImage?: string;
+  jobImage?: GitlabJobImage;
   /**
    * customize cache for the job
    */

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

@@ -8,11 +8,15 @@ export declare type DeployConfigCloudRunCloudSql = {
    */
   dbUser?: string;
   /**
-   * the prefix of the database, the full db name is this plus the environment slug
+   * the prefix of the database, the full db name is this plus the environment slug prefix plus the componentName
    *
    * defaults to customerName-appName
    */
   dbNamePrefix?: string | false;
+  /**
+   * the base name of the db, defaults to the componentName
+   */
+  dbBaseName?: string;
   /**
    * whether to delete the database if the environment is stopped
    * defaults to true for review envs, to false for every other environment
@@ -28,6 +32,7 @@ export declare type DeployConfigCloudRunCloudSql = {
     statement_cache_size?: number;
   };
 };
+declare type Memory = `${number}${"M" | "G" | "Mi" | "Gi"}`;
 export declare type DeployConfigCloudRunService = {
   /**
    * command / entrypoint, fallsback to buildConfig.startcommand
@@ -43,13 +48,17 @@ export declare type DeployConfigCloudRunService = {
    */
   maxInstances?: number;
   /**
-   * set to true for workers
+   * set to true to allways allocate cpu, e.g. for workers. Careful that this is expensive!
    */
   noCpuThrottling?: true;
   /**
    * whether to allow public access (defaults to true)
    */
   allowUnauthenticated?: boolean;
+  /**
+   * memory limit. Defaults to 512MB
+   */
+  memory?: Memory;
 };
 export declare type DeployConfigCloudRunJobBase = {
   /**

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

@@ -213,6 +213,12 @@ export declare type DeployConfigKubernetesValues = AllowUnknownProps<{
      * It has the same environment variables as the application and an additional IS_WORKER="true" variable
      */
     worker?: KubernetesWorkerDef;
+    /**
+     * kubernetes resources for jobs and cronjobs
+     */
+    jobDefaults?: {
+      resources: KubernetesResourcesDef;
+    };
   }>;
   /**
    * load secrets from other components.
@@ -257,5 +263,10 @@ export declare type DeployConfigKubernetes = {
    * values to configure the app
    */
   values?: DeployConfigKubernetesValues;
+  /**
+   * Custom Helm chart location.
+   * Not recommended to use.
+   */
+  chartName?: string;
 } & DeployConfigBase;
 export {};

package/dist/pipeline/createJobs.js

@@ -221,19 +221,14 @@ var getFullReferencedJobName = function (referencedJobName, componentName, env,
 var replaceReferences = function (job, componentName, env, allRawJobs) {
   var _a, _b, _c;
   var stage = job.envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
-  var needsFromNeeds = (_a = job.needs) === null || _a === void 0 ? void 0 : _a.map(function (n) {
+  var cleanedNeeds = __spreadArray(__spreadArray([], __read((_a = job.needs) !== null && _a !== void 0 ? _a : []), false), __read((_b = job.needsOtherComponent) !== null && _b !== void 0 ? _b : []), false);
+  var needs = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
+    var _a;
     return (0, lodash_1.isObject)(n) ? {
-      job: getFullReferencedJobName(n.job, componentName, env, allRawJobs),
+      job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allRawJobs),
       artifacts: n.artifacts
     } : getFullReferencedJobName(n, componentName, env, allRawJobs);
   });
-  var needsFromOtherComponents = (_b = job.needsOtherComponent) === null || _b === void 0 ? void 0 : _b.map(function (other) {
-    return {
-      artifacts: other.artifacts,
-      job: getFullReferencedJobName(other.job, other.componentName, env, allRawJobs)
-    };
-  });
-  var needs = __spreadArray(__spreadArray([], __read(needsFromNeeds !== null && needsFromNeeds !== void 0 ? needsFromNeeds : []), false), __read(needsFromOtherComponents !== null && needsFromOtherComponents !== void 0 ? needsFromOtherComponents : []), false);
   return __assign(__assign({}, job), {
     stage: stage,
     needs: needs,

package/dist/pipeline/gitlab/makeGitlabJob.js

@@ -18,6 +18,37 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
+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.makeGitlabJob = void 0;
 var lodash_1 = require("lodash");
@@ -34,9 +65,9 @@ var makeGitlabJob = function (_a) {
     rest = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
   return __assign(__assign({}, rest), {
     // sort in a predictable manner for snapshot tests
-    needs: needs === null || needs === void 0 ? void 0 : needs.sort(function (a, b) {
+    needs: needs ? __spreadArray([], __read(needs), false).sort(function (a, b) {
       return getJobName(a).localeCompare(getJobName(b));
-    }),
+    }) : undefined,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   });