@catladder/pipeline 1.153.0 → 1.154.0

package/dist/deploy/cloudRun/artifactsRegistry.js

@@ -71,14 +71,14 @@ var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
     throw new Error("lecacyReviewImageName is only allowed for review app");
   }
   var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
-  var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.reviewSlug && !lecacyReviewImageName ? [context.environment.reviewSlug] : []), false);
+  var gcloudImagePath = __spreadArray([dockerUrl, context.env, context.name], __read(context.environment.reviewSlug && !lecacyReviewImageName ? [context.environment.reviewSlug] : []), false);
   return (0, BashExpression_1.joinBashExpressions)(gcloudImagePath, "/");
 };
 exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
 var getArtifactsRegistryBuildCacheImage = function (context) {
   var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
   // does not include env, so that after merge, you might get more cache hits (review-->dev)
-  var gcloudImagePath = [dockerUrl, "caches", context.componentName];
+  var gcloudImagePath = [dockerUrl, "caches", context.name];
   return gcloudImagePath.join("/");
 };
 exports.getArtifactsRegistryBuildCacheImage = getArtifactsRegistryBuildCacheImage;

package/dist/deploy/cloudRun/createJobs/common.d.ts

@@ -1,16 +1,16 @@
-import type { Context } from "../../../types/context";
+import type { ComponentContext } from "../../../types/context";
 import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
 export declare const gcloudCmd: (version?: "beta") => string;
 export declare const gcloudRunCmd: (version?: "beta") => string;
 export declare const gcloudSchedulerCmd: (version?: "beta") => string;
 export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCloudRun) => string[];
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
-export declare const getCloudRunDeployConfig: (context: Context) => DeployConfigCloudRun;
-export declare function getCommonCloudRunArgs(context: Context): {
+export declare const getCloudRunDeployConfig: (context: ComponentContext) => DeployConfigCloudRun;
+export declare function getCommonCloudRunArgs(context: ComponentContext): {
   project: string;
   region: import("../../types").Gcloudregion;
 };
-export declare function getCommonDeployArgs(context: Context): {
+export declare function getCommonDeployArgs(context: ComponentContext): {
   "set-cloudsql-instances": string | undefined;
   project: string;
   region: import("../../types").Gcloudregion;

package/dist/deploy/cloudRun/index.d.ts

@@ -1,4 +1,4 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigCloudRun, DeployTypeDefinition } from "..";
 export declare const GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 export declare const GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
-export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun">;
+export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCloudRun>;

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

@@ -1,2 +1,2 @@
-import type { DeployTypeDefinition } from "..";
-export declare const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<"custom">;
+import type { DeployConfigCustom, DeployTypeDefinition } from "..";
+export declare const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCustom>;

package/dist/deploy/dockerTag/index.d.ts

@@ -1,2 +1,2 @@
-import type { DeployTypeDefinition } from "..";
-export declare const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<"dockerTag">;
+import type { DeployConfigDockerTag, DeployTypeDefinition } from "..";
+export declare const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigDockerTag>;

package/dist/deploy/index.d.ts

@@ -1,19 +1,19 @@
-import type { SecretEnvVar } from "..";
+import type { BuildConfig, SecretEnvVar } from "..";
 import type { BashExpression } from "../bash/BashExpression";
 import type { ComponentContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { PartialDeep } from "../types/utils";
-import type { DeployConfigGeneric, DeployConfigType } from "./types";
+import type { DeployConfig, DeployConfigGeneric, DeployConfigType } from "./types";
 export * from "./cloudRun";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
-export type DeployTypeDefinition<T extends DeployConfigType> = {
+export type DeployTypeDefinition<D extends DeployConfig> = {
   jobs: (context: ComponentContext) => CatladderJob[];
-  defaults: (envContext: EnvironmentContext<any, T>) => PartialDeep<DeployConfigGeneric<T>>;
-  additionalSecretKeys: (envContext: EnvironmentContext<any, T>) => SecretEnvVar[];
-  getAdditionalEnvVars: (envContext: EnvironmentContext<any, T>) => Record<string, string | BashExpression | undefined | null>;
+  defaults: (envContext: EnvironmentContext<BuildConfig, D>) => PartialDeep<D>;
+  additionalSecretKeys: (envContext: EnvironmentContext<BuildConfig, D>) => SecretEnvVar[];
+  getAdditionalEnvVars: (envContext: EnvironmentContext<BuildConfig, D>) => Record<string, string | BashExpression | undefined | null>;
 };
-export type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<T> };
+export type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<DeployConfigGeneric<T>> };
 export declare const DEPLOY_TYPES: DeployTypes;

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

@@ -1,6 +1,8 @@
+import type { BuildConfig } from "../../build";
 import type { EnvironmentContext } from "../../types/environmentContext";
+import type { DeployConfigKubernetes } from "../types";
 export declare const additionalKubernetesSecretKeys: ({
   deployConfigRaw
-}: EnvironmentContext<any, "kubernetes">) => {
+}: EnvironmentContext<BuildConfig, DeployConfigKubernetes>) => {
   key: string;
 }[];

package/dist/deploy/kubernetes/cloudSql/index.js

@@ -45,7 +45,7 @@ var createKubernetesCloudsqlBaseValues = function (context) {
         dbUser: (_g = config.dbUser) !== null && _g !== void 0 ? _g : "postgres",
         instanceConnectionName: config.instanceConnectionName,
         proxyCredentials: proxyCredentials,
-        fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)
+        fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.name)
       }
     };
   } else {

package/dist/deploy/kubernetes/deployJob.js

@@ -74,10 +74,10 @@ var createKubernetesDeployJobs = function (context) {
     variables: __assign(__assign({}, context.environment.envVars), {
       RELEASE_NAME: context.environment.fullName,
       HELM_EXPERIMENTAL_OCI: "1",
-      KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.componentName),
+      KUBE_DOCKER_IMAGE_PULL_SECRET: "gitlab-registry-".concat(context.name),
       HELM_GITLAB_CHART_NAME: (_b = deployConfig.chartName) !== null && _b !== void 0 ? _b : "/helm-charts/the-panter-chart",
       HELM_ARGS: __spreadArray(__spreadArray([], __read(deployConfig.debug ? ["--debug"] : []), false), __read((_c = deployConfig.additionalHelmArgs) !== null && _c !== void 0 ? _c : []), false).join(" "),
-      COMPONENT_NAME: context.componentName,
+      COMPONENT_NAME: context.name,
       /** @deprecated */
       BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID
     })

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

@@ -1,3 +1,3 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigKubernetes, DeployTypeDefinition } from "..";
 export * from "./cloudSql";
