From 6b9abf6122587e201eae0e4b0dcbbc0ed47847f1 Mon Sep 17 00:00:00 2001
From: Daniel Eisenberg <danielei@checkpoint.com>
Date: Sun, 21 Sep 2025 19:27:20 +0300
Subject: [PATCH] fix ca loading for alpine

---
 .../include}/i_details_resolver.h              |  0
 core/include/internal/messaging.h              |  4 +---
 core/messaging/connection/connection.cc        | 18 +++++-------------
 3 files changed, 6 insertions(+), 16 deletions(-)
 rename {core/include/services_sdk/interfaces => components/include}/i_details_resolver.h (100%)

diff --git a/core/include/services_sdk/interfaces/i_details_resolver.h b/components/include/i_details_resolver.h
similarity index 100%
rename from core/include/services_sdk/interfaces/i_details_resolver.h
rename to components/include/i_details_resolver.h
diff --git a/core/include/internal/messaging.h b/core/include/internal/messaging.h
index 01a016d..6de8566 100644
--- a/core/include/internal/messaging.h
+++ b/core/include/internal/messaging.h
@@ -28,7 +28,6 @@
 #include "i_shell_cmd.h"
 #include "i_rest_api.h"
 #include "i_instance_awareness.h"
-#include "i_details_resolver.h"
 
 #include "config.h"
 
@@ -44,8 +43,7 @@ class Messaging
     Singleton::Consume<I_ShellCmd>,
     Singleton::Consume<I_MainLoop>,
     Singleton::Consume<I_RestApi>,
-    Singleton::Consume<I_InstanceAwareness>,
-    Singleton::Consume<I_DetailsResolver>
+    Singleton::Consume<I_InstanceAwareness>
 {
 public:
     Messaging();
diff --git a/core/messaging/connection/connection.cc b/core/messaging/connection/connection.cc
index 5c87d50..b6796e9 100644
--- a/core/messaging/connection/connection.cc
+++ b/core/messaging/connection/connection.cc
@@ -272,24 +272,16 @@ private:
         }
 
         // Use detail_resolver to determine platform-specific certificate directory
-        auto maybe_platform = Singleton::Consume<I_DetailsResolver>::by<Messaging>()->getPlatform();
+#if defined(alpine)
+       string platform = "alpine";
+#else
+       string platform = "linux";
+#endif
 
-        if (!maybe_platform.ok()) {
-            dbgTrace(D_CONNECTION)
-                << "Failed to get platform for default certificate directory: "
-                << maybe_platform.getErr();
-            return "/usr/lib/ssl/certs/"; // Fallback for failed platform detection
-        }
-
-        auto platform = maybe_platform.unpack();
         if (platform == "alpine") {
             return "/etc/ssl/certs/";
         }
 
-        if (platform == "linux") {
-            return "/usr/lib/ssl/certs/";
-        }
-
         return "/usr/lib/ssl/certs/";
     }