@catladder/cli 0.0.0-fix-cloud-run-instance-number-619b31f2 → 0.0.0-hidden-secrets-da086bf2

package/dist/bundles/catenv/index.js

@@ -38892,6 +38892,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: {
@@ -39052,18 +39053,22 @@ var requiresDockerBuild = function (context) {
   return false;
 };
 exports.requiresDockerBuild = requiresDockerBuild;
+var getDockerBaseVariables = function () {
+  return {
+    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_TLS_CERTDIR: "",
+    DOCKER_DRIVER: "overlay2",
+    DOCKER_BUILDKIT: "1"
+  };
+};
 var getDockerBuildVariables = function (context) {
   var _a, _b, _c, _d;
-  return __assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
-    DOCKER_BUILDKIT: "1",
+  return __assign(__assign(__assign(__assign({}, DOCKER_RUNNER_BUILD_VARIABLES), {
     DOCKERFILE_ADDITIONS: (_b = (_a = context.componentConfig.build.docker) === null || _a === void 0 ? void 0 : _a.additionsBegin) === null || _b === void 0 ? void 0 : _b.join("\n"),
     DOCKERFILE_ADDITIONS_END: (_d = (_c = context.componentConfig.build.docker) === null || _c === void 0 ? void 0 : _c.additionsEnd) === null || _d === void 0 ? void 0 : _d.join("\n"),
     APP_DIR: context.componentConfig.dir,
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
-    DOCKER_TLS_CERTDIR: "",
-    DOCKER_DIR: ".",
-    DOCKER_DRIVER: "overlay2"
-  }), (0, exports.getDockerImageVariables)(context));
+    DOCKER_DIR: "."
+  }), getDockerBaseVariables()), (0, exports.getDockerImageVariables)(context));
 };
 exports.getDockerBuildVariables = getDockerBuildVariables;
 exports.DOCKER_BUILD_JOB_NAME = "🔨 docker";
@@ -39074,7 +39079,7 @@ var getDockerJobBaseProps = function (context) {
       name: "docker:20-dind",
       command: ["--tls=false"]
     }],
-    variables: (0, exports.getDockerBuildVariables)(context)
+    variables: getDockerBaseVariables()
   };
 };
 exports.getDockerJobBaseProps = getDockerJobBaseProps;
@@ -39087,7 +39092,9 @@ var createDockerBuildJobBase = function (context, _a) {
     stage: "build"
   }, (0, exports.getDockerJobBaseProps)(context)), {
     script: script || []
-  }), def);
+  }), {
+    variables: (0, exports.getDockerBuildVariables)(context)
+  }, def);
 };
 exports.createDockerBuildJobBase = createDockerBuildJobBase;
 exports.gitlabDockerLogin = "docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY";
@@ -39173,7 +39180,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"
+        }
+      };
     }
   }
 };
@@ -39703,31 +39716,52 @@ 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__(1197);
 var docker_1 = __nccwpck_require__(3219);
 var createRailsBuildJobs = function (context) {
+  var _a, _b, _c;
+  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;
+  var packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
+    var _b = __read(_a, 2),
+      k = _b[0],
+      v = _b[1];
+    return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
+  }).join(" ");
   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, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : "")]
   })];
 };
 exports.createRailsBuildJobs = createRailsBuildJobs;
