Merge branch 'main' into matt/client-auth-impl

* main:
  fix(auth): Require EdDSA and fix verification (#232)
  release: 0.0.14
  feat(server): Implement the new Web API (#230)

Author: jan-auer

Cargo.lock

@@ -25,7 +25,7 @@ objectstore-client = { path = "clients/rust" }
 objectstore-server = { path = "objectstore-server" }
 objectstore-service = { path = "objectstore-service" }
 objectstore-test = { path = "objectstore-test" }
-objectstore-types = { path = "objectstore-types", version = "0.0.13" }
+objectstore-types = { path = "objectstore-types", version = "0.0.14" }
 stresstest = { path = "stresstest" }
 
 anyhow = "1.0.69"

Cargo.toml

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.0.14
+
+### New Features ✨
+
+- feat(server): Implement the new Web API by @jan-auer in [#230](https://github.com/getsentry/objectstore/pull/230)
+
 ## 0.0.13
 
 ### Fixes

clients/CHANGELOG.md

@@ -1,6 +1,6 @@
 [project]
 name = "objectstore-client"
-version = "0.0.13"
+version = "0.0.14"
 description = "Client SDK for Objectstore, the Sentry object storage platform"
 readme = "README.md"
 authors = [

clients/python/pyproject.toml

@@ -170,9 +170,9 @@ def session(self, usecase: Usecase, **scopes: str | int | bool) -> Session:
                     f"{''.join(SCOPE_VALUE_ALLOWED_CHARS)}"
                 )
 
-            formatted = f"{key}.{value}"
+            formatted = f"{key}={value}"
             parts.append(formatted)
-        scope_str = "/".join(parts)
+        scope_str = ";".join(parts)
 
         return Session(
             self._pool,
@@ -221,7 +221,7 @@ def _make_headers(self) -> dict[str, str]:
         return headers
 
     def _make_url(self, key: str | None, full: bool = False) -> str:
-        relative_path = f"/v1/{self._usecase.name}/{self._scope}/objects/{key or ''}"
+        relative_path = f"/v1/objects/{self._usecase.name}/{self._scope}/{key or ''}"
         path = self._base_path.rstrip("/") + relative_path
         if full:
             return f"http://{self._pool.host}:{self._pool.port}{path}"

clients/python/src/objectstore_client/client.py

@@ -14,7 +14,7 @@ def test_object_url() -> None:
 
     assert (
         session.object_url("foo/bar")
-        == "http://127.0.0.1:8888/v1/testing/org.12345/project.1337/app_slug.email_app/objects/foo/bar"
+        == "http://127.0.0.1:8888/v1/objects/testing/org=12345;project=1337;app_slug=email_app/foo/bar"
     )
 
 
@@ -24,5 +24,5 @@ def test_object_url_with_base_path() -> None:
 
     assert (
         session.object_url("foo/bar")
-        == "http://127.0.0.1:8888/api/prefix/v1/testing/org.12345/project.1337/objects/foo/bar"
+        == "http://127.0.0.1:8888/api/prefix/v1/objects/testing/org=12345;project=1337/foo/bar"
     )

clients/python/tests/test_smoke.py

@@ -5,7 +5,7 @@ description = "Client SDK for Objectstore, the Sentry object storage platform"
 homepage = "https://getsentry.github.io/objectstore/"
 repository = "https://github.com/getsentry/objectstore"
 license-file = "../../LICENSE.md"
-version = "0.0.13"
+version = "0.0.14"
 edition = "2024"
 rust-version = "1.89"
 publish = true

clients/rust/Cargo.toml

@@ -237,6 +237,14 @@ impl ScopeInner {
     pub(crate) fn usecase(&self) -> &Usecase {
         &self.usecase
     }
+
+    fn as_path_segment(&self) -> &str {
+        if self.scope.is_empty() {
+            "_"
+        } else {
+            &self.scope
+        }
+    }
 }
 
 impl std::fmt::Display for ScopeInner {
@@ -265,12 +273,12 @@ impl Scope {
     }
 
     fn for_organization(usecase: Usecase, organization: u64) -> Self {
-        let scope = format!("org.{}", organization);
+        let scope = format!("org={}", organization);
         Self(Ok(ScopeInner { usecase, scope }))
     }
 
     fn for_project(usecase: Usecase, organization: u64, project: u64) -> Self {
-        let scope = format!("org.{}/project.{}", organization, project);
+        let scope = format!("org={};project={}", organization, project);
         Self(Ok(ScopeInner { usecase, scope }))
     }
 
@@ -286,10 +294,10 @@ impl Scope {
             Self::validate_value(&value)?;
 
             if !inner.scope.is_empty() {
-                inner.scope.push('/');
+                inner.scope.push(';');
             }
             inner.scope.push_str(key);
-            inner.scope.push('.');
+            inner.scope.push('=');
             inner.scope.push_str(&value);
 
             Ok(inner)
@@ -441,11 +449,10 @@ impl Session {
         let mut segments = url.path_segments_mut().unwrap();
         segments
             .push("v1")
-            .extend(self.scope.usecase.name.split("/"));
-        if !self.scope.scope.is_empty() {
-            segments.extend(self.scope.scope.split("/"));
-        }
-        segments.push("objects").extend(object_key.split("/"));
+            .push("objects")
+            .push(&self.scope.usecase.name)
+            .push(self.scope.as_path_segment())
+            .extend(object_key.split("/"));
         drop(segments);
 
         url
@@ -491,7 +498,7 @@ mod tests {
 
         assert_eq!(
             session.object_url("foo/bar").to_string(),
-            "http://127.0.0.1:8888/v1/testing/org.12345/project.1337/app_slug.email_app/objects/foo/bar"
+            "http://127.0.0.1:8888/v1/objects/testing/org=12345;project=1337;app_slug=email_app/foo/bar"
         )
     }
 
@@ -504,7 +511,7 @@ mod tests {
 
         assert_eq!(
             session.object_url("foo/bar").to_string(),
-            "http://127.0.0.1:8888/api/prefix/v1/testing/org.12345/project.1337/objects/foo/bar"
+            "http://127.0.0.1:8888/api/prefix/v1/objects/testing/org=12345;project=1337/foo/bar"
         )
     }
 }