Fix construction of repo-policy-compliance from config

canonical · Aug 27, 2024 · 81815c4 · 81815c4
1 parent 895206e
commit 81815c4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -1243,8 +1243,7 @@ def _get_runner_scaler(
             proxy_config=state.proxy_config,
             dockerhub_mirror=state.charm_config.dockerhub_mirror,
             ssh_debug_connections=state.ssh_debug_connections,
-            repo_policy_url=state.charm_config.repo_policy_compliance.url,
-            repo_policy_token=state.charm_config.repo_policy_compliance.token,
+            repo_policy_compliance=state.charm_config.repo_policy_compliance,
         )
         openstack_runner_manager = OpenStackRunnerManager(
             app_name,

diff --git a/src/manager/cloud_runner_manager.py b/src/manager/cloud_runner_manager.py
@@ -9,7 +9,7 @@
 from enum import Enum, auto
 from typing import Iterator, Sequence, Tuple
 
-from charm_state import GitHubPath, ProxyConfig, SSHDebugConnection
+from charm_state import GitHubPath, ProxyConfig, RepoPolicyComplianceConfig, SSHDebugConnection
 from metrics.runner import RunnerMetrics
 
 logger = logging.getLogger(__name__)
@@ -110,15 +110,13 @@ class SupportServiceConfig:
         proxy_config: The proxy configuration.
         dockerhub_mirror: The dockerhub mirror to use for runners.
         ssh_debug_connections: The information on the ssh debug services.
-        repo_policy_url: The URL of the repo policy service.
-        repo_policy_token: The token to access the repo policy service.
+        repo_policy_compliance: The configuration of the repo policy compliance service.
     """
 
     proxy_config: ProxyConfig | None
     dockerhub_mirror: str | None
     ssh_debug_connections: list[SSHDebugConnection] | None
-    repo_policy_url: str | None
-    repo_policy_token: str | None
+    repo_policy_compliance: RepoPolicyComplianceConfig | None
 
 
 @dataclass

diff --git a/src/openstack_cloud/openstack_runner_manager.py b/src/openstack_cloud/openstack_runner_manager.py
@@ -460,9 +460,10 @@ def _get_repo_policy_compliance_client(self) -> RepoPolicyComplianceClient | Non
         Returns:
             The repo policy compliance client.
         """
-        if self._service_config.repo_policy_url and self._service_config.repo_policy_token:
+        if self._service_config.repo_policy_compliance is not None:
             return RepoPolicyComplianceClient(
-                self._service_config.repo_policy_url, self._service_config.repo_policy_token
+                self._service_config.repo_policy_compliance.url,
+                self._service_config.repo_policy_compliance.token,
             )
         return None
 

diff --git a/tests/integration/test_runner_manager_openstack.py b/tests/integration/test_runner_manager_openstack.py
@@ -122,8 +122,7 @@ async def openstack_runner_manager_fixture(
         proxy_config=proxy_config,
         dockerhub_mirror=None,
         ssh_debug_connections=None,
-        repo_policy_url=None,
-        repo_policy_token=None,
+        repo_policy_compliance=None,
     )
     return OpenStackRunnerManager(
         app_name, cloud_config, server_config, runner_config, service_config