refactor: pass authtoken-lookup to deliveryservice-client

ccc/delivery.py

@@ -1,9 +1,11 @@
 import logging
 
+import ccc.github
 import ci.log
 import ci.util
 import ctx
 import delivery.client
+import model.base
 
 ci.log.configure_default_logging()
 logger = logging.getLogger(__name__)
@@ -21,6 +23,17 @@ def _current_cfg_set(
     return cfg_set
 
 
+def auth_token_lookup(api_url: str, /):
+    '''
+    an implementation of delivery.client.AuthTokenLookup
+    '''
+    try:
+        github_cfg = ccc.github.github_cfg_for_repo_url(api_url)
+        return github_cfg.credentials().auth_token()
+    except model.base.ConfigElementNotFoundError:
+        return None
+
+
 def default_client_if_available(
     cfg_factory=None,
 ) -> delivery.client.DeliveryServiceClient:
@@ -51,7 +64,7 @@ def default_client_if_available(
     )
     return delivery.client.DeliveryServiceClient(
         routes=routes,
-        cfg_factory=cfg_factory,
+        auth_token_lookup=auth_token_lookup,
     )
 
 
@@ -74,7 +87,7 @@ def client(
 
     return delivery.client.DeliveryServiceClient(
         routes=routes,
-        cfg_factory=cfg_factory,
+        auth_token_lookup=auth_token_lookup,
     )
 
 

cli/gardener_ci/_oci.py

@@ -11,6 +11,7 @@
 
 import requests
 
+import ccc.delivery
 import ccc.oci
 import ctx
 import delivery.client
@@ -502,7 +503,7 @@ def osinfo(
             routes=delivery.client.DeliveryServiceRoutes(
                 base_url=delivery_cfg.base_url(),
             ),
-            cfg_factory=cfg_factory,
+            auth_token_lookup=ccc.delivery.auth_token_lookup,
         )
     else:
         delivery_client = None

delivery/client.py

@@ -4,12 +4,12 @@
 import logging
 import requests
 import time
+import typing
 
 import dacite
 
 import ocm
 
-import ccc.github
 import ci.util
 import cnudie.iter
 import cnudie.retrieve
@@ -18,8 +18,6 @@
 import delivery.model as dm
 import dso.model
 import http_requests
-import model
-import model.base
 
 
 logger = logging.getLogger(__name__)
@@ -140,23 +138,35 @@ def backlog_items(self):
         )
 
 
+Url: typing.TypeAlias = str
+AuthToken: typing.TypeAlias = str
+'''
+A lookup crafted slightly special-cased for auth-token-based authentication. Implementations *must*
+accept a single positional parameter, which is the URL for which the lookup should return a (valid)
+auth-token.
+If the lookup cannot offer an authtoken for a given URL, it *must* return None. Exceptions raised
+by lookups are not handled.
+'''
+AuthTokenLookup: typing.TypeAlias = typing.Callable[[Url], AuthToken]
+
+
 class DeliveryServiceClient:
     def __init__(
         self,
         routes: DeliveryServiceRoutes,
-        cfg_factory: model.ConfigFactory | None=None,
+        auth_token_lookup: AuthTokenLookup | None=None,
     ):
         '''
         Initialises a client which can be used to interact with the delivery-service.
 
         :param DeliveryServiceRoutes routes
             object which contains information of the base url of the desired instance of the
             delivery-service as well as the available routes
-        :param ConfigFactory cfg_factory (optional + deprecated):
-            the config factory is used to retrieve available GitHub configurations
+        :param AuthTokenLookup auth_token_lookup (optional)
+            the lookup to use for retrieving auth-tokens against oauth-endpoints
         '''
         self._routes = routes
-        self.cfg_factory = cfg_factory
+        self.auth_token_lookup = auth_token_lookup
         self.auth_credentials: dm.GitHubAuthCredentials = None # filled lazily as needed
 
         self._bearer_token = None
@@ -194,6 +204,10 @@ def _authenticate(self):
         ):
             return
 
+        if not self.auth_token_lookup:
+            logger.info('DeliverService-Client has no auth-token-lookup - attempting anonymous auth')
+            return
+
         if not self.auth_credentials:
             res = self._session.get(
                 url=self._routes.auth_configs(),
@@ -207,22 +221,15 @@ def _authenticate(self):
             for auth_config in auth_configs:
                 api_url = auth_config.get('api_url')
 
-                try:
-                    github_cfg = ccc.github.github_cfg_for_repo_url(
-                        api_url=api_url,
-                        cfg_factory=self.cfg_factory,
-                        require_labels=(),
-                    )
+                if (auth_token := self.auth_token_lookup(api_url)):
                     break
-                except model.base.ConfigElementNotFoundError:
-                    continue
             else:
                 logger.info('no valid credentials found - attempting anonymous-auth')
                 return
 
             self.auth_credentials = dm.GitHubAuthCredentials(
                 api_url=api_url,
-                auth_token=github_cfg.credentials().auth_token(),
+                auth_token=auth_token,
             )
 
         params = {