@catladder/cli 3.46.1 → 3.46.2

package/dist/pipeline/src/pipeline/getPipelineStages.js

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getPipelineStages = void 0;
 const config_1 = require("../config");
 const jobs_1 = require("../types/jobs");
@@ -9,13 +12,8 @@ const jobs_1 = require("../types/jobs");
  * this is just so that it looks nicer in gitlab and makes running mutliple manual tasks more easy to use
  */
 function getPipelineStages(config) {
-    const allEnvs = (0, config_1.getAllEnvsInAllComponents)(config).filter((e) => e !== "local");
-    const stages = jobs_1.BASE_STAGES.reduce((acc, baseStage) => [
-        ...acc,
-        baseStage,
-        ...allEnvs.map((e) => `${baseStage} ${e}`),
-    ], []);
-    return stages;
+  const allEnvs = (0, config_1.getAllEnvsInAllComponents)(config).filter(e => e !== "local");
+  const stages = jobs_1.BASE_STAGES.reduce((acc, baseStage) => [...acc, baseStage, ...allEnvs.map(e => `${baseStage} ${e}`)], []);
+  return stages;
 }
-exports.getPipelineStages = getPipelineStages;
-//# sourceMappingURL=getPipelineStages.js.map
+exports.getPipelineStages = getPipelineStages;

package/dist/pipeline/src/pipeline/gitlab/cache.d.ts

@@ -1,9 +1,9 @@
 import type { AgentContext, Context, GitlabJobCache } from "../../types";
 export declare const getCacheKeyWithFallbackForMR: (baseKey: string, context: Context) => {
-    key: string;
-    fallback_keys: string[];
+  key: string;
+  fallback_keys: string[];
 } | {
-    key: string;
-    fallback_keys?: undefined;
+  key: string;
+  fallback_keys?: undefined;
 };
-export declare const addCacheFallback: (cache: GitlabJobCache | GitlabJobCache[], context: Context | AgentContext) => GitlabJobCache | GitlabJobCache[];
+export declare const addCacheFallback: (cache: GitlabJobCache | GitlabJobCache[], context: Context | AgentContext) => GitlabJobCache | GitlabJobCache[];

package/dist/pipeline/src/pipeline/gitlab/cache.js

@@ -1,36 +1,38 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.addCacheFallback = exports.getCacheKeyWithFallbackForMR = void 0;
 const getCacheKeyWithFallbackForMR = (baseKey, context) => {
-    // if its a branch, create a key with the branch name with fallback to the base key
-    if (context.trigger === "mr") {
-        return {
-            key: baseKey + "-mr$CI_MERGE_REQUEST_IID",
-            fallback_keys: [baseKey],
-        };
-    }
+  // if its a branch, create a key with the branch name with fallback to the base key
+  if (context.trigger === "mr") {
     return {
-        key: baseKey,
+      key: baseKey + "-mr$CI_MERGE_REQUEST_IID",
+      fallback_keys: [baseKey]
     };
+  }
+  return {
+    key: baseKey
+  };
 };
 exports.getCacheKeyWithFallbackForMR = getCacheKeyWithFallbackForMR;
 const addCacheFallback = (cache, context) => {
-    if (context.type !== "agent" && context.trigger === "mr") {
-        if (Array.isArray(cache)) {
-            return cache.map((c) => addCacheFallbackToSingleCacheForMR(c, context));
-        }
-        return addCacheFallbackToSingleCacheForMR(cache, context);
+  if (context.type !== "agent" && context.trigger === "mr") {
+    if (Array.isArray(cache)) {
+      return cache.map(c => addCacheFallbackToSingleCacheForMR(c, context));
     }
-    return cache;
+    return addCacheFallbackToSingleCacheForMR(cache, context);
+  }
+  return cache;
 };
 exports.addCacheFallback = addCacheFallback;
 const addCacheFallbackToSingleCacheForMR = (cache, context) => {
-    if (typeof cache.key === "string") {
-        return {
-            ...cache,
-            ...(0, exports.getCacheKeyWithFallbackForMR)(cache.key, context),
-        };
-    }
-    return cache; // as is
-};
-//# sourceMappingURL=cache.js.map
+  if (typeof cache.key === "string") {
+    return {
+      ...cache,
+      ...(0, exports.getCacheKeyWithFallbackForMR)(cache.key, context)
+    };
+  }
+  return cache; // as is
+};

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

