@catladder/pipeline 1.170.1 → 2.0.1

package/src/build/types.ts

@@ -89,12 +89,6 @@ export type BuildConfigBase = {
    * Can curently not reference other variables from other components
    */
   jobVars?: EnvVars;
-  /**
-   * additional env vars for the buid jobs
-   *
-   * @deprecated use jobVars or runnerVariables
-   */
-  extraVars?: Record<string, string>;
 
   /**
    * additional vars only for the runner.
@@ -239,13 +233,6 @@ 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,
   "lint" | "test" | "audit"

package/src/context/createComponentContext.ts

@@ -108,7 +108,6 @@ export const createComponentContext = async (
   const context: Omit<ComponentContext, "customJobs"> = {
     type: "component",
     name: ctx.componentName,
-    componentName: ctx.componentName,
     env: ctx.env,
     fullConfig: ctx.config,
     componentConfig,

package/src/context/getEnvConfig.ts

@@ -14,8 +14,8 @@ export const getEnvConfig = (
 
   const envCustomizations = defaultConfig.env?.[env] ?? {};
   if (envCustomizations === false) {
-    throw new Error("env is disabled: " + env + ":" + componentName);
+    // env is disabled, still return the default config
+    return defaultConfig;
   }
-
   return mergeWithMergingArrays(defaultConfig, envCustomizations);
 };

package/src/context/getEnvironment.ts

@@ -20,7 +20,7 @@ export const getEnvironment = async (
     slugPrefix: envContext.environmentSlugPrefix,
     reviewSlug: envContext.reviewSlug,
     slug: envContext.environmentSlug,
-    shortName: env,
+
     ...variables,
   };
 };

package/src/context/getEnvironmentContext.ts

@@ -1,4 +1,4 @@
-import type { BuildConfig, CreateComponentContextContext } from "..";
+import type { CreateComponentContextContext } from "..";
 import type { StringOrBashExpression } from "../bash/BashExpression";
 import { joinBashExpressions } from "../bash/BashExpression";
 

package/src/context/getEnvironmentVariables.ts

@@ -1,4 +1,3 @@
-import { merge } from "lodash";
 import { DEPLOY_TYPES } from "../deploy";
 import type {
   ComponentContext,
@@ -11,12 +10,10 @@ import type { StringOrBashExpression } from "../bash/BashExpression";
 import { joinBashExpressions } from "../bash/BashExpression";
 import { isStandaloneBuildConfig } from "../build/types";
 import type { EnvironmentContext } from "../types/environmentContext";
+import { createVariableValueContainingReferencesFromString } from "../variables/VariableValueContainingReferences";
+import { resolveAllReferences } from "../variables/resolveAllReferences";
 import { getBuildInfoVariables } from "./getBuildInfoVariables";
 import { getEnvironmentContext } from "./getEnvironmentContext";
-import {
-  resolveReferences,
-  translateLegacyFromComponents,
-} from "./resolveReferences";
 import { transformJobOnlyVars } from "./transformJobOnlyVars";
 import {
   makeSecretEnvVarMapping,
@@ -43,18 +40,15 @@ type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
 
 // we export so that we have later nice autocomplete
 export type PredefinedVariables = BasePredefinedVariables & {
-  /**
-   * undefined in rails, Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-   */
-  HOST?: StringOrBashExpression;
+  HOSTNAME?: StringOrBashExpression;
   ROOT_URL: StringOrBashExpression;
-  HOST_INTERNAL: StringOrBashExpression;
+  HOSTNAME_INTERNAL: StringOrBashExpression;
   ROOT_URL_INTERNAL: StringOrBashExpression;
 };
 
 export const getEnvironmentVariables = async (
   ctx: CreateComponentContextContext,
-  alreadyVisited: Record<string, Record<string, boolean>> = {}, // to prevent endless loop
+  options: { shouldResolveReferences?: boolean } = {},
 ): Promise<EnvironmentVariables> => {
   const environmentContext = getEnvironmentContext(ctx);
 
@@ -78,12 +72,8 @@ export const getEnvironmentVariables = async (
       ...basePredefinedVariables,
       ENV_SHORT: "local",
       ROOT_URL: url,
-      // Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-      ...(isStandaloneBuildConfig(buildConfigRaw) &&
-      buildConfigRaw.type === "rails"
-        ? {}
-        : { HOST: host }),
-      HOST_INTERNAL: host,
+      HOSTNAME: host,
+      HOSTNAME_INTERNAL: host,
       ROOT_URL_INTERNAL: "http://" + host,
       PORT: port.toString(),
     };
