@catladder/pipeline 1.146.1 → 1.147.0

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,10 +64,10 @@ export const getNodeCache = (
   ];
 };
 
-export const getNextCache = (context: Context): GitlabJobCache[] => [
+export const getNextCache = (context: ComponentContext): GitlabJobCache[] => [
   {
     key: context.componentName + "-next-cache",
     policy: "pull-push",
-    paths: [context.componentConfig.dir + "/.next/cache/"],
+    paths: [context.build.dir + "/.next/cache/"],
   },
 ];

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,45 +1,44 @@
 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";
 
 import { createBuildJobs } from "../base";
-import { getDockerBuildDefaultScript } from "../docker";
+import { getDockerBuildScriptWithBuiltInDockerFile } from "../docker";
 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",
     paths: [
-      join(
-        context.componentConfig.dir,
-        ".meteor/local/resolver-result-cache.json",
-      ),
-      join(context.componentConfig.dir, ".meteor/local/plugin-cache"),
-      join(context.componentConfig.dir, ".meteor/local/isopacks"),
-      join(context.componentConfig.dir, ".meteor/local/bundler-cache/scanner"),
+      join(context.build.dir, ".meteor/local/resolver-result-cache.json"),
+      join(context.build.dir, ".meteor/local/plugin-cache"),
+      join(context.build.dir, ".meteor/local/isopacks"),
+      join(context.build.dir, ".meteor/local/bundler-cache/scanner"),
     ],
   },
 ];
