Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/12factor-env/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ const env = <S extends Specs, V extends Specs>(
const _secrets = secretEnv(varEnv as unknown as Record<string, string | undefined>, secrets);

// Second pass: validate secrets with file values merged in
const mergedEnv = { ...varEnv, ..._secrets } as unknown as Record<string, string | undefined>;
// Include inputEnv first so env vars (e.g., Kubernetes secretKeyRef) are available,
// then varEnv overrides, then file-based secrets have highest priority
const mergedEnv = { ...inputEnv, ...varEnv, ..._secrets } as unknown as Record<string, string | undefined>;
return cleanEnv(mergedEnv, secrets) as unknown as CleanedEnv<S & V>;
};

Expand Down