From 2d4adfc6518e74b1bd901c0db34d34a97c1c7341 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <daniel@infisical.com>
Date: Fri, 25 Apr 2025 03:54:59 +0400
Subject: [PATCH 1/3] fix(kms): better error logs

---
 backend/src/services/kms/kms-service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/services/kms/kms-service.ts b/backend/src/services/kms/kms-service.ts
index 07ed90bef..5d17c2c80 100644
--- a/backend/src/services/kms/kms-service.ts
+++ b/backend/src/services/kms/kms-service.ts
@@ -787,13 +787,16 @@ export const kmsServiceFactory = ({
             return projectDataKey;
           }
         }
+      } catch (error) {
+        logger.error(error, "Failed to get project data key");
+        throw error;
       } finally {
         await lock?.release();
       }
     }
 
     if (!project.kmsSecretManagerEncryptedDataKey) {
-      throw new Error("Missing project data key");
+      throw new BadRequestError({ message: "Missing project data key" });
     }
 
     const kmsDecryptor = await decryptWithKmsKey({

From 795ce110622ba57d38bb996c3857d29d1860abd9 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <daniel@infisical.com>
Date: Fri, 25 Apr 2025 04:00:14 +0400
Subject: [PATCH 2/3] Update kms-service.ts

---
 backend/src/services/kms/kms-service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/services/kms/kms-service.ts b/backend/src/services/kms/kms-service.ts
index 5d17c2c80..efa771b56 100644
--- a/backend/src/services/kms/kms-service.ts
+++ b/backend/src/services/kms/kms-service.ts
@@ -788,7 +788,7 @@ export const kmsServiceFactory = ({
           }
         }
       } catch (error) {
-        logger.error(error, "Failed to get project data key");
+        logger.error(error, `Failed to get project data key for [projectId=${projectId}]`);
         throw error;
       } finally {
         await lock?.release();

From 90fdba0b77e250fde4e0b99c2d5f958e7f546cf1 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <daniel@infisical.com>
Date: Fri, 25 Apr 2025 04:04:26 +0400
Subject: [PATCH 3/3] Update kms-service.ts

---
 backend/src/services/kms/kms-service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/services/kms/kms-service.ts b/backend/src/services/kms/kms-service.ts
index efa771b56..8bfa50b64 100644
--- a/backend/src/services/kms/kms-service.ts
+++ b/backend/src/services/kms/kms-service.ts
@@ -788,7 +788,10 @@ export const kmsServiceFactory = ({
           }
         }
       } catch (error) {
-        logger.error(error, `Failed to get project data key for [projectId=${projectId}]`);
+        logger.error(
+          error,
+          `getProjectSecretManagerKmsDataKey: Failed to get project data key for [projectId=${projectId}]`
+        );
         throw error;
       } finally {
         await lock?.release();