From fb2a193b2227d446a076278eaa327360c921d6b0 Mon Sep 17 00:00:00 2001
From: Federico Stagni <federico.stagni@cern.ch>
Date: Thu, 16 Jan 2025 15:10:32 +0100
Subject: [PATCH] sweep: #7992 fix: opensearch configuration should consume the
 ca_certs parameter

---
 .../ConfigurationSystem/Client/Utilities.py   | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/DIRAC/ConfigurationSystem/Client/Utilities.py b/src/DIRAC/ConfigurationSystem/Client/Utilities.py
index dd45965c77c..03cb20a5fb0 100644
--- a/src/DIRAC/ConfigurationSystem/Client/Utilities.py
+++ b/src/DIRAC/ConfigurationSystem/Client/Utilities.py
@@ -441,6 +441,19 @@ def getElasticDBParameters(fullname):
     :return: S_OK(dict)/S_ERROR()
     """
 
+    def _getCACerts(cs_path):
+        result = gConfig.getOption(cs_path + "/ca_certs")
+        if not result["OK"]:
+            # No CA certificate found, try at the common place
+            result = gConfig.getOption("/Systems/NoSQLDatabases/ca_certs")
+            if not result["OK"]:
+                return None
+            else:
+                ca_certs = result["Value"]
+        else:
+            ca_certs = result["Value"]
+        return ca_certs
+
     cs_path = getDatabaseSection(fullname)
     parameters = {}
 
@@ -464,17 +477,9 @@ def getElasticDBParameters(fullname):
         parameters["Password"] = None
         parameters["User"] = None
 
-        # OpenSearch ca_certs
-        result = gConfig.getOption(cs_path + "/ca_certs")
-        if not result["OK"]:
-            # No CA certificate found, try at the common place
-            result = gConfig.getOption("/Systems/NoSQLDatabases/ca_certs")
-            if not result["OK"]:
-                return S_ERROR("Failed to get the configuration parameter: ca_certs.")
-            else:
-                ca_certs = result["Value"]
-        else:
-            ca_certs = result["Value"]
+        ca_certs = _getCACerts(cs_path)
+        if ca_certs is None:
+            return S_ERROR("Failed to get the configuration parameter: ca_certs.")
         parameters["ca_certs"] = ca_certs
 
         # OpenSearch client_key
@@ -522,6 +527,11 @@ def getElasticDBParameters(fullname):
         dbUser = result["Value"]
         parameters["User"] = dbUser
 
+        # ca_certs is not mandatory
+        ca_certs = _getCACerts(cs_path)
+        if ca_certs:
+            parameters["ca_certs"] = ca_certs
+
     # Check optional parameters: Host, Port, SSL
     result = gConfig.getOption(cs_path + "/Host")
     if not result["OK"]: