sovereign 0.30.0__tar.gz → 0.31.0__tar.gz

{sovereign-0.30.0 → sovereign-0.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.30.0
+Version: 0.31.0
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0
@@ -43,7 +43,7 @@ Requires-Dist: cryptography (>=42.0.0,<43.0.0)
 Requires-Dist: datadog (>=0.47.0,<0.48.0) ; extra == "statsd"
 Requires-Dist: fastapi (>=0.115.2,<0.116.0)
 Requires-Dist: glom (>=23.3.0,<24.0.0)
-Requires-Dist: gunicorn (>=22.0.0,<23.0.0)
+Requires-Dist: gunicorn (>=23.0.0,<24.0.0)
 Requires-Dist: httptools (>=0.6.0,<0.7.0) ; extra == "httptools"
 Requires-Dist: orjson (>=3.9.15,<4.0.0) ; extra == "orjson"
 Requires-Dist: pydantic (>=2.7.2,<3.0.0)

{sovereign-0.30.0 → sovereign-0.31.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sovereign"
-version = "0.30.0"
+version = "0.31.0"
 description = "Envoy Proxy control-plane written in Python"
 license = "Apache-2.0"
 packages = [
@@ -67,7 +67,7 @@ sovereign = 'sovereign.server:main'
 [tool.poetry.dependencies]
 python = "^3.11"
 uvicorn = "^0.23.2"
-gunicorn = "^22.0.0"
+gunicorn = "^23.0.0"
 aiofiles = "^23.2.1"
 requests = "^2.31.0"
 PyYAML = "^6.0.1"

{sovereign-0.30.0 → sovereign-0.31.0}/src/sovereign/dynamic_config/__init__.py

@@ -37,7 +37,7 @@ class Loadable(BaseModel):
                 return default
             raise Exception(
                 f"{self.protocol=}, {self.path=}, {self.serialization=}, {original_error=}"
-            )
+            ) from original_error
 
     @staticmethod
     def from_legacy_fmt(fmt_string: str) -> "Loadable":

{sovereign-0.30.0 → sovereign-0.31.0}/src/sovereign/views/admin.py

@@ -1,10 +1,13 @@
-import yaml
-from typing import Any, Dict, List
+import json
 from collections import defaultdict
+from typing import Any, Dict, List
+
+import yaml
 from fastapi import APIRouter, Query
-from fastapi.responses import JSONResponse
 from fastapi.encoders import jsonable_encoder
-from sovereign import config, stats, poller, template_context
+from fastapi.responses import JSONResponse
+
+from sovereign import config, poller, stats, template_context
 from sovereign.discovery import select_template
 from sovereign.utils.mock import mock_discovery_request
 from sovereign.views.discovery import perform_discovery
@@ -20,6 +23,9 @@ async def display_config(
     service_cluster: str = Query(
         "*", title="The clients service cluster to emulate in this XDS request"
     ),
+    metadata: str = Query(
+        None, title="The clients metadata to emulate in this XDS request"
+    ),
     resource_names: List[str] = Query([], title="Envoy Resource names to request"),
     region: str = Query(
         None, title="The clients region to emulate in this XDS request"
@@ -29,11 +35,23 @@ async def display_config(
     ),
 ) -> JSONResponse:
     ret: Dict[str, List[Dict[str, Any]]] = defaultdict(list)
+
+    try:
+        if metadata:
+            json_decoded_metadata = json.loads(metadata)
+        else:
+            json_decoded_metadata = {}
+    except json.JSONDecodeError:
+        return JSONResponse(
+            content={"error": "Invalid JSON in query parameter 'metadata'"},
+            status_code=400,
+        )
     mock_request = mock_discovery_request(
         service_cluster=service_cluster,
         resource_names=resource_names,
         version=version,
         region=region,
+        metadata=json_decoded_metadata,
     )
     response = await perform_discovery(mock_request, "v3", xds_type, skip_auth=True)
     ret["resources"] += response.resources