@catladder/pipeline 1.146.1 → 1.146.2

package/src/build/custom/testJob.ts

@@ -1,4 +1,4 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { ensureArray, notNil } from "../../utils";
 import { isOfBuildType } from "../types";
@@ -11,7 +11,9 @@ const RUNNER_CUSTOM_TEST_VARIABLES = {
   KUBERNETES_MEMORY_LIMIT: "4Gi",
 };
 
-export const createCustomTestJobs = (context: Context): CatladderJob[] => {
+export const createCustomTestJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {

package/src/build/docker.ts

@@ -1,7 +1,7 @@
 import { merge } from "lodash";
 import { isOfDeployType } from "../deploy";
 import { getRunnerImage } from "../runner";
-import type { Context } from "../types";
+import type { ComponentContext } from "../types";
 import type { CatladderJob } from "../types/jobs";
 import { existsSync } from "fs";
 import path from "path";
@@ -19,7 +19,7 @@ const DOCKER_BUILD_RUNNER_REQUESTS = {
   KUBERNETES_MEMORY_LIMIT: "2Gi",
 };
 
-export const getDockerImageVariables = (context: Context) => {
+export const getDockerImageVariables = (context: ComponentContext) => {
   return {
     ...(isOfDeployType(context.componentConfig.deploy, "google-cloudrun")
       ? {
@@ -48,7 +48,7 @@ export const getDockerImageVariables = (context: Context) => {
  */
 export const requiresDockerBuild = ({
   componentConfig: { deploy },
-}: Context): boolean =>
+}: ComponentContext): boolean =>
   isOfDeployType(deploy, "kubernetes", "google-cloudrun", "dockerTag") ||
   (isOfDeployType(deploy, "custom") && deploy.requiresDocker);
 
@@ -60,7 +60,7 @@ const getDockerBuildRunnerVariables = () => ({
   DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
 });
 
-export const getDockerBuildVariables = (context: Context) => {
+export const getDockerBuildVariables = (context: ComponentContext) => {
   return {
     DOCKERFILE_ADDITIONS:
       context.componentConfig.build.docker?.additionsBegin?.join("\n"),
@@ -76,7 +76,7 @@ export const getDockerBuildVariables = (context: Context) => {
 export const DOCKER_BUILD_JOB_NAME = "🔨 docker";
 
 export const getDockerJobBaseProps = (
-  context: Context,
+  context: ComponentContext,
 ): Pick<
   CatladderJob,
   "image" | "services" | "variables" | "runnerVariables"
@@ -96,7 +96,7 @@ export const getDockerJobBaseProps = (
 
 export type DockerBuildJobDefinition = Partial<CatladderJob>;
 export const createDockerBuildJobBase = (
-  context: Context,
+  context: ComponentContext,
   { script, ...def }: Partial<CatladderJob>,
 ): CatladderJob => {
   return merge(
@@ -118,7 +118,7 @@ export const createDockerBuildJobBase = (
   );
 };
 
-export const gitlabDockerLogin = (context: Context) =>
+export const gitlabDockerLogin = (context: ComponentContext) =>
   isOfDeployType(context.componentConfig.deploy, "google-cloudrun")
     ? [
         ...gcloudServiceAccountLoginCommands(context),
@@ -129,7 +129,7 @@ export const gitlabDockerLogin = (context: Context) =>
       ];
 
 export const getDockerBuildDefaultScript = (
-  context: Context,
+  context: ComponentContext,
   ensureDockerFileScript?: string,
 ) =>
   [
@@ -154,5 +154,5 @@ export const getDockerBuildDefaultScript = (
     ]),
   ].filter(Boolean);
 
-export const hasDockerfile = (context: Context) =>
+export const hasDockerfile = (context: ComponentContext) =>
   existsSync(path.join(context.componentConfig.dir, "Dockerfile"));

package/src/build/index.ts

@@ -1,4 +1,4 @@
-import type { Context } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 
 import type { CatladderJob } from "../types/jobs";
@@ -12,7 +12,7 @@ export * from "./node";
 
 export type BuildTypes = {
   [type in BuildConfigType]: {
-    jobs: (context: Context) => CatladderJob[];
+    jobs: (context: ComponentContext) => CatladderJob[];
     defaults: (
       envContext: EnvironmentContext<BuildConfigType, any>,
     ) => Partial<Extract<BuildConfig, { type: type }>>;

package/src/build/node/buildJob.ts

@@ -1,6 +1,6 @@
 import { join } from "path";
 import { getRunnerImage } from "../../runner";
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { ensureArray } from "../../utils";
 import { createBuildJobs } from "../base";
@@ -10,7 +10,9 @@ import { getNextCache, getNodeCache, getYarnCache } from "./cache";
 import { NODE_RUNNER_BUILD_VARIABLES } from "./constants";
 import { getDockerAppCopyAndBuildScript, getYarnInstall } from "./yarn";
 
-export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
+export const createNodeBuildJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   const buildConfig = context.componentConfig.build;
 
   if (!isOfBuildType(buildConfig, "node", "node-static", "storybook")) {
@@ -18,7 +20,7 @@ export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
   }
 
   const defaultImage = getRunnerImage("jobs-default");
-  const yarnInstall = getYarnInstall(context);
+  const yarnInstall = getYarnInstall(context.buildContext);
 
   return createBuildJobs(context, {
     appBuild:
@@ -28,7 +30,7 @@ export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
             runnerVariables: NODE_RUNNER_BUILD_VARIABLES,
             cache: [
               ...(ensureArray(buildConfig.jobCache) ?? []),
-              ...getNodeCache(context),
+              ...getNodeCache(context.buildContext),
               ...getNextCache(context),
             ],
             script: [
@@ -39,8 +41,8 @@ export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
               paths: [
                 context.componentConfig.dir,
                 // also copy workspace dependencies in monorepo if packages are shared and they create build artifacts
-                ...(context.packageManagerInfo?.currentWorkspaceDependencies ??
-                  []),
+                ...(context.buildContext.packageManagerInfo
+                  ?.currentWorkspaceDependencies ?? []),
               ].flatMap((dir) => [
                 join(dir, "__build_info.json"),
                 join(dir, "dist"),
@@ -63,12 +65,14 @@ export const createNodeBuildJobs = (context: Context): CatladderJob[] => {
           ? "ensureNginxDockerfile"
           : "ensureNodeDockerfile",
       ),
-      cache: [...getYarnCache(context, "pull")],
+      cache: [...getYarnCache(context.buildContext, "pull")],
       variables: {
         // only required for non static
-        DOCKER_COPY_AND_INSTALL_APP: getDockerAppCopyAndBuildScript(context),
+        DOCKER_COPY_AND_INSTALL_APP: getDockerAppCopyAndBuildScript(
+          context.buildContext,
+        ),
         DOCKER_COPY_WORKSPACE_FILES:
-          context.packageManagerInfo?.pathsToCopyInDocker
+          context.buildContext.packageManagerInfo?.pathsToCopyInDocker
             .map((dir) => `COPY --chown=node:node ${dir} /app/${dir}`)
             ?.join("\n"),
       },

package/src/build/node/cache.ts

@@ -1,11 +1,11 @@
 import { join } from "path";
 import slugify from "slugify";
-import type { Context } from "../../types/context";
+import type { BuildContext, ComponentContext } from "../../types/context";
 import type { GitlabJobCache } from "../../types/gitlab-types";
 import { uniq } from "lodash";
 
 export const getYarnCache = (
-  context: Context,
+  context: BuildContext,
   policy = "pull-push",
 ): GitlabJobCache[] => {
   const componentIsInWorkspace =
@@ -18,15 +18,15 @@ export const getYarnCache = (
           paths: [".yarn"],
         }
       : {
-          key: slugify(context.componentConfig.dir) + "-yarn",
+          key: slugify(context.dir) + "-yarn",
           policy,
-          paths: [join(context.componentConfig.dir, ".yarn")],
+          paths: [join(context.dir, ".yarn")],
         },
   ];
 };
 
 export const getNodeModulesCache = (
-  context: Context,
+  context: BuildContext,
   policy = "pull-push",
 ): GitlabJobCache[] => {
   const componentIsInWorkspace =
@@ -39,7 +39,7 @@ export const getNodeModulesCache = (
       // if component is in a shared workspace, use workspace cache. use individual cache else
       key: componentIsInWorkspace
         ? "node-modules-workspace"
-        : slugify(context.componentConfig.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
+        : slugify(context.dir) + "-node-modules", // we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
       policy,
       paths: [
         ...(componentIsInWorkspace
@@ -49,13 +49,13 @@ export const getNodeModulesCache = (
                 join(w.location, "node_modules"),
               ) ?? []),
             ])
-          : [join(context.componentConfig.dir, "node_modules")]),
+          : [join(context.dir, "node_modules")]),
       ],
     },
   ];
 };
 export const getNodeCache = (
-  context: Context,
+  context: BuildContext,
   policy = "pull-push",
 ): GitlabJobCache[] => {
   return [
@@ -64,7 +64,7 @@ export const getNodeCache = (
   ];
 };
 
-export const getNextCache = (context: Context): GitlabJobCache[] => [
+export const getNextCache = (context: ComponentContext): GitlabJobCache[] => [
   {
     key: context.componentName + "-next-cache",
     policy: "pull-push",

package/src/build/node/index.ts

@@ -1,17 +1,19 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { createNodeBuildJobs } from "./buildJob";
 import { createMeteorBuildJobs } from "./meteor";
 import { createNodeTestJobs } from "./testJob";
 
-export const createNodeJobs = (context: Context): CatladderJob[] => {
+export const createNodeJobs = (context: ComponentContext): CatladderJob[] => {
   return [...createNodeTestJobs(context), ...createNodeBuildJobs(context)];
 };
 
-export const createStorybookJobs = (context: Context): CatladderJob[] => {
+export const createStorybookJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   return [...createNodeBuildJobs(context)];
 };
 
-export const createMeteorJobs = (context: Context): CatladderJob[] => {
+export const createMeteorJobs = (context: ComponentContext): CatladderJob[] => {
   return [...createNodeTestJobs(context), ...createMeteorBuildJobs(context)];
 };

package/src/build/node/meteor.ts

@@ -1,7 +1,7 @@
 import { join } from "path";
 import { getRunnerImage } from "../../runner";
 import type { GitlabJobCache } from "../../types";
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 
 import type { CatladderJob } from "../../types/jobs";
 
@@ -11,7 +11,7 @@ import { isOfBuildType } from "../types";
 import { getNodeCache } from "./cache";
 import { getYarnInstall } from "./yarn";
 
-const getMeteorCache = (context: Context): GitlabJobCache[] => [
+const getMeteorCache = (context: ComponentContext): GitlabJobCache[] => [
   {
     key: context.componentName + "meteor-build-cache",
     policy: "pull-push",
@@ -26,20 +26,25 @@ const getMeteorCache = (context: Context): GitlabJobCache[] => [
     ],
   },
 ];
-export const createMeteorBuildJobs = (context: Context): CatladderJob[] => {
+export const createMeteorBuildJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   const buildConfig = context.componentConfig.build;
 
   if (!isOfBuildType(buildConfig, "meteor")) {
     throw new Error("deploy config is not meteor");
   }
 
-  const yarnInstall = getYarnInstall(context);
+  const yarnInstall = getYarnInstall(context.buildContext);
 
   return createBuildJobs(context, {
     appBuild:
       buildConfig.buildCommand !== null
         ? {
-            cache: [...getNodeCache(context), ...getMeteorCache(context)],
+            cache: [
+              ...getNodeCache(context.buildContext),
+              ...getMeteorCache(context),
+            ],
             image: getRunnerImage("jobs-meteor"),
             variables: {
               METEOR_DISABLE_OPTIMISTIC_CACHING: "1", // see https://forums.meteor.com/t/veeery-long-building-time-inside-docker-container/58673/17?u=macrozone

package/src/build/node/testJob.ts

@@ -1,5 +1,5 @@
 import { getRunnerImage } from "../../runner";
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { ensureArray, notNil } from "../../utils";
 import { getNodeCache } from "./cache";
@@ -7,7 +7,9 @@ import { NODE_RUNNER_BUILD_VARIABLES } from "./constants";
 import { ensureNodeVersion, getYarnInstall } from "./yarn";
 import { createArtifactsConfig } from "../base/createArtifactsConfig";
 
-export const createNodeTestJobs = (context: Context): CatladderJob[] => {
+export const createNodeTestJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {
@@ -15,6 +17,7 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
   }
 
   const buildConfig = context.componentConfig.build;
+
   const defaultImage = getRunnerImage("jobs-default");
   const base: Omit<CatladderJob, "script" | "name"> = {
     variables: {
@@ -27,7 +30,7 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
     needs: [],
     envMode: "none",
   };
-  const yarnInstall = getYarnInstall(context);
+  const yarnInstall = getYarnInstall(context.buildContext);
   const auditJob: CatladderJob | null =
     buildConfig.audit !== false
       ? {
@@ -38,7 +41,7 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
           script: [
             `cd ${context.componentConfig.dir}`,
             ...(ensureArray(buildConfig.audit?.command) ?? [
-              context.packageManagerInfo?.isClassic
+              context.buildContext.packageManagerInfo?.isClassic
                 ? "yarn audit"
                 : "yarn npm audit --environment production", // yarn 2
             ]),
@@ -58,9 +61,9 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
           name: "👮 lint",
           ...base,
           image: buildConfig.lint?.jobImage ?? defaultImage,
-          cache: getNodeCache(context),
+          cache: getNodeCache(context.buildContext),
           script: [
-            ...ensureNodeVersion(context),
+            ...ensureNodeVersion(context.buildContext),
             `cd ${context.componentConfig.dir}`,
             ...yarnInstall,
             ...(ensureArray(buildConfig.lint?.command) ?? ["yarn lint"]),
@@ -80,9 +83,9 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
           ...base,
           image:
             buildConfig.test?.jobImage ?? getRunnerImage("jobs-testing-chrome"),
-          cache: getNodeCache(context),
+          cache: getNodeCache(context.buildContext),
           script: [
-            ...ensureNodeVersion(context),
+            ...ensureNodeVersion(context.buildContext),
             `cd ${context.componentConfig.dir}`,
             ...yarnInstall,
             ...(ensureArray(buildConfig.test?.command) ?? ["yarn test"]),

package/src/build/node/yarn.ts

@@ -1,5 +1,5 @@
 import { BashExpression } from "../../bash/BashExpression";
-import type { Context } from "../../types";
+import type { BuildContext, ComponentContext } from "../../types";
 import { ensureArray } from "../../utils";
 import { collapseableSection } from "../../utils/gitlab";
 
@@ -8,7 +8,7 @@ const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
 // FIXME: check why and when rebuild is needed
 const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
 
-const getYarnInstallCommand = (context: Context) => {
+const getYarnInstallCommand = (context: BuildContext) => {
   if (context.packageManagerInfo?.isClassic) {
     return YARN_INSTALL_CLASSIC;
   }
@@ -16,7 +16,7 @@ const getYarnInstallCommand = (context: Context) => {
   return `yarn install --immutable`;
 };
 
-export const ensureNodeVersion = (context: Context) =>
+export const ensureNodeVersion = (context: BuildContext) =>
   collapseableSection(
     "nodeinstall",
     "Ensure node version",
@@ -26,15 +26,13 @@ export const ensureNodeVersion = (context: Context) =>
   ]);
 
 export const getYarnInstall = (
-  context: Context,
+  context: BuildContext,
   options?: {
     noCustomPostInstall: boolean;
   },
 ) => {
   const postInstall =
-    "postInstall" in context.componentConfig.build
-      ? context.componentConfig.build.postInstall
-      : null;
+    "postInstall" in context.config ? context.config.postInstall : null;
   return [
     ...ensureNodeVersion(context),
     ...collapseableSection(
@@ -52,7 +50,7 @@ export const getYarnInstall = (
 
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 
-export const getDockerAppCopyAndBuildScript = (context: Context) => {
+export const getDockerAppCopyAndBuildScript = (context: BuildContext) => {
   if (context.packageManagerInfo?.isClassic) {
     return new BashExpression(
       `

package/src/build/rails/build.ts

@@ -1,4 +1,4 @@
-import type { Context } from "../..";
+import type { ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 import { createBuildJobs } from "../base";
 import {
@@ -8,7 +8,9 @@ import {
 } from "../docker";
 import { isOfBuildType } from "../types";
 
-export const createRailsBuildJobs = (context: Context): CatladderJob[] => {
+export const createRailsBuildJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   const buildConfig = context.componentConfig.build;
   if (!isOfBuildType(buildConfig, "rails")) {
     // should not happen

package/src/build/rails/index.ts

@@ -1,8 +1,8 @@
-import type { Context } from "../../types";
+import type { ComponentContext } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
 import { createRailsBuildJobs } from "./build";
 import { createRailsTestJobs } from "./test";
 
-export const createRailsJobs = (context: Context): CatladderJob[] => {
+export const createRailsJobs = (context: ComponentContext): CatladderJob[] => {
   return [...createRailsTestJobs(context), ...createRailsBuildJobs(context)];
 };

package/src/build/rails/test.ts

@@ -1,8 +1,10 @@
-import type { Context } from "../..";
+import type { ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 import { ensureArray, notNil } from "../../utils";
 
-export const createRailsTestJobs = (context: Context): CatladderJob[] => {
+export const createRailsTestJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
   // don't run tests after release
   // TODO: this will be replaced by using rules
   if (context.trigger === "taggedRelease") {

package/src/build/sbom.ts

@@ -1,19 +1,19 @@
-import type { Context } from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 import { ensureArray } from "../utils";
 
 export const SBOM_BUILD_JOB_NAME = "🧾 sbom";
 export const SBOM_FILE = "__sbom.json";
 
-export const createSbomBuildJob = (context: Context): CatladderJob => {
+export const createSbomBuildJob = (context: ComponentContext): CatladderJob => {
   const buildConfig = context.componentConfig.build;
 
   const defaultImage = "aquasec/trivy:0.38.3";
   const defaultScript = [
     `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
-      context.packageManagerInfo?.componentIsInWorkspace
+      context.buildContext.packageManagerInfo?.componentIsInWorkspace
         ? "."
-        : context.componentConfig.dir
+        : context.buildContext.dir
     }`,
   ];
 

package/src/context/getEnvironment.ts

@@ -1,11 +1,11 @@
-import type { CreateContextContext } from "..";
+import type { CreateComponentContextContext } from "..";
 
 import type { Environment } from "../types/context";
 import { getEnvironmentContext } from "./getEnvironmentContext";
 import { getEnvironmentVariables } from "./getEnvironmentVariables";
 
 export const getEnvironment = async (
-  ctx: CreateContextContext,
+  ctx: CreateComponentContextContext,
 ): Promise<Environment> => {
   const { env } = ctx;
   const variables = await getEnvironmentVariables(ctx);

package/src/context/getEnvironmentContext.ts

@@ -1,4 +1,4 @@
-import type { CreateContextContext } from "..";
+import type { CreateComponentContextContext } from "..";
 import type { StringOrBashExpression } from "../bash/BashExpression";
 import { joinBashExpressions } from "../bash/BashExpression";
 
@@ -22,7 +22,7 @@ export const getEnvironmentContext = ({
   componentName,
   config,
   pipelineType,
-}: CreateContextContext): EnvironmentContext<any, any> => {
+}: CreateComponentContextContext): EnvironmentContext<any, any> => {
   const envConfigRaw = getEnvConfig(config, componentName, env);
   const envType = getEnvType(env, envConfigRaw);
   const reviewSlug = getReviewSlug(envConfigRaw, env, pipelineType);

package/src/context/getEnvironmentVariables.ts

@@ -1,12 +1,12 @@
 import { merge } from "lodash";
 import { DEPLOY_TYPES } from "../deploy";
 import type {
-  Context,
+  ComponentContext,
   EnvironmentEnvVarPart as EnvironmentVariables,
 } from "../types";
 import type { DevLocalEnvConfig } from "../types/config";
 
-import type { CreateContextContext, UnspecifiedEnvVars } from "..";
+import type { CreateComponentContextContext, UnspecifiedEnvVars } from "..";
 import type { StringOrBashExpression } from "../bash/BashExpression";
 import { getBashVariable, joinBashExpressions } from "../bash/BashExpression";
 import type { EnvironmentContext } from "../types/environmentContext";
@@ -52,7 +52,7 @@ export type PredefinedVariables = BasePredefinedVariables & {
 };
 
 export const getEnvironmentVariables = async (
-  ctx: CreateContextContext,
+  ctx: CreateComponentContextContext,
   alreadyVisited: Record<string, Record<string, boolean>> = {}, // to prevent endless loop
 ): Promise<EnvironmentVariables> => {
   const environmentContext = getEnvironmentContext(ctx);
@@ -198,5 +198,8 @@ const addIndexVar = <V extends Record<string, unknown>>(
   _ALL_ENV_VAR_KEYS: JSON.stringify(Object.keys(vars)),
 });
 
-export const getSecretVarNameForContext = (context: Context, key: string) =>
+export const getSecretVarNameForContext = (
+  context: ComponentContext,
+  key: string,
+) =>
   getSecretVarName(context.environment.shortName, context.componentName, key);

package/src/context/getLabels.ts

@@ -1,5 +1,5 @@
 import slugify from "slugify";
-import type { Context } from "../types";
+import type { ComponentContext } from "../types";
 
 const sanitize = (value?: string) => {
   if (!value) return value;
@@ -7,7 +7,7 @@ const sanitize = (value?: string) => {
   // slugify should do the job
   return slugify(value).toLowerCase();
 };
-export const getLabels = (context: Context) => {
+export const getLabels = (context: ComponentContext) => {
   const labels = {
     "customer-name": sanitize(context.fullConfig.customerName),
     "component-name": sanitize(context.componentName),

package/src/context/index.ts

@@ -4,7 +4,7 @@ import { DEPLOY_TYPES } from "../deploy";
 import type { DeployConfig, DeployConfigType } from "../deploy/types";
 import type { PipelineType } from "../types";
 import type { Config, PipelineTrigger } from "../types/config";
-import type { Context, PackageManagerInfo } from "../types/context";
+import type { ComponentContext, PackageManagerInfo } from "../types/context";
 import type { PartialDeep } from "../types/utils";
 import { mergeWithMergingArrays } from "../utils";
 import { getEnvironment } from "./getEnvironment";
@@ -13,7 +13,7 @@ import { getEnvironmentContext } from "./getEnvironmentContext";
 export * from "./getEnvironment";
 export * from "./getEnvironmentVariables";
 
-export type CreateContextContext = {
+export type CreateComponentContextContext = {
   config: Config;
   componentName: string;
   env: string;
@@ -22,9 +22,9 @@ export type CreateContextContext = {
   packageManagerInfo?: PackageManagerInfo;
 };
 
-export const createContext = async (
-  ctx: CreateContextContext,
-): Promise<Context> => {
+export const createComponentContext = async (
+  ctx: CreateComponentContextContext,
+): Promise<ComponentContext> => {
   if (!/^[a-z0-9-]+$/.test(ctx.componentName)) {
     throw new Error(
       "componentName may only contain lower case letters, numbers and -",
@@ -59,6 +59,11 @@ export const createContext = async (
   return {
     fullConfig: ctx.config,
     componentConfig,
+    buildContext: {
+      dir: componentConfig.dir,
+      packageManagerInfo: ctx.packageManagerInfo,
+      config: componentConfig.build,
+    },
     componentName: ctx.componentName,
     environment: await getEnvironment(ctx),
     packageManagerInfo: ctx.packageManagerInfo,
@@ -66,3 +71,8 @@ export const createContext = async (
     trigger: ctx.trigger,
   };
 };
+
+/**
+ * @deprecated use createComponentContext instead
+ */
+export const createContext = createComponentContext;

package/src/deploy/base/deploy.ts

@@ -3,7 +3,7 @@ import {
   requiresDockerBuild,
 } from "../../build/docker";
 import { SBOM_BUILD_JOB_NAME } from "../../build/sbom";
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { sbomDeactivated } from "../sbom";
 import { contextIsStoppable } from "../utils";
@@ -24,7 +24,7 @@ export type DeployJobDefinition = Pick<
   | "runnerVariables"
 >;
 export const createDeployJob = (
-  context: Context,
+  context: ComponentContext,
   jobDefinition: DeployJobDefinition,
 ): CatladderJob => {
   const hasDocker = requiresDockerBuild(context);