@catladder/pipeline 1.101.4 → 1.102.0

package/src/deploy/base.ts

@@ -76,6 +76,7 @@ export const getBaseDeploymentJob = (context: Context): JobWithoutScript => {
       ...DEPLOY_RUNNER_VARIABLES,
       ...context.environment.envVars,
       ...(hasDocker ? getDockerImageVariables(context) : {}),
+      ...context.environment.jobOnlyVars.deploy.envVars,
       ...(context.componentConfig.deploy
         ? context.componentConfig.deploy.extraVars ?? {}
         : {}),
@@ -115,6 +116,7 @@ export const getBaseDeploymentStopJob = (
     ],
     variables: {
       ...DEPLOY_RUNNER_VARIABLES,
+      ...context.environment.jobOnlyVars.deploy.envVars,
       GIT_STRATEGY: "none",
     },
     stage: "stop",
@@ -138,6 +140,7 @@ export const getBaseRollbackJob = (context: Context): JobWithoutScript => {
     ],
     variables: {
       ...DEPLOY_RUNNER_VARIABLES,
+      ...context.environment.jobOnlyVars.deploy.envVars,
       GIT_STRATEGY: "none",
     },
     stage: "rollback",

package/src/deploy/types/base.ts

@@ -1,3 +1,5 @@
+import type { EnvVars } from "../../types/config";
+
 export type DeployConfigBase = {
   /**
    * whether to deploy automatically or manual. If not defined, these rules apply:
@@ -17,8 +19,16 @@ export type DeployConfigBase = {
    */
   jobTags?: string[];
 
+  /**
+   * vars that only exist in the deploy job.
+   * Can curently not reference other variables from other components
+   */
+  jobVars?: EnvVars;
+
   /**
    * additional env vars for the deploy job
+   *
+   * @deprecated use deploy.jobVars for deploy job specific variables
    */
   extraVars?: Record<string, string>;
 };

package/src/types/context.ts

@@ -6,6 +6,22 @@ import type {
   EnvType,
 } from "./config";
 
+export type EnvironmentEnvVars = {
+  envVars: Record<string, string>;
+  secretEnvVarKeys: SecretEnvVar[];
+};
+export type EnvironmentEnvVarPart = {
+  host: string;
+  url: string;
+
+  /**
+   * vars that only are injected in certain jobs, but not elsewhere
+   */
+  jobOnlyVars: {
+    deploy: EnvironmentEnvVars;
+    build: EnvironmentEnvVars;
+  };
+} & EnvironmentEnvVars;
 export type Environment = {
   host: string;
   url: string;
@@ -21,13 +37,9 @@ export type Environment = {
   shortName: string;
   slugPrefix: string;
   slug: string;
-  /**
-   * env vars contain all build-time env vars. secrets have to be resolved (they are stored in gitlab)
-   */
-  envVars: Record<string, string>;
+
   envType: EnvType;
-  secretEnvVarKeys: SecretEnvVar[];
-};
+} & EnvironmentEnvVarPart;
 
 export type CommitInfo = {
   refName: string;