no trailing slash for post to /entries (#1366)

* no trailing slash for post to /entries
* use f-strings
* Update CHANGELOG.md

Signed-off-by: Ramon Petgrave <[email protected]>
Signed-off-by: William Woodruff <[email protected]>
Co-authored-by: William Woodruff <[email protected]>

Author: ramonpetgrave64

CHANGELOG.md

@@ -8,6 +8,11 @@ All versions prior to 0.9.0 are untracked.
 
 ## [Unreleased]
 
+### Fixed
+
+* API: Make Rekor APIs compatible with Rekor v2 by removing trailing slashes
+  from endpoints ([#1366](https://github.com/sigstore/sigstore-python/pull/1366))
+
 ## [3.6.2]
 
 ### Fixed

sigstore/_internal/rekor/client.py

@@ -23,7 +23,6 @@
 from abc import ABC
 from dataclasses import dataclass
 from typing import Any, Optional
-from urllib.parse import urljoin
 
 import rekor_types
 import requests
@@ -112,7 +111,7 @@ def entries(self) -> RekorEntries:
         Returns a `RekorEntries` capable of accessing detailed information
         about individual log entries.
         """
-        return RekorEntries(urljoin(self.url, "entries/"), session=self.session)
+        return RekorEntries(f"{self.url}/entries", session=self.session)
 
 
 class RekorEntries(_Endpoint):
@@ -134,7 +133,7 @@ def get(
         resp: requests.Response
 
         if uuid is not None:
-            resp = self.session.get(urljoin(self.url, uuid))
+            resp = self.session.get(f"{self.url}/{uuid}")
         else:
             resp = self.session.get(self.url, params={"logIndex": log_index})
 
@@ -170,9 +169,7 @@ def retrieve(self) -> RekorEntriesRetrieve:
         """
         Returns a `RekorEntriesRetrieve` capable of retrieving entries.
         """
-        return RekorEntriesRetrieve(
-            urljoin(self.url, "retrieve/"), session=self.session
-        )
+        return RekorEntriesRetrieve(f"{self.url}/retrieve/", session=self.session)
 
 
 class RekorEntriesRetrieve(_Endpoint):
@@ -226,7 +223,7 @@ def __init__(self, url: str) -> None:
         """
         Create a new `RekorClient` from the given URL.
         """
-        self.url = urljoin(url, "api/v1/")
+        self.url = f"{url}/api/v1"
         self.session = requests.Session()
         self.session.headers.update(
             {
@@ -263,4 +260,4 @@ def log(self) -> RekorLog:
         """
         Returns a `RekorLog` adapter for making requests to a Rekor log.
         """
-        return RekorLog(urljoin(self.url, "log/"), session=self.session)
+        return RekorLog(f"{self.url}/log", session=self.session)

sigstore/models.py

@@ -488,9 +488,9 @@ def _verify(self) -> None:
             # We expect some old bundles to violate the rules around root
             # and intermediate CAs, so we issue warnings and not hard errors
             # in those cases.
-            leaf_cert, *chain_certs = [
+            leaf_cert, *chain_certs = (
                 load_der_x509_certificate(cert.raw_bytes) for cert in certs
-            ]
+            )
             if not cert_is_leaf(leaf_cert):
                 raise InvalidBundle(
                     "bundle contains an invalid leaf or non-leaf certificate in the leaf position"