diff --git a/backend/src/services/external-migration/external-migration-fns.ts b/backend/src/services/external-migration/external-migration-fns.ts index c86482168..ad1c4d8ed 100644 --- a/backend/src/services/external-migration/external-migration-fns.ts +++ b/backend/src/services/external-migration/external-migration-fns.ts @@ -105,7 +105,22 @@ export const parseEnvKeyDataFn = async (decryptedJson: string): Promise { - if (!secret.inheritsEnvironmentId) return secret; + if (!secret) { + return { + val: "" + }; + } + + // If we have a direct value, return it + if (secret.val !== undefined) { + return secret; + } + + // If there's no inheritance, return the secret as is + if (!secret.inheritsEnvironmentId) { + return secret; + } + const inheritedEnv = envs[secret.inheritsEnvironmentId]; if (!inheritedEnv) return secret; return findRootInheritedSecret(inheritedEnv.variables[secretName], secretName, envs);