@@ -94,10 +84,10 @@ export const getEnvironmentVariables = async (
         )
       : {};
 
-    const HOST_INTERNAL =
-      additionalEnvVars.HOST_INTERNAL ?? "unknown-host.example.com";
+    const HOSTNAME_INTERNAL =
+      additionalEnvVars.HOSTNAME_INTERNAL ?? "unknown-host.example.com";
 
-    host = envConfigRaw?.host ?? HOST_INTERNAL;
+    host = envConfigRaw?.host ?? HOSTNAME_INTERNAL;
     url = joinBashExpressions(["https://", host]);
 
     predefinedVariables = {
@@ -106,12 +96,11 @@ export const getEnvironmentVariables = async (
       ...(isStandaloneBuildConfig(buildConfigRaw) &&
       buildConfigRaw.type === "rails"
         ? {}
-        : { HOST: host }),
+        : { HOSTNAME: host }),
       ROOT_URL: url,
-      HOST_INTERNAL,
-      /**@deprecated */
-      HOST_CANONICAL: HOST_INTERNAL, // legacy alias for HOST_INTERNAL
-      ROOT_URL_INTERNAL: joinBashExpressions(["https://", HOST_INTERNAL]),
+      HOSTNAME_INTERNAL,
+
+      ROOT_URL_INTERNAL: joinBashExpressions(["https://", HOSTNAME_INTERNAL]),
       ...additionalEnvVars,
     };
   }
@@ -132,39 +121,43 @@ export const getEnvironmentVariables = async (
     componentName,
     secretEnvVarKeys,
   );
-  // this is deprecated, we now support: $componentname:FOO
-  const legacyFromComponents = envConfigRaw.vars?.fromComponents ?? {};
-  const publicEnvVarsRawWithLegacyFromComponents = merge(
-    {},
-    translateLegacyFromComponents(legacyFromComponents),
-    publicEnvVarsRaw,
-  );
 