-export declare const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<"kubernetes">;
+export declare const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigKubernetes>;

package/dist/deploy/sbom.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentContext } from "../types/context";
+import { type ComponentContext } from "../types/context";
 export declare const sbomDeactivated: (context: ComponentContext) => boolean;
 export declare const getDependencyTrackUploadScript: (context: ComponentContext) => string[];
 export declare const getDependencyTrackDeleteScript: (context: ComponentContext) => string[];

package/dist/deploy/sbom.js

@@ -5,15 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript = exports.sbomDeactivated = void 0;
 var sbom_1 = require("../build/sbom");
+var context_1 = require("../types/context");
 var sbomDeactivated = function (context) {
-  return context.build.config.type === "custom" && context.build.config.sbom === false;
+  return (0, context_1.componentContextIsStandaloneBuild)(context) && context.build.config.type === "custom" && context.build.config.sbom === false;
 };
 exports.sbomDeactivated = sbomDeactivated;
 var getDependencyTrackUploadScript = function (context) {
-  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Uploading SBOM to Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true")];
+  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Uploading SBOM to Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" upload \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat(context.environment.url, "\" \"").concat(sbom_1.SBOM_FILE, "\" vex.json || true")];
 };
 exports.getDependencyTrackUploadScript = getDependencyTrackUploadScript;
 var getDependencyTrackDeleteScript = function (context) {
-  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Disabling component in Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.componentName, "\" \"").concat(context.environment.url, "\" || true")];
+  return (0, exports.sbomDeactivated)(context) ? [] : ["echo 'Disabling component in Dependency Track'", "/dtrackuploader https://dep.panter.swiss/ \"$DT_KEY_PROD\" disable \"".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "/").concat(context.name, "\" \"").concat(context.environment.url, "\" || true")];
 };
 exports.getDependencyTrackDeleteScript = getDependencyTrackDeleteScript;

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

