fix: host_credentials can be a list or a bool

fstagni · fstagni · commit f25c4d0a926d · 2025-04-08T10:14:00.000+02:00
diff --git a/src/DIRAC/__init__.py b/src/DIRAC/__init__.py
@@ -54,15 +54,14 @@
     - getPlatformTuple(): DIRAC platform tuple for current host
 
 """
-import os
 import importlib.metadata
+import os
 import re
 import sys
-import warnings
+from collections.abc import Sequence
 from pkgutil import extend_path
 from typing import Any, Optional, Union
 
-
 __path__ = extend_path(__path__, __name__)
 
 # Set the environment variable such that openssl accepts proxy cert
@@ -181,8 +180,7 @@ def initialize(
     log_level: Optional[LogLevel] = None,
     extra_config_files: Optional[list[os.PathLike]] = None,
     extra_config: Optional[dict[str, Any]] = None,
-    host_credentials: Optional[tuple[os.PathLike, os.PathLike]] = None,
-    use_server_cert: bool = False,
+    host_credentials: Optional[Union[Sequence[os.PathLike], bool]] = None,
 ) -> None:
     """Prepare the global state so that DIRAC clients can be used.
 
@@ -226,13 +224,11 @@ def initialize(
         cfg.loadFromDict(extra_config)
         gConfigurationData.mergeWithLocal(cfg)
 
-    if use_server_cert:
-        gConfigurationData.setOptionInCFG("/DIRAC/Security/UseServerCertificate", "yes")
-
     if host_credentials:
         gConfigurationData.setOptionInCFG("/DIRAC/Security/UseServerCertificate", "yes")
-        gConfigurationData.setOptionInCFG("/DIRAC/Security/CertFile", str(host_credentials[0]))
-        gConfigurationData.setOptionInCFG("/DIRAC/Security/KeyFile", str(host_credentials[1]))
+        if isinstance(host_credentials, Sequence) and len(host_credentials) == 2:
+            gConfigurationData.setOptionInCFG("/DIRAC/Security/CertFile", str(host_credentials[0]))
+            gConfigurationData.setOptionInCFG("/DIRAC/Security/KeyFile", str(host_credentials[1]))
 
     if log_level:
         gLogger.setLevel(log_level)
diff --git a/tests/Integration/AccountingSystem/Test_AccountingDB.py b/tests/Integration/AccountingSystem/Test_AccountingDB.py
@@ -4,7 +4,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.AccountingSystem.DB.AccountingDB import AccountingDB
diff --git a/tests/Integration/ConfigurationSystem/Test_Helpers.py b/tests/Integration/ConfigurationSystem/Test_Helpers.py
@@ -2,7 +2,7 @@
 """
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.ConfigurationSystem.Client.Helpers import Resources
 
diff --git a/tests/Integration/DataManagementSystem/Test_Client_FTS3.py b/tests/Integration/DataManagementSystem/Test_Client_FTS3.py
@@ -7,7 +7,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 import DIRAC.DataManagementSystem.DB.test.FTS3TestUtils as baseTestModule
 from DIRAC.DataManagementSystem.Client.FTS3Client import FTS3Client
diff --git a/tests/Integration/DataManagementSystem/Test_DataIntegrityDB.py b/tests/Integration/DataManagementSystem/Test_DataIntegrityDB.py
@@ -10,7 +10,7 @@
 import DIRAC
 from DIRAC import gLogger
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.DataManagementSystem.DB.DataIntegrityDB import DataIntegrityDB
 
diff --git a/tests/Integration/DataManagementSystem/Test_FileCatalogDB.py b/tests/Integration/DataManagementSystem/Test_FileCatalogDB.py
@@ -12,7 +12,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.DataManagementSystem.DB.FileCatalogDB import FileCatalogDB
 
diff --git a/tests/Integration/Framework/Test_AuthDB.py b/tests/Integration/Framework/Test_AuthDB.py
@@ -5,7 +5,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from authlib.jose import JsonWebKey, JsonWebSignature, jwt, RSAKey
 from authlib.common.encoding import json_b64encode, urlsafe_b64decode, json_loads
diff --git a/tests/Integration/Framework/Test_AuthServer.py b/tests/Integration/Framework/Test_AuthServer.py
@@ -6,7 +6,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import S_OK
 from DIRAC.FrameworkSystem.private.authorization import AuthServer
diff --git a/tests/Integration/Framework/Test_InstalledComponentsDB.py b/tests/Integration/Framework/Test_InstalledComponentsDB.py
@@ -10,7 +10,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient
 
diff --git a/tests/Integration/Framework/Test_ProxyDB.py b/tests/Integration/Framework/Test_ProxyDB.py
@@ -17,7 +17,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 import DIRAC
 from DIRAC import gLogger, gConfig, S_OK, S_ERROR
diff --git a/tests/Integration/Framework/Test_TokenDB.py b/tests/Integration/Framework/Test_TokenDB.py
@@ -5,7 +5,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 payload = {
     "sub": "user",
diff --git a/tests/Integration/Monitoring/Test_MonitoringDB.py b/tests/Integration/Monitoring/Test_MonitoringDB.py
@@ -9,7 +9,7 @@
 import DIRAC
 from DIRAC.tests.Utilities.utils import find_all
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.MonitoringSystem.DB.MonitoringDB import MonitoringDB
diff --git a/tests/Integration/Monitoring/Test_MonitoringReporter.py b/tests/Integration/Monitoring/Test_MonitoringReporter.py
@@ -53,7 +53,7 @@
 # pylint: disable=invalid-name,wrong-import-position
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.MonitoringSystem.Client.MonitoringReporter import MonitoringReporter
diff --git a/tests/Integration/RequestManagementSystem/Test_ReqDB.py b/tests/Integration/RequestManagementSystem/Test_ReqDB.py
@@ -4,7 +4,7 @@
 # pylint: disable=invalid-name,wrong-import-position
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from pytest import fixture
 
diff --git a/tests/Integration/ResourceStatusSystem/Test_FullChain.py b/tests/Integration/ResourceStatusSystem/Test_FullChain.py
@@ -59,7 +59,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.ResourceStatusSystem.PolicySystem.PDP import PDP
diff --git a/tests/Integration/TransformationSystem/Test_TS_CheckPerms.py b/tests/Integration/TransformationSystem/Test_TS_CheckPerms.py
@@ -8,7 +8,7 @@
 import DIRAC
 from DIRAC import S_ERROR, S_OK
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.TransformationSystem.Service.TransformationManagerHandler import TransformationManagerHandlerMixin
 
diff --git a/tests/Integration/WorkloadManagementSystem/Test_JobDB.py b/tests/Integration/WorkloadManagementSystem/Test_JobDB.py
@@ -13,7 +13,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import S_OK, gLogger
 from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus, JobStatus
diff --git a/tests/Integration/WorkloadManagementSystem/Test_JobLoggingDB.py b/tests/Integration/WorkloadManagementSystem/Test_JobLoggingDB.py
@@ -8,7 +8,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.WorkloadManagementSystem.DB.JobLoggingDB import JobLoggingDB
 
diff --git a/tests/Integration/WorkloadManagementSystem/Test_JobParametersDB.py b/tests/Integration/WorkloadManagementSystem/Test_JobParametersDB.py
@@ -5,7 +5,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.WorkloadManagementSystem.DB.JobParametersDB import JobParametersDB
diff --git a/tests/Integration/WorkloadManagementSystem/Test_PilotAgentsDB.py b/tests/Integration/WorkloadManagementSystem/Test_PilotAgentsDB.py
@@ -9,7 +9,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.WorkloadManagementSystem.DB.PilotAgentsDB import PilotAgentsDB, PivotedPilotSummaryTable
diff --git a/tests/Integration/WorkloadManagementSystem/Test_SandboxMetadataDB.py b/tests/Integration/WorkloadManagementSystem/Test_SandboxMetadataDB.py
@@ -2,7 +2,7 @@
 
 import DIRAC
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC import gLogger
 from DIRAC.WorkloadManagementSystem.DB.SandboxMetadataDB import SandboxMetadataDB
diff --git a/tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py b/tests/Integration/WorkloadManagementSystem/Test_TaskQueueDB.py
@@ -13,7 +13,7 @@
 import DIRAC
 from DIRAC import gLogger
 
-DIRAC.initialize(require_auth=False, use_server_cert=True)  # Initialize configuration
+DIRAC.initialize(require_auth=False, host_credentials=True)  # Initialize configuration
 
 from DIRAC.WorkloadManagementSystem.DB.TaskQueueDB import TaskQueueDB
 
