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

package/dist/build/custom/buildJob.js

@@ -64,6 +64,7 @@ var createCustomBuildJobs = function (context) {
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     image: buildConfig.jobImage,
     variables: __assign({}, RUNNER_BUILD_VARIABLES),
+    cache: buildConfig.jobCache,
     services: buildConfig.jobServices,
     script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
     artifacts: {

package/dist/build/index.js

@@ -65,7 +65,13 @@ exports.BUILD_TYPES = {
   rails: {
     jobs: rails_1.createRailsJobs,
     defaults: function () {
-      return {};
+      return {
+        startCommand: "/cnb/process/web",
+        cnbBuilder: {
+          image: "heroku/buildpacks:20",
+          packVersion: "0.28.0"
+        }
+      };
     }
   }
 };

package/dist/build/rails/build.js

@@ -1,30 +1,55 @@
 "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];
+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 t;
-  };
-  return __assign.apply(this, arguments);
+  }
+  return ar;
 };
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
+var types_1 = require("../types");
 var docker_1 = require("../docker");
 var createRailsBuildJobs = function (context) {
+  var _a, _b, _c, _d, _e, _f;
+  var buildConfig = context.componentConfig.build;
+  if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
+    // should not happen
+    throw new Error("build type is not rails");
+  }
+  var cnbConf = buildConfig.cnbBuilder;
+  // backwards compatabilty with CNB_ENV_VARS
+  // TODO: remove when all projects are migrated
+  var packEnvArgs = (_c = (_b = (_a = buildConfig.extraVars) === null || _a === void 0 ? void 0 : _a.CNB_ENV_VARS) === null || _b === void 0 ? void 0 : _b.split(" ").map(function (v) {
+    return "--env '".concat(v, "'");
+  })) !== null && _c !== void 0 ? _c : Object.entries((_d = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+      k = _b[0],
+      v = _b[1];
+    return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
+  });
   return [(0, docker_1.createDockerBuildJobBase)(context, {
-    variables: __assign({
-      CNB_BUILDER: "heroku/buildpacks:18",
-      CNB_ENV_VARS: "BUNDLE_GIT__PANTER__CH",
-      CNB_EXTRA_ARGS: "",
-      CNB_PACK_VERSION: "0.20.0"
-    }, context.componentConfig.build.extraVars),
+    variables: context.componentConfig.build.extraVars,
     // custom script
-    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v$CNB_PACK_VERSION/pack-v$CNB_PACK_VERSION-linux.tgz | tar -zx --directory /usr/local/bin pack", "chmod +x /usr/local/bin/pack",
+    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
     //  replace private git ssh gem sources with https to make bundler with credentials via env var work
-    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "for v in $CNB_ENV_VARS; do env_args=\"$env_args --env $v\"; done", "pack build $DOCKER_IMAGE:$DOCKER_IMAGE_TAG --builder $CNB_BUILDER --publish --cache-image $DOCKER_CACHE_IMAGE $env_args $CNB_EXTRA_ARGS"]
+    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs.join(" "), " ").concat((_f = (_e = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _e === void 0 ? void 0 : _e.join(" ")) !== null && _f !== void 0 ? _f : "")]
   })];
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;

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

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

package/dist/build/types.d.ts