@@ -11,12 +11,12 @@ export type DeployConfigType = DeployConfig["type"];
 export type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
   type: T;
 }>;
-export declare const isOfDeployType: <T extends ("kubernetes" | "custom" | "google-cloudrun" | "dockerTag")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigKubernetes, {
+export declare const isOfDeployType: <T extends ("custom" | "dockerTag" | "google-cloudrun" | "kubernetes")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigCustom, {
   type: T[number];
-}> | Extract<DeployConfigCustom, {
+}> | Extract<DeployConfigDockerTag, {
   type: T[number];
 }> | Extract<DeployConfigCloudRun, {
   type: T[number];
-}> | Extract<DeployConfigDockerTag, {
+}> | Extract<DeployConfigKubernetes, {
   type: T[number];
 }>;

package/dist/pipeline/createAllJobs.d.ts

@@ -1,16 +1,18 @@
-import type { ComponentContext, Config, PipelineTrigger, PipelineType } from "../types";
+import type { CreateAllComponentsContextProps } from "../context/createAllComponentsContext";
+import type { ComponentContext, WorkspaceContext } from "../types";
 import type { CatladderJob } from "../types/jobs";
-export type AllCatladderJobs = Array<{
-  context: ComponentContext;
-  jobs: Array<CatladderJob>;
-}>;
-export type AllJobsContext = {
-  config: Config;
-  trigger: PipelineTrigger;
-  pipelineType: PipelineType;
+export type AllCatladderJobs = {
+  workspaces: Array<{
+    context: WorkspaceContext;
+    jobs: Array<CatladderJob>;
+  }>;
+  components: Array<{
+    context: ComponentContext;
+    jobs: Array<CatladderJob>;
+  }>;
 };
 export declare const createAllJobs: ({
   config,
   trigger,
   pipelineType
-}: AllJobsContext) => Promise<AllCatladderJobs>;
+}: CreateAllComponentsContextProps) => Promise<AllCatladderJobs>;

package/dist/pipeline/createAllJobs.js

@@ -115,77 +115,120 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
+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));
+};
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createAllJobs = void 0;
-var config_1 = require("../config");
-var context_1 = require("../context");
+var createAllComponentsContext_1 = require("../context/createAllComponentsContext");
+var createWorkspaceContext_1 = require("../context/createWorkspaceContext");
+var types_1 = require("../types");
 var createJobsForComponent_1 = require("./createJobsForComponent");
