rekor: Re-use the error class for both clients

Signed-off-by: Jussi Kukkonen <[email protected]>

Author: jku

sigstore/_internal/rekor/__init__.py

@@ -23,6 +23,7 @@
 from typing import Any, NewType
 
 import rekor_types
+import requests
 from cryptography.x509 import Certificate
 
 from sigstore._utils import base64_encode_pem_cert
@@ -37,6 +38,27 @@
 EntryRequest = NewType("EntryRequest", dict[str, Any])
 
 
+class RekorClientError(Exception):
+    """
+    A generic error in the Rekor client.
+    """
+
+    def __init__(self, http_error: requests.HTTPError):
+        """
+        Create a new `RekorClientError` from the given `requests.HTTPError`.
+        """
+        if http_error.response is not None:
+            try:
+                error = rekor_types.Error.model_validate_json(http_error.response.text)
+                super().__init__(f"{error.code}: {error.message}")
+            except Exception:
+                super().__init__(
+                    f"Rekor returned an unknown error with HTTP {http_error.response.status_code}"
+                )
+        else:
+            super().__init__(f"Unexpected Rekor error: {http_error}")
+
+
 class RekorLogSubmitter(ABC):
     """Abstract class to represent a Rekor log entry submitter.
 

sigstore/_internal/rekor/client.py

@@ -33,6 +33,7 @@
 from sigstore._internal import USER_AGENT
 from sigstore._internal.rekor import (
     EntryRequest,
+    RekorClientError,
     RekorLogSubmitter,
 )
 from sigstore.dsse import Envelope
@@ -71,27 +72,6 @@ def from_response(cls, dict_: dict[str, Any]) -> RekorLogInfo:
         )
 
 
-class RekorClientError(Exception):
-    """
-    A generic error in the Rekor client.
-    """
-
-    def __init__(self, http_error: requests.HTTPError):
-        """
-        Create a new `RekorClientError` from the given `requests.HTTPError`.
-        """
-        if http_error.response is not None:
-            try:
-                error = rekor_types.Error.model_validate_json(http_error.response.text)
-                super().__init__(f"{error.code}: {error.message}")
-            except Exception:
-                super().__init__(
-                    f"Rekor returned an unknown error with HTTP {http_error.response.status_code}"
-                )
-        else:
-            super().__init__(f"Unexpected Rekor error: {http_error}")
-
-
 class _Endpoint(ABC):
     def __init__(self, url: str, session: requests.Session) -> None:
         self.url = url

sigstore/_internal/rekor/client_v2.py

@@ -22,7 +22,6 @@
 import logging
 from typing import cast
 
-import rekor_types
 import requests
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePublicKey
@@ -32,7 +31,7 @@
 from sigstore_protobuf_specs.io import intoto
 
 from sigstore._internal import USER_AGENT
-from sigstore._internal.rekor import EntryRequest, RekorLogSubmitter
+from sigstore._internal.rekor import EntryRequest, RekorClientError, RekorLogSubmitter
 from sigstore.dsse import Envelope
 from sigstore.hashes import Hashed
 from sigstore.models import LogEntry
@@ -159,30 +158,9 @@ def _build_dsse_request(
                                 encoding=serialization.Encoding.DER
                             )
                         ),
-                        key_details=cls._get_key_details(certificate)
+                        key_details=cls._get_key_details(certificate),
                     )
                 ],
             )
         )
         return EntryRequest(req.to_dict())
-
-
-class RekorClientError(Exception):
-    """
-    A generic error in the Rekor client.
-    """
-
-    def __init__(self, http_error: requests.HTTPError):
-        """
-        Create a new `RekorClientError` from the given `requests.HTTPError`.
-        """
-        if http_error.response is not None:
-            try:
-                error = rekor_types.Error.model_validate_json(http_error.response.text)
-                super().__init__(f"{error.code}: {error.message}")
-            except Exception:
-                super().__init__(
-                    f"Rekor returned an unknown error with HTTP {http_error.response.status_code}"
-                )
-        else:
-            super().__init__(f"Unexpected Rekor error: {http_error}")