@@ -39851,9 +39885,8 @@ var createRailsTestJobs = function (context) {
   var bundlerCache = {
     key: {
       files: ["Gemfile.lock"],
-      prefix: "$CI_JOB_IMAGE" // a changed image might have different OS libraries which no longer work with the cached gems
+      prefix: "$CI_JOB_IMAGE"
     },
-
     paths: [bundlerCacheDir]
   };
   var auditJob = buildConfig.audit !== false ? __assign(__assign({
@@ -40074,7 +40107,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "fix-cloud-run-instance-number-619b31f2" || 0;
+exports.PIPELINE_IMAGE_TAG = "hidden-secrets-da086bf2" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -40269,6 +40302,7 @@ var getEnvironment = function (config, componentName, env, commitInfo) {
               url: url
             },
             fullName: envContext.fullName,
+            slugPrefix: envContext.environmentSlugPrefix,
             slug: envContext.environmentSlug,
             shortName: env,
             envVars: envVars,
@@ -40292,20 +40326,22 @@ exports.__esModule = true;
 exports.getEnvironmentContext = void 0;
 var getEnvConfig_1 = __nccwpck_require__(5706);
 var getEnvType_1 = __nccwpck_require__(4811);
-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,
@@ -40528,8 +40564,13 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
           }
           publicEnvVarsRaw = (_e = (_d = envConfigRaw.vars) === null || _d === void 0 ? void 0 : _d.public) !== null && _e !== void 0 ? _e : {};
           additionalSecretKeys = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].additionalSecretKeys(environmentContext) : [];
-          secretEnvVarKeys = __spreadArray(__spreadArray([], __read((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []), false), __read(additionalSecretKeys), false);
-          secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (key) {
+          secretEnvVarKeys = __spreadArray(__spreadArray([], __read(((_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.secret) !== null && _g !== void 0 ? _g : []).map(function (key) {
+            return {
+              key: key
+            };
+          })), false), __read(additionalSecretKeys), false);
+          secretEnvVars = Object.fromEntries(secretEnvVarKeys.map(function (_a) {
+            var key = _a.key;
             return [key, "$".concat((0, exports.getSecretVarName)(env, componentName, key))];
           }));
           legacyFromComponents = (_j = (_h = envConfigRaw.vars) === null || _h === void 0 ? void 0 : _h.fromComponents) !== null && _j !== void 0 ? _j : {};
@@ -41133,7 +41174,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,
@@ -41338,7 +41379,8 @@ var createGoogleCloudRunDeployJobs = function (context) {
     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": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
@@ -41508,15 +41550,15 @@ var jobName_1 = __nccwpck_require__(7311);
 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];
@@ -41525,7 +41567,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)
@@ -41548,7 +41590,15 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
     return {};
   },
   additionalSecretKeys: function (ctx) {
-    return __spreadArray([exports.GCLOUD_DEPLOY_CREDENTIALS_KEY], __read(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? ["DB_PASSWORD"] : []), false);
+    return __spreadArray([{
+      key: exports.GCLOUD_DEPLOY_CREDENTIALS_KEY,
+      hidden: true
+    }, {
+      key: exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
+      hidden: true
+    }], __read(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql ? [{
+      key: "DB_PASSWORD"
+    }] : []), false);
   },
   getAdditionalEnvVars: function (ctx) {
     var _a;
@@ -41946,7 +41996,11 @@ var additionalKubernetesSecretKeys = function (_a) {
     keys.push("POSTGRESQL_PASSWORD");
     keys.push("cloudsqlProxyCredentials");
   }
-  return keys;
+  return keys.map(function (key) {
+    return {
+      key: key
+    };
+  });
 };
 exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
 
@@ -42046,7 +42100,7 @@ var base_1 = __nccwpck_require__(9177);
 var types_1 = __nccwpck_require__(3109);
 var kubeValues_1 = __nccwpck_require__(1061);
 var createKubernetesDeployJobs = function (context) {
-  var _a, _b;
+  var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
   if (deployConfig === false) {
     return [];
@@ -42070,10 +42124,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);
@@ -42304,33 +42358,36 @@ var kubeEnv_1 = __nccwpck_require__(9449);
 var mongodb_1 = __nccwpck_require__(7601);
 var processSecretsAsFiles_1 = __nccwpck_require__(5187);
 var createAppConfig = function (context, application) {
-  var _a, _b, _c;
   if (application === false) {
     return {
       enabled: false
     };
   }
+  var _a = application !== null && application !== void 0 ? application : {},
+    healthRoute = _a.healthRoute,
+    command = _a.command,
+    rest = __rest(_a, ["healthRoute", "command"]);
   return (0, utils_1.mergeWithMergingArrays)({
     host: context.environment.host,
-    command: context.componentConfig.build.startCommand,
+    command: command !== null && command !== void 0 ? command : context.componentConfig.build.startCommand,
     livenessProbe: {
       httpGet: {
-        path: (_a = application === null || application === void 0 ? void 0 : application.healthRoute) !== null && _a !== void 0 ? _a : "__health"
+        path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health"
       }
     },
     readinessProbe: {
       httpGet: {
-        path: (_b = application === null || application === void 0 ? void 0 : application.healthRoute) !== null && _b !== void 0 ? _b : "__health"
+        path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health"
       }
     },
     startupProbe: {
       httpGet: {
-        path: (_c = application === null || application === void 0 ? void 0 : application.healthRoute) !== null && _c !== void 0 ? _c : "__health"
+        path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health"
       }
     }
   },
   // default
-  application // merge rest in
+  rest // merge rest in
   );
 };
 
@@ -42966,22 +43023,183 @@ exports.getBaseCommitInfo = getBaseCommitInfo;
 
 /***/ }),
 
-/***/ 8974:
+/***/ 7052:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "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 __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);
+      }
     }