-var createAllComponentContext = function (_a) {
-  return __awaiter(void 0, [_a], void 0, function (_b) {
-    var config = _b.config,
-      trigger = _b.trigger,
-      pipelineType = _b.pipelineType;
-    return __generator(this, function (_c) {
-      switch (_c.label) {
-        case 0:
-          return [4 /*yield*/, Promise.all(Object.keys(config.components).flatMap(function (componentName) {
-            var envs = (0, config_1.getAllEnvsByTrigger)(config, componentName, trigger);
-            return envs.map(function (env) {
-              return __awaiter(void 0, void 0, void 0, function () {
-                var context;
-                return __generator(this, function (_a) {
-                  switch (_a.label) {
-                    case 0:
-                      return [4 /*yield*/, (0, context_1.createComponentContext)({
-                        config: config,
-                        componentName: componentName,
-                        env: env,
-                        trigger: trigger,
-                        pipelineType: pipelineType
-                      })];
-                    case 1:
-                      context = _a.sent();
-                      return [2 /*return*/, {
-                        env: env,
-                        componentName: componentName,
-                        context: context
-                      }];
-                  }
-                });
-              });
-            });
-          }))];
-        case 1:
-          return [2 /*return*/, _c.sent()];
-      }
-    });
-  });
-};
+var createJobsForWorkspace_1 = require("./createJobsForWorkspace");
 var createAllJobs = function (_a) {
   return __awaiter(void 0, [_a], void 0, function (_b) {
-    var allComponentContext;
+    var allComponentsContext;
+    var _c;
+    var _d;
     var config = _b.config,
       trigger = _b.trigger,
       pipelineType = _b.pipelineType;
-    return __generator(this, function (_c) {
-      switch (_c.label) {
+    return __generator(this, function (_e) {
+      switch (_e.label) {
         case 0:
-          return [4 /*yield*/, createAllComponentContext({
+          return [4 /*yield*/, (0, createAllComponentsContext_1.createAllComponentsContext)({
             config: config,
             trigger: trigger,
             pipelineType: pipelineType
           })];
         case 1:
-          allComponentContext = _c.sent();
-          return [2 /*return*/, allComponentContext.map(function (_a) {
-            var context = _a.context;
+          allComponentsContext = _e.sent();
+          _c = {};
+          return [4 /*yield*/, Promise.all(Object.keys((_d = config.builds) !== null && _d !== void 0 ? _d : {}).map(function (workspaceName) {
+            return __awaiter(void 0, void 0, void 0, function () {
+              var componentsInAllEnvs, allEnvs;
+              return __generator(this, function (_a) {
+                switch (_a.label) {
+                  case 0:
+                    componentsInAllEnvs = allComponentsContext.filter(function (context) {
+                      return (0, types_1.componentContextHasWorkspaceBuild)(context) && context.build.workspaceName === workspaceName;
+                    });
+                    allEnvs = __spreadArray([], __read(new Set(componentsInAllEnvs.map(function (_a) {
+                      var env = _a.env;
+                      return env;
+                    }))), false);
+                    return [4 /*yield*/, Promise.all(allEnvs.map(function (env) {
+                      return __awaiter(void 0, void 0, void 0, function () {
+                        var workspaceContext;
+                        return __generator(this, function (_a) {
+                          switch (_a.label) {
+                            case 0:
+                              return [4 /*yield*/, (0, createWorkspaceContext_1.createWorkspaceContext)({
+                                components: componentsInAllEnvs.filter(function (_a) {
+                                  var componentEnv = _a.env;
+                                  return componentEnv === env;
+                                }),
+                                workspaceName: workspaceName,
+                                config: config,
+                                trigger: trigger,
+                                pipelineType: pipelineType,
+                                env: env
+                              })];
+                            case 1:
+                              workspaceContext = _a.sent();
+                              return [2 /*return*/, {
+                                context: workspaceContext,
+                                jobs: (0, createJobsForWorkspace_1.createJobsForWorkspace)(workspaceContext)
+                              }];
+                          }
+                        });
+                      });
+                    }))];
+                  case 1:
+                    return [2 /*return*/, _a.sent()];
+                }
+              });
+            });
+          })).then(function (f) {
+            return f.flat();
+          })];
+        case 2:
+          return [2 /*return*/, (_c.workspaces = _e.sent(), _c.components = allComponentsContext.map(function (context) {
             return {
               context: context,
               jobs: (0, createJobsForComponent_1.createJobsForComponentContext)(context)
             };
-          })];
+          }), _c)];
       }
     });
   });

package/dist/pipeline/createJobsForComponent.js

@@ -73,9 +73,8 @@ var getCustomJobs = function (context) {
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
 var createJobsForComponentContext = function (context) {
-  var _a, _b;
-  var buildJobs = build_1.BUILD_TYPES[context.build.config.type].jobs(context);
-  var deployJobs = ((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config) ? deploy_1.DEPLOY_TYPES[(_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.type].jobs(context) : [];
+  var buildJobs = build_1.BUILD_TYPES[context.build.buildType].jobs(context);
+  var deployJobs = context.componentConfig.deploy !== false ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context) : [];
   var customJobs = getCustomJobs(context);
   return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
 };

package/dist/pipeline/createJobsForWorkspace.d.ts

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

package/dist/pipeline/createJobsForWorkspace.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createJobsForWorkspace = void 0;
+var build_1 = require("../build");
+var createJobsForWorkspace = function (context) {
+  var buildJobs = build_1.WORKSPACE_BUILD_TYPES[context.build.buildType].jobs(context);
+  return buildJobs;
+};
+exports.createJobsForWorkspace = createJobsForWorkspace;

package/dist/pipeline/createMainPipeline.js

@@ -169,7 +169,7 @@ var createGitlabPipeline_1 = require("./gitlab/createGitlabPipeline");
 var gitlabReleaseJobs_1 = require("./gitlab/gitlabReleaseJobs");
 var createMainPipeline = function (pipelineType, config) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var stages, allJobsPerTrigger, allJobs;
+    var stages, allJobsPerTrigger, allWorkspaceJobs, allComponentJobs, allJobs;
     return __generator(this, function (_a) {
       switch (_a.label) {
         case 0:
@@ -194,22 +194,42 @@ var createMainPipeline = function (pipelineType, config) {
                 }
               });
             });
-          }))];
+          })).then(function (j) {
+            return j.flat();
+          })];
         case 1:
           allJobsPerTrigger = _a.sent();