-  const publicEnvVarsRawSanitized = stringifyValues(
-    publicEnvVarsRawWithLegacyFromComponents,
+  const publicEnvVarsRawSanitized = stringifyValues(publicEnvVarsRaw);
+
+  const publicEnvVarsUnresolved = Object.fromEntries(
+    Object.entries(publicEnvVarsRawSanitized).map(([key, value]) => [
+      key,
+      createVariableValueContainingReferencesFromString(value, {
+        componentName: ctx.componentName,
+      }),
+    ]),
   );
 
-  const envVarsRaw = addIndexVar({
+  const publicEnvVars =
+    options.shouldResolveReferences ?? true
+      ? await resolveAllReferences(
+          publicEnvVarsUnresolved,
+          async (otherComponentName) => {
+            const { envVars: otherEnvVars } = await getEnvironmentVariables(
+              {
+                ...ctx,
+                componentName: otherComponentName,
+              },
+              {
+                shouldResolveReferences: false, // we already do this here with replaceAllReferences recursivly until re replaced all
+              },
+            );
+            return otherEnvVars;
+          },
+        )
+      : publicEnvVarsUnresolved;
+
+  const envVars = addIndexVar({
     ...predefinedVariables,
     ...secretEnvVars,
-    ...publicEnvVarsRawSanitized,
+    ...publicEnvVars,
   });
 
-  const envVars = (await resolveReferences(
-    envVarsRaw,
-    async (otherComponentName, alreadyVisited) => {
-      const { envVars: otherEnvVars } = await getEnvironmentVariables(
-        {
-          ...ctx,
-          componentName: otherComponentName,
-        },
-        alreadyVisited,
-      );
-      return otherEnvVars;
-    },
-    alreadyVisited,
-  )) as typeof envVarsRaw;
-
   return {
     envVars,
     secretEnvVarKeys,

package/src/deploy/base/deploy.ts

@@ -111,7 +111,7 @@ export const createDeployJob = (
       ...context.environment.envVars,
       ...(hasDocker ? getDockerImageVariables(context) : {}),
       ...context.environment.jobOnlyVars.deploy.envVars,
-      ...(deployConfig ? deployConfig.extraVars ?? {} : {}),
+
       ...jobDefinition.variables,
     },
     runnerVariables: {

package/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts

@@ -1,11 +1,10 @@
-import { isNil, omit } from "lodash";
-import type {
-  ComponentContext,
-  UnspecifiedEnvVars,
-} from "../../../types/context";
+import { omit } from "lodash";
+import type { ComponentContext } from "../../../types/context";
 import { collapseableSection } from "../../../utils/gitlab";
 import { getDependencyTrackUploadScript } from "../../sbom";
 
+import { GCLOUD_DEPLOY_CREDENTIALS_KEY } from "..";
+import { writeBashYamlToFileScript } from "../../../bash/bashYaml";
 import { getRemoveOldRevisionsAndImagesCommand } from "../cleanup";
 import { getDatabaseCreateScript } from "../utils/database";
 import { gcloudServiceAccountLoginCommands } from "../utils/gcloudServiceAccountLoginCommands";
@@ -19,14 +18,7 @@ import {
   getCloudRunDeployConfig,
   setGoogleProjectNumberScript,
 } from "./common";
-import { GCLOUD_DEPLOY_CREDENTIALS_KEY } from "..";
-import type { StringOrBashExpression } from "../../../bash/BashExpression";
-import { BashExpression, bashEscape } from "../../../bash/BashExpression";
 import { ENV_VARS_FILENAME } from "./constants";
-import {
-  writeBashYamlToFileScript,
-  yamlBashString,
-} from "../../../bash/bashYaml";
 
 export function getCloudRunDeployScripts(context: ComponentContext) {
   const deployConfig = getCloudRunDeployConfig(context);

package/src/deploy/cloudRun/index.ts

@@ -85,7 +85,7 @@ export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCloudRun>
     getAdditionalEnvVars: (ctx) => {
       const { fullName, env, componentName, deployConfigRaw } = ctx;
 
-      const HOST_INTERNAL = joinBashExpressions(
+      const HOSTNAME_INTERNAL = joinBashExpressions(
         [
           fullName,
           getBashVariable(
@@ -113,7 +113,7 @@ export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCloudRun>
           : {};
 
       return {
-        HOST_INTERNAL,
+        HOSTNAME_INTERNAL,
         ...getCloudSqlVariables(ctx),
         ...jobTriggers,
         DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw

package/src/deploy/kubernetes/cloudSql/index.ts

@@ -1,6 +1,7 @@
 import type { StringOrBashExpression } from "../../../bash/BashExpression";
 import { getSecretVarNameForContext } from "../../../context";
 import type { ComponentContext } from "../../../types";
+import type { VariableValue } from "../../../variables/VariableValue";
 import { getFullDbName } from "../../cloudSql/utils";
 import { isOfDeployType } from "../../types";
 
@@ -18,7 +19,7 @@ type CloudSqlValues = {
   proxyCredentials: string;
 
   instanceConnectionName: string;
-  fullDbName: StringOrBashExpression;
+  fullDbName: VariableValue;
   dbUser: string;
 };
 export const createKubernetesCloudsqlBaseValues = (
@@ -41,21 +42,7 @@ export const createKubernetesCloudsqlBaseValues = (
     context,
     "cloudsqlProxyCredentials",
   )}`;
-  if (config?.type !== "unmanaged") {
-    const instanceConnectionName = `${config.projectId ?? "skynet-164509"}:${
-      config.region ?? "europe-west6"
-    }:${config.instanceId ?? context.environment.envVars.KUBE_NAMESPACE}`;
-
-    return {
-      cloudsql: {
-        enabled: config.enabled,
-        dbUser: "postgres",
-        instanceConnectionName,
-        proxyCredentials,
-        fullDbName: context.environment.envVars.KUBE_APP_NAME ?? "",
-      },
-    };
-  } else if (config.type === "unmanaged") {
+  if (config.type === "unmanaged") {
     return {
       cloudsql: {
         enabled: config.enabled,

package/src/deploy/kubernetes/deployJob.ts

@@ -47,8 +47,6 @@ export const createKubernetesDeployJobs = (
         ...(deployConfig.additionalHelmArgs ?? []),
       ].join(" "),
       COMPONENT_NAME: context.name,
-      /** @deprecated */
-      BUILD_ID: context.environment.envVars.BUILD_INFO_BUILD_ID,
     },
   };
 

package/src/deploy/kubernetes/index.ts

@@ -29,7 +29,7 @@ export const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigKubernetes
         fullConfig.domainCanonical ||
         "panter.cloud";
 
-      const HOST_INTERNAL = joinBashExpressions(
+      const HOSTNAME_INTERNAL = joinBashExpressions(
         [
           componentSlug,
           ...(envType === "review" && reviewSlug ? [reviewSlug] : []),
@@ -44,7 +44,7 @@ export const KUBERNETES_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigKubernetes
         KUBE_NAMESPACE,
         KUBE_APP_NAME,
         KUBE_APP_NAME_PREFIX,
-        HOST_INTERNAL,
+        HOSTNAME_INTERNAL,
       };
     },
   };

package/src/deploy/kubernetes/kubeEnv.ts

@@ -1,5 +1,5 @@
-import type { StringOrBashExpression } from "../../bash/BashExpression";
 import type { ComponentContext } from "../../types";
+import type { VariableValue } from "../../variables/VariableValue";
 import { isOfDeployType } from "../types";
 
 const shouldGoIntoSecrets = (key: string, value: string | undefined) => {
@@ -23,8 +23,8 @@ export const createKubeEnv = (context: ComponentContext) => {
   const allEnvVars = context.environment.envVars;
 
   const env = Object.entries(allEnvVars).reduce<{
-    secret: Record<string, StringOrBashExpression>;
-    public: Record<string, StringOrBashExpression>;
+    secret: Record<string, VariableValue>;
+    public: Record<string, VariableValue>;
   }>(
     (acc, [key, value]) => {
       if (shouldGoIntoSecrets(key, value?.toString())) {

package/src/deploy/kubernetes/kubeValues.ts

@@ -11,7 +11,6 @@ import {
 
 import { createKubeEnv } from "./kubeEnv";
 import { createMongodbBaseConfig } from "./mongodb";
-import { processSecretsAsFiles } from "./processSecretsAsFiles";
 
 const createAppConfig = (
   context: ComponentContext,
@@ -87,14 +86,12 @@ export const createKubeValues = (context: ComponentContext) => {
       : {},
   );
 
-  const kubeValues = processSecretsAsFiles(
-    mergeWithMergingArrays(defaultKubeValues, {
-      jobs: removeFalsy(jobs),
-      cronjobs: removeFalsy(cronjobs),
+  const kubeValues = mergeWithMergingArrays(defaultKubeValues, {
+    jobs: removeFalsy(jobs),
+    cronjobs: removeFalsy(cronjobs),
 
-      ...rest,
-    }),
-  );
+    ...rest,
+  });
 
   return kubeValues;
 };

package/src/deploy/types/base.ts

@@ -25,12 +25,6 @@ export type DeployConfigBase = {
    */
   jobVars?: EnvVars;
 
-  /**
-   * additional env vars for the deploy job
-   *
-   * @deprecated use deploy.jobVars for deploy job specific variables
-   */
-  extraVars?: Record<string, string>;
   /**
    * additional vars only for the runner.
    * Also if you use services: that require env vars, you need to set them here.

package/src/deploy/types/kubernetes.ts

@@ -164,33 +164,6 @@ export type DeployConfigMongodbReplicaset = {
 export type DeployConfigMongodb = DeployConfigMongodbBase &
   (DeployConfigMongodbStandalone | DeployConfigMongodbReplicaset);
 
-/**
- * @deprecated use config with instanceConnectionName
- */
-type DeployConfigKubernetesValuesCloudSQLLegacy = {
-  enabled: boolean;
-  /**
-   * @deprecated use config with instanceConnectionName
-   */
-  instanceId?: string;
-  /**
-   * @deprecated use config with instanceConnectionName
-   */
-  projectId?: string;
-  /**
-   * @deprecated use config with instanceConnectionName
-   */
-  region?: string;
-  /**
-   * @deprecated use type "unmanaged".
-   *
-   * Be aware that "unmanaged" is not fully backward compatible with "legacy".
-   *
-   *
-   */
-  type?: "legacy";
-};
-
 export type DeployConfigKubernetesValuesCloudSQLUnmanaged = {
   enabled: boolean;
   instanceConnectionName: string;
@@ -220,8 +193,7 @@ export type DeployConfigKubernetesValuesCloudSQLUnmanaged = {
   dbBaseName?: string;
 };
 export type DeployConfigKubernetesValuesCloudSQL =
-  | DeployConfigKubernetesValuesCloudSQLLegacy
-  | DeployConfigKubernetesValuesCloudSQLUnmanaged;
+  DeployConfigKubernetesValuesCloudSQLUnmanaged;
 export type DeployConfigKubernetesValues = AllowUnknownProps<{
   /**
    * enable cloudsql db. Currently you have to manually set it up
@@ -358,13 +330,6 @@ export type DeployConfigKubernetesValues = AllowUnknownProps<{
   mapServiceUrlToEnv?: {
     [envVar: string]: string;
   };
-  /**
-   * Mount secrets as files in the filesystem.
-   * These secrets are still available as env vars, but will contain the path of the file instead
-   *
-   * @deprecated this will be removed in the future, because its very niche and not used
-   */
-  secretsAsFile?: string[];
 }>;
 
 export type DeployConfigKubernetes = {

package/src/globalScriptFunctions/index.ts

@@ -0,0 +1,30 @@
+class GlobalScriptFunction {
+  constructor(
+    public name: string,
+    public script: string,
+  ) {}
+
+  toBashFunction() {
+    return `function ${this.name} () {
+${this.script.trim()}
+}`.trim();
+  }
+  invoke(...args: string[]) {
+    return `${this.name} ${args.join(" ")}`;
+  }
+}
+
+export const globalScriptFunctions = new Map<string, GlobalScriptFunction>();
+
+/**
+ * registers a global script function
+ * only use that in top-level scopes as it will attach the function to the global scope
+ */
+export const registerGlobalScriptFunction = (name: string, script: string) => {
+  if (globalScriptFunctions.has(name)) {
+    throw new Error(`Global script function ${name} already exists`);
+  }
+  const scriptFunction = new GlobalScriptFunction(name, script);
+  globalScriptFunctions.set(name, scriptFunction);
+  return scriptFunction;
+};

package/src/index.ts

@@ -7,3 +7,5 @@ export * from "./context";
 export * from "./build";
 export * from "./deploy";
 export * from "./utils/writeFiles";
+export * from "./variables/VariableValue";
+export * from "./bash";

package/src/pipeline/gitlab/createGitlabJobs.ts

@@ -106,7 +106,6 @@ export const makeGitlabJob = (
     environment,
     envMode,
     needsStages,
-    needsOtherComponent,
     name,
     needs,
     jobTags,
@@ -310,7 +309,7 @@ function deduplicateNeeds(needs: GitlabJobDef["needs"]): GitlabJobDef["needs"] {
 
 function getGitlabNeedsForComponentJob(
   context: ComponentContext,
-  { needsStages, needs, needsOtherComponent }: CatladderJob<string>,
+  { needsStages, needs }: CatladderJob<string>,
   allJobs: AllCatladderJobs,
 ): GitlabJobDef["needs"] {
   const needsFromStages = needsStages?.flatMap<CatladderJobNeed>((n) => {
@@ -353,8 +352,6 @@ function getGitlabNeedsForComponentJob(
   const cleanedNeeds: CatladderJob["needs"] = [
     ...(needsFromStages ?? []),
     ...(needs ?? []),
-    // pull in legacy needs from other component, which is now identical to needs
-    ...(needsOtherComponent ?? []),
   ];
 
   return cleanedNeeds

package/src/pipeline/gitlab/createGitlabPipeline.ts

@@ -1,11 +1,12 @@
 import { getRunnerImage } from "../../runner";
 import type { Pipeline } from "../../types";
-
+import { globalScriptFunctions } from "../../globalScriptFunctions";
 type PickRequired<T, K extends keyof T> = Required<Pick<T, K>> & Omit<T, K>;
 
 export const createGitlabPipelineWithDefaults = ({
   image,
   variables,
+  before_script,
   ...config
 }: PickRequired<
   Partial<Pipeline<"gitlab">>,
@@ -22,6 +23,12 @@ export const createGitlabPipelineWithDefaults = ({
       GIT_DEPTH: "1", // no need the full depth
       ...(variables ?? {}),
     },
+    before_script: [
+      ...[...globalScriptFunctions.values()].map((script) =>
+        script.toBashFunction(),
+      ),
+      ...(before_script ?? []),
+    ],
 
     ...config,
   };

package/src/pipeline/packageManager.ts

@@ -49,11 +49,13 @@ export const getPackageManagerInfoForComponent = async (
     : [];
 
   const pathsToCopyInDocker = [
-    packageJson,
-    ...(workspacePackageJson ? [workspacePackageJson] : []),
-    lockFile,
-    ...configFilePaths,
-    ...currentWorkspaceDependencies,
+    ...new Set([
+      packageJson,
+      ...(workspacePackageJson ? [workspacePackageJson] : []),
+      lockFile,
+      ...configFilePaths,
+      ...currentWorkspaceDependencies,
+    ]),
   ];
   return {
     ...baseInfo,

package/src/runner/index.ts

@@ -5,7 +5,6 @@ export type RunnerImageName =
   | "jobs-meteor"
   | "jobs-testing-chrome"
   | "kubernetes"
-  | "base-pipeline"
   | "docker-build"
   | "gcloud"
   | "semantic-release";

package/src/types/config.ts

@@ -73,14 +73,6 @@ export type EnvVars = {
    * secret env vars. These vars can be managed with catladder/cli
    */
   secret?: string[];
-  /**
-   * @deprecated, use ${componentName:variableName} instead
-   *
-   * With fromComponents you can inject env vars from other components.
-   */
-  fromComponents?: {
-    [otherApp: string]: Record<string, string>;
-  };
 };
 
 export type DefaultEnvConfig = {
@@ -169,12 +161,14 @@ export type ComponentConfig<C extends ConfigProps = never> = {
    * Use this in combination with @dotenvx/dotenvx or node 20 to start apps locally with .env files
    * During build and runtime, it relies on the env vars set in the environment
    *
+   * @defaultValue true
+   *
    */
   dotEnv?: boolean | "local";
   /**
    * whether to create a env.d.ts localy and during build jobs
    *
-   * Be careful, this will overwrite any existing env.d.ts file!
+   * @defaultValue true
    */
   envDTs?: boolean;
 } & DefaultEnvConfig;
@@ -184,6 +178,9 @@ export type ConfigProps = {
 };
 
 export type Config<C extends ConfigProps = never> = {
+  /**
+   * the pipeline type to generate, defaults to gitlab
+   */
   pipelineType?: PipelineType;
 
   /**

package/src/types/context.ts

@@ -6,6 +6,7 @@ import type {
 } from "../build";
 import type { PredefinedVariables, SecretEnvVar } from "../context";
 import type { DeployConfig } from "../deploy";
+import type { VariableValue } from "../variables/VariableValue";
 import type {
   ComponentConfig,
   Config,
@@ -17,7 +18,7 @@ import type { PipelineType } from "./pipeline";
 
 export type UnspecifiedEnvVars = Record<
   string,
-  StringOrBashExpression | undefined | null
+  VariableValue | undefined | null
 >;
 
 export type EnvironmentEnvVars<
@@ -46,10 +47,7 @@ export type Environment = {
    * the full name of the app. We use this as RELEASE_NAME in kubernetes and the service name in google cloud run
    */
   fullName: StringOrBashExpression;
-  /**
-   * @deprecated this is the same as context.env, use that instead
-   */
-  shortName: string;
+
   /**
    * the environment slug without component name.
    */
@@ -158,10 +156,6 @@ export type ComponentContext<
    * the name of the component
    */
   name: string;
-  /**
-   * @deprecated use name instead
-   */
-  componentName: string;
 
   /**
    * the merged component config.