-    return t;
-  };
-  return __assign.apply(this, arguments);
+    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;
+exports.createAllJobs = void 0;
+var config_1 = __nccwpck_require__(3138);
+var createJobsForComponent_1 = __nccwpck_require__(962);
+var createAllJobs = function (config, trigger) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b;
+    return __generator(this, function (_c) {
+      switch (_c.label) {
+        case 0:
+          _b = (_a = 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, componentName, env, trigger)];
+                            case 1:
+                              return [2 /*return*/, _a.concat([_b.sent()])];
+                          }
+                        });
+                      });
+                    }))];
+                  case 1:
+                    return [2 /*return*/, _a.concat([_c.apply(_b, [_d.sent()])])];
+                }
+              });
+            });
+          }))];
+        case 1:
+          return [2 /*return*/, _b.apply(_a, [_c.sent()])];
+      }
+    });
+  });
+};
+exports.createAllJobs = createAllJobs;
+
+/***/ }),
+
+/***/ 8974:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
 var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -43134,54 +43352,40 @@ var config_1 = __nccwpck_require__(3138);
 var rules_1 = __nccwpck_require__(2020);
 var runner_1 = __nccwpck_require__(5071);
 var jobs_1 = __nccwpck_require__(2339);
-var createJobs_1 = __nccwpck_require__(7726);
+var createAllJobs_1 = __nccwpck_require__(7052);
+var createGitlabJobs_1 = __nccwpck_require__(3920);
 var createChildPipeline = function (type, trigger, config) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var components, jobs, allEnvs, stages, pipeline;
-    return __generator(this, function (_a) {
-      switch (_a.label) {
+    var jobs, allEnvs, stages, pipeline;
+    var _a;
+    return __generator(this, function (_b) {
+      switch (_b.label) {
         case 0:
-          components = Object.keys(config.components);
-          return [4 /*yield*/, components.reduce(function (acc, componentName) {
-            return __awaiter(void 0, void 0, void 0, function () {
-              var envs, _a, _b;
-              return __generator(this, function (_c) {
-                switch (_c.label) {
-                  case 0:
-                    envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
-                    _a = [{}];
-                    return [4 /*yield*/, acc];
-                  case 1:
-                    _b = [__assign.apply(void 0, _a.concat([_c.sent()]))];
-                    return [4 /*yield*/, (0, createJobs_1.createJobs)(type, envs, config, componentName, trigger)];
-                  case 2:
-                    return [2 /*return*/, __assign.apply(void 0, _b.concat([_c.sent()]))];
-                }
-              });
-            });
-          }, Promise.resolve({}))];
+          return [4 /*yield*/, (0, createAllJobs_1.createAllJobs)(config, trigger)];
         case 1:
-          jobs = _a.sent();
+          jobs = _b.sent();
           allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
           stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
             return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
               return "".concat(baseStage, " ").concat(e);
             })), false);
           }, []);
-          if (type === "gitlab") {
-            pipeline = {
-              image: (0, runner_1.getRunnerImage)("jobs-default"),
-              variables: {
-                FF_USE_FASTZIP: "true"
-              },
-              workflow: {
-                rules: rules_1.RULES_ALWAYS
-              },
-              stages: stages,
-              jobs: jobs
-            };
-            return [2 /*return*/, pipeline];
-          }
+          if (!(type === "gitlab")) return [3 /*break*/, 3];
+          _a = {
+            image: (0, runner_1.getRunnerImage)("jobs-default"),
+            variables: {
+              FF_USE_FASTZIP: "true"
+            },
+            workflow: {
+              rules: rules_1.RULES_ALWAYS
+            },
+            stages: stages
+          };
+          return [4 /*yield*/, (0, createGitlabJobs_1.createGitlabJobs)(jobs)];
+        case 2:
+          pipeline = (_a.jobs = _b.sent(), _a);
+          return [2 /*return*/, pipeline];
+        case 3:
           throw new Error("".concat(type, " is not supported"));
       }
     });
@@ -43191,7 +43395,7 @@ exports.createChildPipeline = createChildPipeline;
 
 /***/ }),
 