-export const createMeteorBuildJobs = (context: Context): CatladderJob[] => {
-  const buildConfig = context.componentConfig.build;
+export const createMeteorBuildJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
+  const buildConfig = context.build.config;
 
   if (!isOfBuildType(buildConfig, "meteor")) {
     throw new Error("deploy config is not meteor");
   }
 
-  const yarnInstall = getYarnInstall(context);
+  const yarnInstall = getYarnInstall(context.build);
 
   return createBuildJobs(context, {
     appBuild:
       buildConfig.buildCommand !== null
         ? {
-            cache: [...getNodeCache(context), ...getMeteorCache(context)],
+            cache: [...getNodeCache(context.build), ...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
@@ -57,14 +56,14 @@ export const createMeteorBuildJobs = (context: Context): CatladderJob[] => {
             ],
             artifacts: {
               paths: [
-                context.componentConfig.dir + "/__build_info.json",
-                context.componentConfig.dir + "/dist",
+                context.build.dir + "/__build_info.json",
+                context.build.dir + "/dist",
               ],
             },
           }
         : undefined,
     dockerBuild: {
-      script: getDockerBuildDefaultScript(context, "ensureMeteorDockerfile"),
+      script: getDockerBuildScriptWithBuiltInDockerFile(context, "meteor"),
       variables: {
         METEOR_INSTALL_SCRIPTS: buildConfig.installScripts ? "true" : "",
       },

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,18 +7,21 @@ 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") {
     return [];
   }
 
-  const buildConfig = context.componentConfig.build;
+  const buildConfig = context.build.config;
+
   const defaultImage = getRunnerImage("jobs-default");
   const base: Omit<CatladderJob, "script" | "name"> = {
     variables: {
-      APP_PATH: context.componentConfig.dir,
+      APP_PATH: context.build.dir,
       ...context.environment.jobOnlyVars.build.envVars,
       ...(buildConfig.extraVars ?? {}),
     },
@@ -27,7 +30,7 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
     needs: [],
     envMode: "none",
   };
-  const yarnInstall = getYarnInstall(context);
+  const yarnInstall = getYarnInstall(context.build);
   const auditJob: CatladderJob | null =
     buildConfig.audit !== false
       ? {
@@ -36,16 +39,16 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
           image: buildConfig.audit?.jobImage ?? defaultImage,
           cache: undefined, // audit does not need yarn install and no cache
           script: [
-            `cd ${context.componentConfig.dir}`,
+            `cd ${context.build.dir}`,
             ...(ensureArray(buildConfig.audit?.command) ?? [
-              context.packageManagerInfo?.isClassic
+              context.build.packageManagerInfo?.isClassic
                 ? "yarn audit"
                 : "yarn npm audit --environment production", // yarn 2
             ]),
           ],
           allow_failure: true,
           ...createArtifactsConfig(
-            context.componentConfig.dir,
+            context.build.dir,
             buildConfig.audit?.artifactsReports,
             buildConfig.audit?.artifacts,
           ),
@@ -58,15 +61,15 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
           name: "👮 lint",
           ...base,
           image: buildConfig.lint?.jobImage ?? defaultImage,
-          cache: getNodeCache(context),
+          cache: getNodeCache(context.build),
           script: [
-            ...ensureNodeVersion(context),
-            `cd ${context.componentConfig.dir}`,
+            ...ensureNodeVersion(context.build),
+            `cd ${context.build.dir}`,
             ...yarnInstall,
             ...(ensureArray(buildConfig.lint?.command) ?? ["yarn lint"]),
           ],
           ...createArtifactsConfig(
-            context.componentConfig.dir,
+            context.build.dir,
             buildConfig.lint?.artifactsReports,
             buildConfig.lint?.artifacts,
           ),
@@ -80,15 +83,15 @@ export const createNodeTestJobs = (context: Context): CatladderJob[] => {
           ...base,
           image:
             buildConfig.test?.jobImage ?? getRunnerImage("jobs-testing-chrome"),
-          cache: getNodeCache(context),
+          cache: getNodeCache(context.build),
           script: [
-            ...ensureNodeVersion(context),
-            `cd ${context.componentConfig.dir}`,
+            ...ensureNodeVersion(context.build),
+            `cd ${context.build.dir}`,
             ...yarnInstall,
             ...(ensureArray(buildConfig.test?.command) ?? ["yarn test"]),
           ],
           ...createArtifactsConfig(
-            context.componentConfig.dir,
+            context.build.dir,
             buildConfig.test?.artifactsReports,
             buildConfig.test?.artifacts,
           ),

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,8 +8,10 @@ import {
 } from "../docker";
 import { isOfBuildType } from "../types";
 
-export const createRailsBuildJobs = (context: Context): CatladderJob[] => {
-  const buildConfig = context.componentConfig.build;
+export const createRailsBuildJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
+  const buildConfig = context.build.config;
   if (!isOfBuildType(buildConfig, "rails")) {
     // should not happen
     throw new Error("build type is not rails");
@@ -35,12 +37,12 @@ export const createRailsBuildJobs = (context: Context): CatladderJob[] => {
     dockerBuild: {
       variables: {
         ...context.environment.jobOnlyVars.build.envVars,
-        ...context.componentConfig.build.extraVars,
+        ...context.build.config.extraVars,
       },
       // custom script
       script: [
         ...gitlabDockerLogin(context),
-        `cd ${context.componentConfig.dir}`,
+        `cd ${context.build.dir}`,
         `docker pull $DOCKER_CACHE_IMAGE || true`,
         `wget --output-document=- https://github.com/buildpacks/pack/releases/download/v${cnbConf?.packVersion}/pack-v${cnbConf?.packVersion}-linux.tgz | tar -zx --directory /usr/local/bin pack`,
         `chmod +x /usr/local/bin/pack`,

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,15 +1,17 @@
-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") {
     return [];
   }
 
-  const buildConfig = context.componentConfig.build;
+  const buildConfig = context.build.config;
 
   const base: Omit<CatladderJob, "script" | "name"> = {
     variables: {
@@ -43,7 +45,7 @@ export const createRailsTestJobs = (context: Context): CatladderJob[] => {
           image:
             buildConfig.audit?.jobImage ?? buildConfig.jobImage ?? defaultImage,
           script: [
-            `cd ${context.componentConfig.dir}`,
+            `cd ${context.build.dir}`,
             ...(ensureArray(buildConfig.audit?.command) ?? [
               "gem install bundler-audit",
               "bundle audit check",
@@ -63,7 +65,7 @@ export const createRailsTestJobs = (context: Context): CatladderJob[] => {
           image:
             buildConfig.lint?.jobImage ?? buildConfig.jobImage ?? defaultImage,
           script: [
-            `cd ${context.componentConfig.dir}`,
+            `cd ${context.build.dir}`,
             ...bundlerInstall,
             ...(ensureArray(buildConfig.lint?.command) ?? [
               "bundle exec rubocop",
@@ -81,7 +83,7 @@ export const createRailsTestJobs = (context: Context): CatladderJob[] => {
           image:
             buildConfig.test?.jobImage ?? buildConfig.jobImage ?? defaultImage,
           script: [
-            `cd ${context.componentConfig.dir}`,
+            `cd ${context.build.dir}`,
             ...bundlerInstall,
             ...(ensureArray(buildConfig.test?.command) ?? [
               "bundle exec rspec",

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 => {
-  const buildConfig = context.componentConfig.build;
+export const createSbomBuildJob = (context: ComponentContext): CatladderJob => {
+  const buildConfig = context.build.config;
 
   const defaultImage = "aquasec/trivy:0.38.3";
   const defaultScript = [
     `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
-      context.packageManagerInfo?.componentIsInWorkspace
+      context.build.packageManagerInfo?.componentIsInWorkspace
         ? "."
-        : context.componentConfig.dir
+        : context.build.dir
     }`,
   ];
 

package/src/build/types.ts

@@ -58,28 +58,6 @@ export type BuildConfigBase = {
    */
   buildCommand?: string | string[] | null;
 
-  /**
-   * customize docker build
-   */
-  docker?: {
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsBegin?: string[];
-    /**
-     * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
-     *
-     * - [runner-images/docker-build/scripts/ensureNodeDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNodeDockerfile)
-     * - [runner-images/docker-build/scripts/ensureNginxDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureNginxDockerfile)
-     * - [runner-images/docker-build/scripts/ensureMeteorDockerfile](https://git.panter.ch/catladder/catladder/-/tree/main/runner-images/docker-build/scripts/ensureMeteorDockerfile)
-     */
-    additionsEnd?: string[];
-  };
-
   /**
    * customize lint, set false to disable
    */
@@ -132,11 +110,13 @@ export type BuildConfigNodeBase = BuildConfigBase & {
 
 export type BuildConfigNode = {
   type: "node";
+  docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
 } & BuildConfigNodeBase;
 
 export type BuildConfigNodeStatic = BuildConfigNodeBase & {
   type: "node-static";
   startCommand?: never;
+  docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
 };
 
 export type BuildConfigMeteor = BuildConfigNodeBase & {
@@ -146,23 +126,58 @@ export type BuildConfigMeteor = BuildConfigNodeBase & {
    * This is only required if you have custom scripts in your image
    */
   installScripts?: boolean;
+  docker?: Omit<BuildConfigDockerBuiltInMeteor, "type"> | BuildConfigDocker;
 };
 
-export type BuildConfigCustomDocker = BuildConfigBase["docker"] &
-  (
-    | {
-        /**
-         * use the built-in nginx image for simple static apps
-         */
-        type: "nginx";
-      }
-    | {
-        /**
-         * custom docker build, expect that a Dockerfile in your directory
-         */
-        type: "custom";
-      }
-  );
+type BuildConfigDockerWithAdditions = {
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile before the standard build steps.
+   *
+   */
+  additionsBegin?: string[];
+  /**
+   * Custom Dockerfile lines integrated in the generated Dockerfile after the standard build steps.
+   *
+   */
+  additionsEnd?: string[];
+};
+
+type BuildConfigDockerBuiltInNode = {
+  type: "node";
+} & BuildConfigDockerWithAdditions;
+
+type BuildConfigDockerBuiltInMeteor = {
+  type: "meteor";
+} & BuildConfigDockerWithAdditions;
+
+type BuildConfigDockerBuiltInNgninx = {
+  /**
+   * use the built-in nginx image for simple static apps
+   */
+  type: "nginx";
+} & BuildConfigDockerWithAdditions;
+type BuildConfigDockerBuiltIn =
+  | BuildConfigDockerBuiltInNgninx
+  | BuildConfigDockerBuiltInNode
+  | BuildConfigDockerBuiltInMeteor;
+
+type BuildConfigDockerCustom = {
+  /**
+   * custom docker build, expect that a Dockerfile in your directory
+   */
+  type: "custom";
+};
+
+export type BuildConfigDocker =
+  | BuildConfigDockerBuiltIn
+  | BuildConfigDockerCustom;
+
+/**
+ * @deprecated this type is no longer used. Use {@link BuildConfigDocker} instead.
+ */
+export type BuildConfigCustomDocker =
+  | BuildConfigDockerCustom
+  | BuildConfigDockerBuiltInNgninx;
 
 export type BuildConfigCustom = Omit<
   BuildConfigBase,
@@ -175,7 +190,7 @@ export type BuildConfigCustom = Omit<
    */
   jobServices?: Services;
 
-  docker: BuildConfigCustomDocker;
+  docker: BuildConfigDocker;
 
   /**
    * custom lint, disabled when not set

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,14 +7,14 @@ 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),
     "app-name": sanitize(context.fullConfig.appName),
     "env-type": sanitize(context.environment.envType),
     "env-name": sanitize(context.environment.shortName),
-    "build-type": sanitize(context.componentConfig.build?.type),
+    "build-type": sanitize(context.build.config?.type),
     ...(context.fullConfig.meta?.labels ?? {}),
   };
   return labels;