@@ -1,4 +1,5 @@
-import type { GitlabJobService } from "../types";
+import type { GitlabJobImage, GitlabJobService } from "../types";
+import type { CatladderJob } from "../types/jobs";
 export declare type BuildConfigBase = {
   /**
    * command to run on the image to start the app (e.g. yarn start)
@@ -24,21 +25,21 @@ export declare type BuildConfigBase = {
    */
   lint?: false | {
     command?: string | string[];
-    jobImage?: string;
+    jobImage?: GitlabJobImage;
   };
   /**
    * customize test, set false to disable
    */
   test?: false | {
     command?: string | string[];
-    jobImage?: string;
+    jobImage?: GitlabJobImage;
   };
   /**
    * customize audit, set false to disable
    */
   audit?: false | {
     command?: string | string[];
-    jobImage?: string;
+    jobImage?: GitlabJobImage;
   };
   /**
    * additional paths for artifacts,
@@ -91,9 +92,40 @@ export declare type BuildConfigCustom = BuildConfigBase & {
   jobImage: string;
   jobServices?: GitlabJobService[];
   docker: BuildConfigCustomDocker;
+  /**
+   * customize cache for the job
+   */
+  jobCache?: CatladderJob["cache"];
 };
 export declare type BuildConfigRails = BuildConfigBase & {
   type: "rails";
+  cnbBuilder?: {
+    /**
+     * The Cloud Native Buildpacks builder image to use.
+     * See e.g. https://github.com/heroku/builder or others.
+     * Default: heroku/buildpacks:20
+     */
+    image?: string;
+    /**
+     * The version of the Cloud Native Buildpacks pack command to use.
+     * See https://buildpacks.io/docs/tools/pack/
+     * Default: 0.28.0
+     */
+    packVersion?: string;
+    /**
+     * Additional command arguments passed to the pack command.
+     * See https://buildpacks.io/docs/tools/pack/
+     */
+    packExtraArgs?: string[];
+    /**
+     * Variables needed for Bundler and Rails asset precompilation.
+     *
+     * Specify a key with the value `undefined` to inherit it from the EnvVars.
+     *
+     * See https://github.com/rails/rails/issues/32947
+     */
+    buildVars?: Record<string, string | undefined>;
+  };
 };
 export declare type BuildConfigStorybook = BuildConfigNodeBase & {
   type: "storybook";

package/dist/bundles/catladder-gitlab/index.js

@@ -27071,6 +27071,7 @@ var createCustomBuildJobs = function (context) {
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     image: buildConfig.jobImage,
     variables: __assign({}, RUNNER_BUILD_VARIABLES),
+    cache: buildConfig.jobCache,
     services: buildConfig.jobServices,
     script: __spreadArray([], __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
     artifacts: {
@@ -27352,7 +27353,13 @@ exports.BUILD_TYPES = {
   rails: {
     jobs: rails_1.createRailsJobs,
     defaults: function () {
-      return {};
+      return {
+        startCommand: "/cnb/process/web",
+        cnbBuilder: {
+          image: "heroku/buildpacks:20",
+          packVersion: "0.28.0"
+        }
+      };
     }
   }
 };
@@ -27882,31 +27889,56 @@ exports.getYarnInstall = getYarnInstall;
 "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];
+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 t;
-  };
-  return __assign.apply(this, arguments);
+  }
+  return ar;
 };
 exports.__esModule = true;
 exports.createRailsBuildJobs = void 0;
+var types_1 = __nccwpck_require__(6575);
 var docker_1 = __nccwpck_require__(9953);
 var createRailsBuildJobs = function (context) {
+  var _a, _b, _c, _d, _e, _f;
+  var buildConfig = context.componentConfig.build;
+  if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
+    // should not happen
+    throw new Error("build type is not rails");
+  }
+  var cnbConf = buildConfig.cnbBuilder;
+  // backwards compatabilty with CNB_ENV_VARS
+  // TODO: remove when all projects are migrated
+  var packEnvArgs = (_c = (_b = (_a = buildConfig.extraVars) === null || _a === void 0 ? void 0 : _a.CNB_ENV_VARS) === null || _b === void 0 ? void 0 : _b.split(" ").map(function (v) {
+    return "--env '".concat(v, "'");
+  })) !== null && _c !== void 0 ? _c : Object.entries((_d = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+      k = _b[0],
+      v = _b[1];
+    return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
+  });
   return [(0, docker_1.createDockerBuildJobBase)(context, {
-    variables: __assign({
-      CNB_BUILDER: "heroku/buildpacks:18",
-      CNB_ENV_VARS: "BUNDLE_GIT__PANTER__CH",
-      CNB_EXTRA_ARGS: "",
-      CNB_PACK_VERSION: "0.20.0"
-    }, context.componentConfig.build.extraVars),
+    variables: context.componentConfig.build.extraVars,
     // custom script
-    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v$CNB_PACK_VERSION/pack-v$CNB_PACK_VERSION-linux.tgz | tar -zx --directory /usr/local/bin pack", "chmod +x /usr/local/bin/pack",
+    script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_CACHE_IMAGE || true", "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"), "chmod +x /usr/local/bin/pack",
     //  replace private git ssh gem sources with https to make bundler with credentials via env var work
-    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "for v in $CNB_ENV_VARS; do env_args=\"$env_args --env $v\"; done", "pack build $DOCKER_IMAGE:$DOCKER_IMAGE_TAG --builder $CNB_BUILDER --publish --cache-image $DOCKER_CACHE_IMAGE $env_args $CNB_EXTRA_ARGS"]
+    "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock", "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs.join(" "), " ").concat((_f = (_e = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _e === void 0 ? void 0 : _e.join(" ")) !== null && _f !== void 0 ? _f : "")]
   })];
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;
@@ -28318,7 +28350,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-27052869" || 0;
+exports.PIPELINE_IMAGE_TAG = "refactor-needs-aae6e67d" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -28513,6 +28545,7 @@ var getEnvironment = function (config, componentName, env, commitInfo) {
               url: url
             },
             fullName: envContext.fullName,