-          allJobs = allJobsPerTrigger.flat()
+          allWorkspaceJobs = allJobsPerTrigger.filter(function (j) {
+            return j.context.type === "workspace";
+          }) // sort by componentName in the same order as they appear in the config
+          // this is purely for better readability in git diffs when you add new components
+          .sort(function (a, b) {
+            var _a;
+            var workspaceNames = Object.keys((_a = config.builds) !== null && _a !== void 0 ? _a : {});
+            var aIndex = workspaceNames.findIndex(function (c) {
+              return c === a.context.name;
+            });
+            var bIndex = workspaceNames.findIndex(function (c) {
+              return c === b.context.name;
+            });
+            return aIndex - bIndex;
+          });
+          allComponentJobs = allJobsPerTrigger.filter(function (j) {
+            return j.context.type === "component";
+          })
           // sort by componentName in the same order as they appear in the config
           // this is purely for better readability in git diffs when you add new components
           .sort(function (a, b) {
             var componentNames = Object.keys(config.components);
             var aIndex = componentNames.findIndex(function (c) {
-              return c === a.context.componentName;
+              return c === a.context.name;
             });
             var bIndex = componentNames.findIndex(function (c) {
-              return c === b.context.componentName;
+              return c === b.context.name;
             });
             return aIndex - bIndex;
-          }).reduce(function (acc, _a) {
+          });
+          allJobs = __spreadArray(__spreadArray([], __read(allWorkspaceJobs), false), __read(allComponentJobs), false).reduce(function (acc, _a) {
             var _b, _c;
             var gitlabJob = _a.gitlabJob,
               name = _a.name;

package/dist/pipeline/gitlab/createGitlabJobs.d.ts

@@ -1,24 +1,11 @@
-import type { ComponentContext, GitlabJobDef, GitlabRule } from "../../types";
+import type { Context, GitlabJobDef, GitlabRule } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
 import type { AllCatladderJobs } from "../createAllJobs";
 export type AllGitlabJobs = {
   name: string;
   gitlabJob: GitlabJobDef;
-  context: ComponentContext;
+  context: Context;
 }[];
 export declare const GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
-export declare const makeGitlabJob: (context: ComponentContext, {
-  environment,
-  envMode,
-  needsStages,
-  needsOtherComponent,
-  name,
-  needs,
-  jobTags,
-  script,
-  variables,
-  runnerVariables,
-  when,
-  ...job
-}: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
+export declare const makeGitlabJob: (context: Context, job: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
 export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;