@@ -2,12 +2,12 @@ import type { AgentContext, Context, GitlabJobDef, GitlabRule } from "../../type
 import type { CatladderJob } from "../../types/jobs";
 import type { AllCatladderJobs } from "../createAllJobs";
 export type GitlabJobWithContext = {
-    gitlabJob: GitlabJobDef;
-    context: Context | AgentContext | null;
+  gitlabJob: GitlabJobDef;
+  context: Context | AgentContext | null;
 };
 export type AllGitlabJobs = (GitlabJobWithContext & {
-    name: string;
+  name: string;
 })[];
 export declare const GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
 export declare const makeGitlabJob: (context: Context | AgentContext, job: CatladderJob<string>, allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => [fullName: string, job: GitlabJobDef];
-export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;
+export declare const createGitlabJobs: (allJobs: AllCatladderJobs, baseRules?: GitlabRule[]) => Promise<AllGitlabJobs>;

package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js

@@ -1,5 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createGitlabJobs = exports.makeGitlabJob = exports.GITLAB_ENVIRONMENT_URL_VARIABLE = void 0;
 const lodash_1 = require("lodash");
 const getInjectVarsScript_1 = require("../../bash/getInjectVarsScript");
@@ -10,267 +13,253 @@ const removeUndefined_1 = require("../../utils/removeUndefined");
 const BashExpression_1 = require("../../bash/BashExpression");
 const cache_1 = require("./cache");
 exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
-const getFullJobName = ({ type, name, baseName, allJobs, env, }) => {
-    const shouldAddIcon = allJobs.workspaces.length > 0;
-    const icon = type === "component" ? "🔹" : type === "agent" ? "🤖" : "🔸";
-    const prefix = shouldAddIcon ? icon + " " : "";
-    if (env) {
-        return `${prefix}${baseName} ${name} | ${env} `;
-    }
-    return `${prefix}${baseName} ${name}`;
+const getFullJobName = ({
+  type,
+  name,
+  baseName,
+  allJobs,
+  env
+}) => {
+  const shouldAddIcon = allJobs.workspaces.length > 0;
+  const icon = type === "component" ? "🔹" : type === "agent" ? "🤖" : "🔸";
+  const prefix = shouldAddIcon ? icon + " " : "";
+  if (env) {
+    return `${prefix}${baseName} ${name} | ${env} `;
+  }
+  return `${prefix}${baseName} ${name}`;
 };
 const getFullReferencedJobNameFromComponent = (referencedJobName, componentName, env, allJobs) => {
-    var _a, _b;
-    const referencedJob = (_b = (_a = allJobs.components
-        .find((j) => j.context.name === componentName && j.context.env === env)) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find((j) => j.name === referencedJobName);
-    if (!referencedJob) {
-        throw new Error(`unknown job referenced: '${referencedJobName}' from '${env}:${componentName}'`);
-    }
-    return getFullJobName({
-        type: "component",
-        name: referencedJobName,
-        baseName: componentName,
-        env,
-        allJobs,
-    });
+  var _a, _b;
+  const referencedJob = (_b = (_a = allJobs.components.find(j => j.context.name === componentName && j.context.env === env)) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find(j => j.name === referencedJobName);
+  if (!referencedJob) {
+    throw new Error(`unknown job referenced: '${referencedJobName}' from '${env}:${componentName}'`);
+  }
+  return getFullJobName({
+    type: "component",
+    name: referencedJobName,
+    baseName: componentName,
+    env,
+    allJobs
+  });
 };
 const getFullReferencedJobNameFromWorkspace = (referencedJobName, workspaceName, env, allJobs) => {
-    var _a, _b;
-    const referencedJob = (_b = (_a = allJobs.workspaces
-        .find((w) => w.context.name === workspaceName)) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find((j) => j.name === referencedJobName);
-    if (!referencedJob) {
-        throw new Error(`unknown job referenced: '${referencedJobName}' from workspace ${env}:${workspaceName}'`);
-    }
-    return getFullJobName({
-        type: "workspace",
-        name: referencedJobName,
-        baseName: workspaceName,
-        env,
-        allJobs,
-    });
+  var _a, _b;
+  const referencedJob = (_b = (_a = allJobs.workspaces.find(w => w.context.name === workspaceName)) === null || _a === void 0 ? void 0 : _a.jobs) === null || _b === void 0 ? void 0 : _b.find(j => j.name === referencedJobName);
+  if (!referencedJob) {
+    throw new Error(`unknown job referenced: '${referencedJobName}' from workspace ${env}:${workspaceName}'`);
+  }
+  return getFullJobName({
+    type: "workspace",
+    name: referencedJobName,
+    baseName: workspaceName,
+    env,
+    allJobs
+  });
 };
-const getJobName = (need) => (0, lodash_1.isObject)(need) ? need.job : need;
+const getJobName = need => (0, lodash_1.isObject)(need) ? need.job : need;
 const makeGitlabJob = (context, job, allJobs, baseRules) => {
-    var _a, _b;
-    const { environment, envMode, needsStages, name, needs, jobTags, script, variables, runnerVariables, when, cache, ...rest } = job;
-    const stage = envMode === "stagePerEnv" && context.type !== "agent"
-        ? `${job.stage} ${context.env}`
-        : job.stage;
-    const deduplicatedGitlabNeeds = getGitlabNeeds(context, job, allJobs);
-    const fullJobName = getFullJobName({
-        type: context.type,
-        name,
-        baseName: context.name,
-        env: context.type !== "agent" ? context.env : undefined,
-        allJobs,
-    });
-    // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
-    // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
-    const PIPELINE_RUNNER_VARIABLES = [
-        "KUBERNETES_CPU_REQUEST",
-        "KUBERNETES_MEMORY_REQUEST",
-        "KUBERNETES_CPU_LIMIT",
-        "KUBERNETES_MEMORY_LIMIT",
-    ];
-    // remove those from variables and add them to runnerVariables
-    const varsInjectScripts = (0, gitlab_1.collapseableSection)("injectvars", "Injecting variables")([
-        ...(0, getInjectVarsScript_1.getInjectVarsScript)(
-        // remove legacy variables
-        Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(([key]) => !PIPELINE_RUNNER_VARIABLES.includes(key)))),
-    ]);
-    const legacyRunnerVariables = Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(([key]) => PIPELINE_RUNNER_VARIABLES.includes(key)));
-    if (Object.keys(legacyRunnerVariables).length > 0) {
-        console.warn(`Legacy variables detected in ${fullJobName}: ${Object.keys(legacyRunnerVariables).join(", ")}. Please move them to the runnerVariables key.`);
-    }
-    const rules = [
-        ...((_a = job.rules) !== null && _a !== void 0 ? _a : []),
-        ...(baseRules
-            ? baseRules.map((rule) => ({
-                when: when,
-                ...rule,
-            }))
-            : when
-                ? [{ when }]
-                : []),
-    ];
-    const gitlabJob = {
-        retry: defaults_1.BASE_RETRY,
-        interruptible: true,
-        ...rest,
-        cache: cache ? (0, cache_1.addCacheFallback)(cache, context) : undefined,
-        rules: rules.length > 0 ? rules : undefined,
-        variables: {
-            ...legacyRunnerVariables,
-            ...runnerVariables,
-        },
-        script: [...varsInjectScripts, ...((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : [])],
-        tags: jobTags,
-        stage,
-        // sort in a predictable manner for snapshot tests
-        needs: deduplicatedGitlabNeeds,
-    };
-    const modified = addGitlabEnvironment(context, environment, gitlabJob, allJobs);
-    return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
+  var _a, _b;
+  const {
+    environment,
+    envMode,
+    needsStages,
+    name,
+    needs,
+    jobTags,
+    script,
+    variables,
+    runnerVariables,
+    when,
+    cache,
+    ...rest
+  } = job;
+  const stage = envMode === "stagePerEnv" && context.type !== "agent" ? `${job.stage} ${context.env}` : job.stage;
+  const deduplicatedGitlabNeeds = getGitlabNeeds(context, job, allJobs);
+  const fullJobName = getFullJobName({
+    type: context.type,
+    name,
+    baseName: context.name,
+    env: context.type !== "agent" ? context.env : undefined,
+    allJobs
+  });
+  // backwards compatibility, some may still use KUBERNETES_CPU_REQUEST, KUBERNETES_MEMORY_REQUEST, etc. in variables.
+  // those should now be set in the runnerVariables as they don't work in the variables key of the catladder job, becuase those get injected
+  const PIPELINE_RUNNER_VARIABLES = ["KUBERNETES_CPU_REQUEST", "KUBERNETES_MEMORY_REQUEST", "KUBERNETES_CPU_LIMIT", "KUBERNETES_MEMORY_LIMIT"];
+  // remove those from variables and add them to runnerVariables
+  const varsInjectScripts = (0, gitlab_1.collapseableSection)("injectvars", "Injecting variables")([...(0, getInjectVarsScript_1.getInjectVarsScript)(
+  // remove legacy variables
+  Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(([key]) => !PIPELINE_RUNNER_VARIABLES.includes(key))))]);
+  const legacyRunnerVariables = Object.fromEntries(Object.entries(variables !== null && variables !== void 0 ? variables : {}).filter(([key]) => PIPELINE_RUNNER_VARIABLES.includes(key)));
+  if (Object.keys(legacyRunnerVariables).length > 0) {
+    console.warn(`Legacy variables detected in ${fullJobName}: ${Object.keys(legacyRunnerVariables).join(", ")}. Please move them to the runnerVariables key.`);
+  }
+  const rules = [...((_a = job.rules) !== null && _a !== void 0 ? _a : []), ...(baseRules ? baseRules.map(rule => ({
+    when: when,
+    ...rule
+  })) : when ? [{
+    when
+  }] : [])];
+  const gitlabJob = {
+    retry: defaults_1.BASE_RETRY,
+    interruptible: true,
+    ...rest,
+    cache: cache ? (0, cache_1.addCacheFallback)(cache, context) : undefined,
+    rules: rules.length > 0 ? rules : undefined,
+    variables: {
+      ...legacyRunnerVariables,
+      ...runnerVariables
+    },
+    script: [...varsInjectScripts, ...((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : [])],
+    tags: jobTags,
+    stage,
+    // sort in a predictable manner for snapshot tests
+    needs: deduplicatedGitlabNeeds
+  };
+  const modified = addGitlabEnvironment(context, environment, gitlabJob, allJobs);
+  return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
 };
 exports.makeGitlabJob = makeGitlabJob;
 const addGitlabEnvironment = (context, catladderJobEnvironment, job, allJobs) => {
-    var _a, _b;
-    if (!catladderJobEnvironment) {
-        return job;
+  var _a, _b;
+  if (!catladderJobEnvironment) {
+    return job;
+  }
+  if (context.type !== "component") {
+    // don't add enviornment for workspace and agent jobs atm.
+    return job;
+  }
+  const {
+    env,
+    name,
+    environment
+  } = context;
+  const {
+    envVars,
+    envType
+  } = environment;
+  const {
+    on_stop,
+    ...restEnvironment
+  } = catladderJobEnvironment;
+  // those can be dynamic, so we therefore have to do this: https://docs.gitlab.com/ee/ci/environments/#set-a-dynamic-environment-url
+  const dotEnvFile = "gitlab_environment.env";
+  const createsJobEnv = !catladderJobEnvironment.action || catladderJobEnvironment.action === "start";
+  const artifacts = (0, lodash_1.merge)((_a = job.artifacts) !== null && _a !== void 0 ? _a : {}, createsJobEnv ? {
+    reports: {
+      dotenv: dotEnvFile
     }
-    if (context.type !== "component") {
-        // don't add enviornment for workspace and agent jobs atm.
-        return job;
-    }
-    const { env, name, environment } = context;
-    const { envVars, envType } = environment;
-    const { on_stop, ...restEnvironment } = catladderJobEnvironment;
-    // those can be dynamic, so we therefore have to do this: https://docs.gitlab.com/ee/ci/environments/#set-a-dynamic-environment-url
-    const dotEnvFile = "gitlab_environment.env";
-    const createsJobEnv = !catladderJobEnvironment.action ||
-        catladderJobEnvironment.action === "start";
-    const artifacts = (0, lodash_1.merge)((_a = job.artifacts) !== null && _a !== void 0 ? _a : {}, createsJobEnv
-        ? {
-            reports: {
-                dotenv: dotEnvFile,
-            },
-        }
-        : {});
-    const scriptToAdd = [
-        `echo "${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}=${(0, BashExpression_1.getBashVariable)("ROOT_URL")}" >> ${dotEnvFile}`,
-    ];
-    // this is NOT a bashVariable since it NEEDS to be used as a string in gitlab
-    const gitlabEnvironmentName = envType === "review"
-        ? `${env}/$CI_COMMIT_REF_NAME/${name}` // FIXME: should be replaced with mr name as well
-        : `${env}/${name}`;
-    return {
-        ...job,
-        environment: {
-            name: gitlabEnvironmentName,
-            ...(createsJobEnv ? { url: `$${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}` } : {}),
-            ...(on_stop
-                ? {
-                    on_stop: getFullReferencedJobNameFromComponent(on_stop, name, env, allJobs),
-                }
-                : {}),
-            ...restEnvironment,
-        },
-        ...(!(0, lodash_1.isEmpty)(artifacts) ? { artifacts } : {}),
-        script: [...((_b = job.script) !== null && _b !== void 0 ? _b : []), ...(createsJobEnv ? scriptToAdd : [])],
-    };
+  } : {});
+  const scriptToAdd = [`echo "${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}=${(0, BashExpression_1.getBashVariable)("ROOT_URL")}" >> ${dotEnvFile}`];
+  // this is NOT a bashVariable since it NEEDS to be used as a string in gitlab
+  const gitlabEnvironmentName = envType === "review" ? `${env}/$CI_COMMIT_REF_NAME/${name}` // FIXME: should be replaced with mr name as well
+  : `${env}/${name}`;
+  return {
+    ...job,
+    environment: {
+      name: gitlabEnvironmentName,
+      ...(createsJobEnv ? {
+        url: `$${exports.GITLAB_ENVIRONMENT_URL_VARIABLE}`
+      } : {}),
+      ...(on_stop ? {
+        on_stop: getFullReferencedJobNameFromComponent(on_stop, name, env, allJobs)
+      } : {}),
+      ...restEnvironment
+    },
+    ...(!(0, lodash_1.isEmpty)(artifacts) ? {
+      artifacts
+    } : {}),
+    script: [...((_b = job.script) !== null && _b !== void 0 ? _b : []), ...(createsJobEnv ? scriptToAdd : [])]
+  };
 };
 const createGitlabJobs = async (allJobs, baseRules) => {
-    return [
-        ...allJobs.workspaces,
-        ...allJobs.components,
-        ...allJobs.agents,
-    ].flatMap(({ context, jobs }) => {
-        return jobs.map((job) => {
-            const [fullJobName, gitlabJob] = (0, exports.makeGitlabJob)(context, job, allJobs, baseRules);
-            return {
-                name: fullJobName,
-                gitlabJob,
-                context,
-            };
-        });
+  return [...allJobs.workspaces, ...allJobs.components, ...allJobs.agents].flatMap(({
+    context,
+    jobs
+  }) => {
+    return jobs.map(job => {
+      const [fullJobName, gitlabJob] = (0, exports.makeGitlabJob)(context, job, allJobs, baseRules);
+      return {
+        name: fullJobName,
+        gitlabJob,
+        context
+      };
     });
+  });
 };
 exports.createGitlabJobs = createGitlabJobs;
 function getGitlabNeeds(context, job, allJobs) {
-    var _a;
-    const needs = context.type === "workspace"
-        ? getGitlabNeedsForWorkspaceJob(context, job, allJobs)
-        : context.type === "agent"
-            ? ((_a = job.needs) !== null && _a !== void 0 ? _a : null)
-            : getGitlabNeedsForComponentJob(context, job, allJobs);
-    return needs ? deduplicateNeeds(needs) : undefined;
+  var _a;
+  const needs = context.type === "workspace" ? getGitlabNeedsForWorkspaceJob(context, job, allJobs) : context.type === "agent" ? (_a = job.needs) !== null && _a !== void 0 ? _a : null : getGitlabNeedsForComponentJob(context, job, allJobs);
+  return needs ? deduplicateNeeds(needs) : undefined;
 }
 function deduplicateNeeds(needs) {
-    return needs
-        ? [...new Map(needs.map((n) => [(0, lodash_1.isObject)(n) ? n.job : n, n])).values()]
-        : undefined;
+  return needs ? [...new Map(needs.map(n => [(0, lodash_1.isObject)(n) ? n.job : n, n])).values()] : undefined;
 }
-function getGitlabNeedsForComponentJob(context, { needsStages, needs }, allJobs) {
-    const needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap((n) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const componentName = context.name;
-        if (!n.workspaceName) {
-            const allJobNamesFromThatStage = (_c = (_b = (_a = allJobs.components
-                .filter((j) => j.context.name === componentName && j.context.env === context.env)
-                .flatMap((j) => j.jobs)) === null || _a === void 0 ? void 0 : _a.filter((j) => j.stage === n.stage)) === null || _b === void 0 ? void 0 : _b.map((j) => j.name)) !== null && _c !== void 0 ? _c : [];
-            return allJobNamesFromThatStage.map((job) => {
-                var _a;
-                return ({
-                    job,
-                    artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
-                    componentName,
-                });
-            });
-        }
-        else {
-            const allJobNamesFromThatStage = (_h = (_g = (_f = (_e = (_d = allJobs.workspaces
-                .find((w) => w.context.name === n.workspaceName &&
-                w.context.env === context.env)) === null || _d === void 0 ? void 0 : _d.jobs) === null || _e === void 0 ? void 0 : _e.flatMap((j) => j)) === null || _f === void 0 ? void 0 : _f.filter((j) => j.stage === n.stage)) === null || _g === void 0 ? void 0 : _g.map((j) => j.name)) !== null && _h !== void 0 ? _h : [];
-            return allJobNamesFromThatStage.map((job) => {
-                var _a;
-                return ({
-                    job,
-                    artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
-                    workspaceName: n.workspaceName,
-                });
-            });
-        }
-    });
-    const cleanedNeeds = [
-        ...(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []),
-        ...(needs !== null && needs !== void 0 ? needs : []),
-    ];
-    return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map((n) => {
+function getGitlabNeedsForComponentJob(context, {
+  needsStages,
+  needs
+}, allJobs) {
+  const needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(n => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const componentName = context.name;
+    if (!n.workspaceName) {
+      const allJobNamesFromThatStage = (_c = (_b = (_a = allJobs.components.filter(j => j.context.name === componentName && j.context.env === context.env).flatMap(j => j.jobs)) === null || _a === void 0 ? void 0 : _a.filter(j => j.stage === n.stage)) === null || _b === void 0 ? void 0 : _b.map(j => j.name)) !== null && _c !== void 0 ? _c : [];
+      return allJobNamesFromThatStage.map(job => {
+        var _a;
+        return {
+          job,
+          artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
+          componentName
+        };
+      });
+    } else {
+      const allJobNamesFromThatStage = (_h = (_g = (_f = (_e = (_d = allJobs.workspaces.find(w => w.context.name === n.workspaceName && w.context.env === context.env)) === null || _d === void 0 ? void 0 : _d.jobs) === null || _e === void 0 ? void 0 : _e.flatMap(j => j)) === null || _f === void 0 ? void 0 : _f.filter(j => j.stage === n.stage)) === null || _g === void 0 ? void 0 : _g.map(j => j.name)) !== null && _h !== void 0 ? _h : [];
+      return allJobNamesFromThatStage.map(job => {
         var _a;
-        return (0, lodash_1.isObject)(n)
-            ? "workspaceName" in n
-                ? {
-                    job: getFullReferencedJobNameFromWorkspace(n.job, n.workspaceName, context.env, allJobs),
-                    artifacts: n.artifacts,
-                }
-                : {
-                    job: getFullReferencedJobNameFromComponent(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : context.name, context.env, allJobs),
-                    artifacts: n.artifacts,
-                }
-            : getFullReferencedJobNameFromComponent(n, context.name, context.env, allJobs);
-    }).sort((a, b) => getJobName(a).localeCompare(getJobName(b)));
+        return {
+          job,
+          artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
+          workspaceName: n.workspaceName
+        };
+      });
+    }
+  });
+  const cleanedNeeds = [...(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), ...(needs !== null && needs !== void 0 ? needs : [])];
+  return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(n => {
+    var _a;
+    return (0, lodash_1.isObject)(n) ? "workspaceName" in n ? {
+      job: getFullReferencedJobNameFromWorkspace(n.job, n.workspaceName, context.env, allJobs),
+      artifacts: n.artifacts
+    } : {
+      job: getFullReferencedJobNameFromComponent(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : context.name, context.env, allJobs),
+      artifacts: n.artifacts
+    } : getFullReferencedJobNameFromComponent(n, context.name, context.env, allJobs);
+  }).sort((a, b) => getJobName(a).localeCompare(getJobName(b)));
 }
 /**
  *
  *unclear whether we actually need this. So far jobs in a workspace don't have needs to other jobs from the same workspace
  */
-function getGitlabNeedsForWorkspaceJob(context, { needsStages, needs }, allJobs) {
-    const needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap((n) => {
-        var _a, _b, _c, _d;
-        const workspaceName = (_a = n.workspaceName) !== null && _a !== void 0 ? _a : context.name;
-        const allJobNamesFromThatStage = (_d = (_c = (_b = allJobs.workspaces
-            .filter((j) => j.context.name === workspaceName && j.context.env === context.env)
-            .flatMap((j) => j.jobs)) === null || _b === void 0 ? void 0 : _b.filter((j) => j.stage === n.stage)) === null || _c === void 0 ? void 0 : _c.map((j) => j.name)) !== null && _d !== void 0 ? _d : [];
-        return allJobNamesFromThatStage.map((job) => {
-            var _a;
-            return ({
-                job,
-                artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
-                workspaceName: workspaceName,
-            });
-        });
+function getGitlabNeedsForWorkspaceJob(context, {
+  needsStages,
+  needs
+}, allJobs) {
+  const needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(n => {
+    var _a, _b, _c, _d;
+    const workspaceName = (_a = n.workspaceName) !== null && _a !== void 0 ? _a : context.name;
+    const allJobNamesFromThatStage = (_d = (_c = (_b = allJobs.workspaces.filter(j => j.context.name === workspaceName && j.context.env === context.env).flatMap(j => j.jobs)) === null || _b === void 0 ? void 0 : _b.filter(j => j.stage === n.stage)) === null || _c === void 0 ? void 0 : _c.map(j => j.name)) !== null && _d !== void 0 ? _d : [];
+    return allJobNamesFromThatStage.map(job => {
+      var _a;
+      return {
+        job,
+        artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
+        workspaceName: workspaceName
+      };
     });
-    const cleanedNeeds = [
-        ...(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []),
-        ...(needs !== null && needs !== void 0 ? needs : []),
-    ];
-    return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map((n) => (0, lodash_1.isObject)(n)
-        ? {
-            job: getFullReferencedJobNameFromWorkspace(n.job, "workspaceName" in n && n.workspaceName
-                ? n.workspaceName
-                : context.name, context.env, allJobs),
-            artifacts: n.artifacts,
-        }
-        : getFullReferencedJobNameFromWorkspace(n, context.name, context.env, allJobs)).sort((a, b) => getJobName(a).localeCompare(getJobName(b)));
-}
-//# sourceMappingURL=createGitlabJobs.js.map
+  });
+  const cleanedNeeds = [...(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), ...(needs !== null && needs !== void 0 ? needs : [])];
+  return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(n => (0, lodash_1.isObject)(n) ? {
+    job: getFullReferencedJobNameFromWorkspace(n.job, "workspaceName" in n && n.workspaceName ? n.workspaceName : context.name, context.env, allJobs),
+    artifacts: n.artifacts
+  } : getFullReferencedJobNameFromWorkspace(n, context.name, context.env, allJobs)).sort((a, b) => getJobName(a).localeCompare(getJobName(b)));
+}