-/***/ 7726:
+/***/ 962:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
@@ -43362,14 +43566,12 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 exports.__esModule = true;
-exports.createJobs = void 0;
+exports.createJobsForComponent = void 0;
 var lodash_1 = __nccwpck_require__(3255);
 var build_1 = __nccwpck_require__(3760);
 var context_1 = __nccwpck_require__(2041);
 var deploy_1 = __nccwpck_require__(223);
-var utils_1 = __nccwpck_require__(7461);
 var getCommitInfo_1 = __nccwpck_require__(5923);
-var makeGitlabJob_1 = __nccwpck_require__(5715);
 var packageManager_1 = __nccwpck_require__(9168);
 var injectDefaultVarsInCustomJobs = function (context, jobs) {
   return jobs.map(function (_a) {
@@ -43397,76 +43599,9 @@ var createRawJobs = function (context) {
   var customJobs = getCustomJobs(context);
   return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
 };
-var getFullJobName = function (name, componentName, env) {
-  if (env) {
-    return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
-  }
-  return "".concat(componentName, " ").concat(name);
-};
-var getFullReferencedJobName = function (referencedJobName, componentName, env, allRawJobs) {
-  var referencedJob = allRawJobs.find(function (j) {
-    return j.name === referencedJobName;
-  });
-  if (!referencedJob) {
-    throw new Error("unknown job referenced: " + referencedJobName);
-  }
-  var envToSet = referencedJob.envMode !== "none" ? env : null;
-  return getFullJobName(referencedJobName, componentName, envToSet);
-};
-// replaces references to other jobs with the full name
-// the full name contains the componentname and the env name (if any)
-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) {
-    return (0, lodash_1.isObject)(n) ? {
-      job: getFullReferencedJobName(n.job, 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,
-    environment: ((_c = job.environment) === null || _c === void 0 ? void 0 : _c.on_stop) ? __assign(__assign({}, job.environment), {
-      on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allRawJobs)
-    }) : job.environment
-  });
-};
-// this can be removed once https://gitlab.com/gitlab-org/gitlab/-/issues/220758 is resolved
-var addStageNeeds = function (jobs) {
-  // when a job defines needsStages, we add these as needs
-  return jobs.map(function (job) {
-    var _a;
-    if (!job.needsStages || job.needsStages.length === 0) {
-      return job;
-    }
-    var neededJobs = jobs.map(function (j) {
-      var _a, _b;
-      var neededStage = (_a = job.needsStages) === null || _a === void 0 ? void 0 : _a.find(function (s) {
-        return j.stage === s.stage;
-      });
-      if (neededStage) {
-        return {
-          job: j.name,
-          artifacts: (_b = neededStage.artifacts) !== null && _b !== void 0 ? _b : false
-        };
-      }
-    }).filter(utils_1.notNil);
-    return __assign(__assign({}, job), {
-      needs: __spreadArray(__spreadArray([], __read((_a = job.needs) !== null && _a !== void 0 ? _a : []), false), __read(neededJobs), false)
-    });
-  });
-};
-var createJobs = function (type, envs, config, componentName, trigger) {
+var createJobsForComponent = function (config, componentName, env, trigger) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var commitInfo, _a, packageManagerInfo;
+    var commitInfo, _a, packageManagerInfo, context;
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
@@ -43479,47 +43614,19 @@ var createJobs = function (type, envs, config, componentName, trigger) {
           return [4 /*yield*/, (0, packageManager_1.getPackageManagerInfo)(config, componentName)];
         case 2:
           packageManagerInfo = _b.sent();
-          return [2 /*return*/, envs.reduce(function (acc, env) {
-            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];
-                }
-              });
-            });
-          }, {})];
+          return [4 /*yield*/, (0, context_1.createContext)(config, componentName, env, commitInfo, packageManagerInfo)];
+        case 3:
+          context = _b.sent();
+          return [2 /*return*/, createRawJobs(context)];
       }
     });
   });
 };
-exports.createJobs = createJobs;
+exports.createJobsForComponent = createJobsForComponent;
 
 /***/ }),
 
-/***/ 5715:
+/***/ 3920:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
@@ -43535,6 +43642,121 @@ 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 (_) 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];
@@ -43543,30 +43765,131 @@ 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;
+exports.createGitlabJobs = exports.makeGitlabJob = void 0;
 var lodash_1 = __nccwpck_require__(3255);
 var defaults_1 = __nccwpck_require__(7383);
