From 6566393e219792cc47276af00bb74db9180f6b33 Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Tue, 24 Jun 2025 14:39:46 -0400
Subject: [PATCH] Review fixes

---
 .../audit-log-stream/audit-log-stream-fns.ts  | 30 +++++++++----------
 .../ee/services/audit-log/audit-log-queue.ts  | 10 +++----
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/backend/src/ee/services/audit-log-stream/audit-log-stream-fns.ts b/backend/src/ee/services/audit-log-stream/audit-log-stream-fns.ts
index ba0434982..dc93f238e 100644
--- a/backend/src/ee/services/audit-log-stream/audit-log-stream-fns.ts
+++ b/backend/src/ee/services/audit-log-stream/audit-log-stream-fns.ts
@@ -1,22 +1,20 @@
-// Specific DataDog log intake hostnames
-const dataDogHostnames = [
-  "http-intake.logs.datadoghq.com",
-  "http-intake.logs.us3.datadoghq.com",
-  "http-intake.logs.us5.datadoghq.com",
-  "http-intake.logs.datadoghq.eu",
-  "http-intake.logs.ap1.datadoghq.com",
-  "http-intake.logs.ddog-gov.com"
-];
-
 export function providerSpecificPayload(url: string) {
+  const { hostname } = new URL(url);
+
   const payload: Record<string, string> = {};
 
-  // If URL is for DataDog, add a "ddsource: infisical" entry
-  if (
-    dataDogHostnames.some((hostname) => url.startsWith(`https://${hostname}`) || url.startsWith(`http://${hostname}`))
-  ) {
-    payload.ddsource = "infisical";
-    payload.service = "audit-logs";
+  switch (hostname) {
+    case "http-intake.logs.datadoghq.com":
+    case "http-intake.logs.us3.datadoghq.com":
+    case "http-intake.logs.us5.datadoghq.com":
+    case "http-intake.logs.datadoghq.eu":
+    case "http-intake.logs.ap1.datadoghq.com":
+    case "http-intake.logs.ddog-gov.com":
+      payload.ddsource = "infisical";
+      payload.service = "audit-logs";
+      break;
+    default:
+      break;
   }
 
   return payload;
diff --git a/backend/src/ee/services/audit-log/audit-log-queue.ts b/backend/src/ee/services/audit-log/audit-log-queue.ts
index 03af17285..c240bc6ec 100644
--- a/backend/src/ee/services/audit-log/audit-log-queue.ts
+++ b/backend/src/ee/services/audit-log/audit-log-queue.ts
@@ -143,13 +143,12 @@ export const auditLogQueueServiceFactory = async ({
                   }
                 );
                 logger.info(
-                  `Successfully streamed audit log to ${url} for org ${orgId}. Response body: ${JSON.stringify(response.data)}`
+                  `Successfully streamed audit log [url=${url}] for org [orgId=${orgId}] [response=${JSON.stringify(response.data)}]`
                 );
                 return response;
               } catch (error) {
                 logger.error(
-                  `Failed to stream audit log to ${url} for org ${orgId}. Error:`,
-                  (error as AxiosError).message
+                  `Failed to stream audit log [url=${url}] for org [orgId=${orgId}] [error=${(error as AxiosError).message}]`
                 );
                 return error;
               }
@@ -249,13 +248,12 @@ export const auditLogQueueServiceFactory = async ({
               }
             );
             logger.info(
-              `Successfully streamed audit log to ${url} for org ${orgId}. Response body: ${JSON.stringify(response.data)}`
+              `Successfully streamed audit log [url=${url}] for org [orgId=${orgId}] [response=${JSON.stringify(response.data)}]`
             );
             return response;
           } catch (error) {
             logger.error(
-              `Failed to stream audit log to ${url} for org ${orgId}. Error:`,
-              (error as AxiosError).message
+              `Failed to stream audit log [url=${url}] for org [orgId=${orgId}] [error=${(error as AxiosError).message}]`
             );
             return error;
           }