+            slugPrefix: envContext.environmentSlugPrefix,
             slug: envContext.environmentSlug,
             shortName: env,
             envVars: envVars,
@@ -28536,20 +28569,22 @@ exports.__esModule = true;
 exports.getEnvironmentContext = void 0;
 var getEnvConfig_1 = __nccwpck_require__(1691);
 var getEnvType_1 = __nccwpck_require__(2187);
-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,
@@ -28785,7 +28820,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) {
@@ -28794,7 +28829,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];
                 }
               });
             });
@@ -29242,7 +29277,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];
@@ -29375,7 +29412,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,
@@ -29576,19 +29613,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` 🤦
@@ -29749,15 +29788,15 @@ var jobName_1 = __nccwpck_require__(9357);
 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];
@@ -29766,7 +29805,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)
@@ -29792,11 +29831,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],
@@ -29861,7 +29901,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;
@@ -30281,7 +30326,7 @@ var base_1 = __nccwpck_require__(1188);
 var types_1 = __nccwpck_require__(4436);
 var kubeValues_1 = __nccwpck_require__(2830);
 var createKubernetesDeployJobs = function (context) {
-  var _a, _b;
+  var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
   if (deployConfig === false) {
     return [];
@@ -30305,10 +30350,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);
@@ -31653,19 +31698,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,
@@ -31778,6 +31818,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 = __nccwpck_require__(3255);
@@ -31794,9 +31865,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
   });

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "refactor-gcloud-api-27052869" || "";
+exports.PIPELINE_IMAGE_TAG = "refactor-needs-aae6e67d" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/context/__tests__/resolveReferences.test.js

@@ -136,11 +136,10 @@ describe("resolveReferences", function () {
                 FOO: "foo from frontend"
               }
             };
-            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
               return __awaiter(void 0, void 0, void 0, function () {
-                var _a;
-                return __generator(this, function (_b) {
-                  return [2 /*return*/, (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]];
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
                 });
               });
             })];
@@ -194,11 +193,10 @@ describe("resolveReferences", function () {
                 FOO: "foo from api"
               }
             };
-            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
               return __awaiter(void 0, void 0, void 0, function () {
-                var _a;
-                return __generator(this, function (_b) {
-                  return [2 /*return*/, (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]];
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
                 });
               });
             })];
@@ -225,11 +223,10 @@ describe("resolveReferences", function () {
               b: "a not found value looks like this: '${api:FOO}'"
             };
             otherVariables = {};
-            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
               return __awaiter(void 0, void 0, void 0, function () {
-                var _a;
-                return __generator(this, function (_b) {
-                  return [2 /*return*/, (_a = otherVariables[componentName]) === null || _a === void 0 ? void 0 : _a[variableName]];
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
                 });
               });
             })];
@@ -262,11 +259,10 @@ describe("resolveReferences", function () {
                 FOO: "hi, ${api:FOO}"
               }
             };
-            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
               return __awaiter(void 0, void 0, void 0, function () {
-                var _a, _b;
-                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 : ""];
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
                 });
               });
             })];
@@ -298,11 +294,10 @@ describe("resolveReferences", function () {
                 FOO: "frontend ${api:FOO}"
               }
             };
-            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName, variableName) {
+            return [4 /*yield*/, (0, resolveReferences_1.resolveReferences)(variables, function (componentName) {
               return __awaiter(void 0, void 0, void 0, function () {
-                var _a, _b;
-                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 : ""];
+                return __generator(this, function (_a) {
+                  return [2 /*return*/, otherVariables[componentName]];
                 });
               });
             })];

package/dist/context/getEnvironment.js

@@ -139,6 +139,7 @@ var getEnvironment = function (config, componentName, env, commitInfo) {
               url: url
             },
             fullName: envContext.fullName,
+            slugPrefix: envContext.environmentSlugPrefix,
             slug: envContext.environmentSlug,
             shortName: env,
             envVars: envVars,