+var getFullJobName = function (name, componentName, env) {
+  if (env) {
+    return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
+  }
+  return "".concat(componentName, " ").concat(name);
+};
+var getFullReferencedJobName = function (referencedJobName, componentName, env, allJobs) {
+  var _a, _b;
+  var referencedJob = (_b = (_a = allJobs[componentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.find(function (j) {
+    return j.name === referencedJobName;
+  });
+  if (!referencedJob) {
+    throw new Error("unknown job referenced: '".concat(referencedJobName, "' from '").concat(env, ":").concat(componentName, "'"));
+  }
+  var envToSet = referencedJob.envMode !== "none" ? env : null;
+  return getFullJobName(referencedJobName, componentName, envToSet);
+};
 var getJobName = function (need) {
   return (0, lodash_1.isObject)(need) ? need.job : need;
 };
-var makeGitlabJob = function (_a) {
+var makeGitlabJob = function (componentName, env, _a, allJobs) {
+  var _b;
   var envMode = _a.envMode,
     needsStages = _a.needsStages,
     needsOtherComponent = _a.needsOtherComponent,
     name = _a.name,
     needs = _a.needs,
-    rest = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
-  return __assign(__assign({}, rest), {
+    job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
+  var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
+  var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
+    var _a, _b, _c, _d;
+    var referencedComponentName = componentName;
+    var allJobNamesFromThatStage = (_d = (_c = (_b = (_a = allJobs[referencedComponentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) {
+      return j.stage === n.stage;
+    })) === null || _c === void 0 ? void 0 : _c.map(function (j) {
+      return j.name;
+    })) !== null && _d !== void 0 ? _d : [];
+    return allJobNamesFromThatStage.map(function (job) {
+      var _a;
+      return {
+        job: job,
+        artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
+        componentName: referencedComponentName
+      };
+    });
+  });
+  var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false), __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false);
+  var gitlabNeeds = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
+    var _a;
+    return (0, lodash_1.isObject)(n) ? {
+      job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
+      artifacts: n.artifacts
+    } : getFullReferencedJobName(n, componentName, env, allJobs);
+  }).sort(function (a, b) {
+    return getJobName(a).localeCompare(getJobName(b));
+  });
+  var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
+  var gitlabJob = __assign(__assign({}, job), {
+    stage: stage,
+    environment: ((_b = job.environment) === null || _b === void 0 ? void 0 : _b.on_stop) ? __assign(__assign({}, job.environment), {
+      on_stop: getFullReferencedJobName(job.environment.on_stop, componentName, env, allJobs)
+    }) : job.environment,
     // sort in a predictable manner for snapshot tests
-    needs: needs === null || needs === void 0 ? void 0 : needs.sort(function (a, b) {
-      return getJobName(a).localeCompare(getJobName(b));
-    }),
+    needs: gitlabNeeds,
     retry: defaults_1.BASE_RETRY,
     interruptible: true
   });
+  return [fullJobName, gitlabJob];
 };
 exports.makeGitlabJob = makeGitlabJob;
+var createGitlabJobs = function (allJobs) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+      return [2 /*return*/, Object.keys(allJobs).reduce(function (accForComponents, componentName) {
+        var componentJobs = allJobs[componentName];
+        return __assign(__assign({}, accForComponents), Object.keys(componentJobs).reduce(function (accForEnvs, env) {
+          var jobs = componentJobs[env];
+          return __assign(__assign({}, accForEnvs), jobs.reduce(function (accForJobs, job) {
+            var _a;
+            var _b = __read((0, exports.makeGitlabJob)(componentName, env, job, allJobs), 2),
+              fullJobName = _b[0],
+              gitlabJob = _b[1];
+            return __assign(__assign({}, accForJobs), (_a = {}, _a[fullJobName] = gitlabJob, _a));
+          }, {}));
+        }, {}));
+      }, {})];
+    });
+  });
+};
+exports.createGitlabJobs = createGitlabJobs;
 
 /***/ }),
 
@@ -43593,7 +43916,7 @@ var __exportStar = this && this.__exportStar || function (m, exports) {
 };
 exports.__esModule = true;
 __exportStar(__nccwpck_require__(8974), exports);
-__exportStar(__nccwpck_require__(7726), exports);
+__exportStar(__nccwpck_require__(962), exports);
 
 /***/ }),