From b1ba770a71c79ff7933f903b4434e40ac97a30bd Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <daniel@infisical.com>
Date: Fri, 25 Oct 2024 20:29:21 +0400
Subject: [PATCH] Update external-migration-fns.ts

---
 .../external-migration-fns.ts                   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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<Infisica
     secretName: string,
     envs: typeof parsedJson.envs
   ): { val?: string } => {
-    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);