sovereign 0.30.0__py3-none-any.whl → 0.32.0__py3-none-any.whl

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/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

sovereign/views/discovery.py

@@ -1,3 +1,4 @@
+import os
 from typing import Dict
 
 from fastapi import Body, Header
@@ -117,8 +118,6 @@ async def perform_discovery(
         authenticate(req)
     if discovery_cache.enabled:
         logs.access_logger.queue_log_fields(CACHE_XDS_HIT=False)
-        metadata_keys = discovery_cache.extra_keys.get("metadata", [])
-        extra_metadata = [req.node.metadata.get(key, None) for key in metadata_keys]
         hash_keys = [
             api_version,
             resource_type,
@@ -130,11 +129,20 @@ async def perform_discovery(
             req.node.cluster,
             req.node.locality,
             # TODO: this is very bad and everyone should feel bad. Remove this in the next breaking release
-            req.node.metadata.get("auth", None),
-            req.node.metadata.get("num_cpus", None),
+            req.node.metadata.get("auth"),
+            req.node.metadata.get("num_cpus"),
         ]
+
+        metadata_keys = discovery_cache.extra_keys.get("metadata", [])
+        extra_metadata = [req.node.metadata.get(key) for key in metadata_keys]
         hash_keys += extra_metadata
-        cache_key = compute_hash(hash_keys)
+
+        env_keys = discovery_cache.extra_keys.get("env_vars", [])
+        env_var_values = [os.getenv(key) for key in env_keys]
+        hash_keys += env_var_values
+
+        cache_key = compute_hash(*hash_keys)
+
         if template := await cache.get(key=cache_key, default=None):
             logs.access_logger.queue_log_fields(CACHE_XDS_HIT=True)
             return template  # type: ignore[no-any-return]

{sovereign-0.30.0.dist-info → sovereign-0.32.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.30.0
+Version: 0.32.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.dist-info → sovereign-0.32.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ sovereign/app.py,sha256=WIetM8_4m5nZ6eD12Kd_jDKeUkcDRqdkk7L4wCKyP40,4257
 sovereign/constants.py,sha256=qdWD1lTvkaW5JGF7TmZhfksQHlRAJFVqbG7v6JQA9k8,46
 sovereign/context.py,sha256=qeo1Alb26kuyD3mDqJleh3MTJviQqdm7HE5lvHpVAF4,7009
 sovereign/discovery.py,sha256=iQ3QJzXuxB6su79dDqgjmlzhVWAGrxq4XOrCwwwIPi8,6373
-sovereign/dynamic_config/__init__.py,sha256=QoRNcuCAqV26zeyHm0iavsR55K3TwMohabWpPGIq_rM,2838
+sovereign/dynamic_config/__init__.py,sha256=IRU-Z24vGNEaBN6MUq7EdMtkqrrHPnENRtWzNhTS9aU,2858
 sovereign/dynamic_config/deser.py,sha256=N3iUvDpuNHWjxUbGFydMVKicx4o8DyfvNukorqnQdt8,1834
 sovereign/dynamic_config/loaders.py,sha256=gPkxTL7gep20HIMRvjgOqAdUWqtb3970VBCAcUrIM4c,2915
 sovereign/error_info.py,sha256=r2KXBYq9Fo7AI2pmIpATWFm0pykr2MqfrKH0WWW5Sfk,1488
@@ -53,13 +53,13 @@ sovereign/utils/timer.py,sha256=_dUtEasj0BKbWYuQ_T3HFIyjurXXj-La-dNSMAwKMSo,795
 sovereign/utils/version_info.py,sha256=vbAiUyz6v3-zSOoS-7HwrvJie729RgIKy0Bt091Z6RE,349
 sovereign/utils/weighted_clusters.py,sha256=bPzuRE7Qgvv04HcR2AhMDvBrFlZ8AfteweLKhY9SvWg,1166
 sovereign/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sovereign/views/admin.py,sha256=B_uG5WE9UEEPw-Ax5fyBEhC0bSQ2c4aZt0AwdKJzDnY,4326
+sovereign/views/admin.py,sha256=LQhz5CPFfEa8PjAp-SSQ_zce1sq-B95x4cG0BC_j-_s,4807
 sovereign/views/crypto.py,sha256=7y0eHWtt-bbr2CwHEkH7odPaJ1IEviU-71U-MYJD0Kc,3360
-sovereign/views/discovery.py,sha256=BmsHsBe_N33_VahkLQda3CfuIqJZAHSA0Bndg9KagQM,6187
+sovereign/views/discovery.py,sha256=S8Mp3TfcEyfyFfr234xmXSUxH5x27OdBZ5NzrOsiIu0,6348
 sovereign/views/healthchecks.py,sha256=8BA11nigm1btnBOdtXGN1B04Ow2uswWNNsuKoPLXgh0,1393
 sovereign/views/interface.py,sha256=KoLB3YIZGulrYOV6MA6ucmQzlmSDrYEO8uq045awy1Q,7712
-sovereign-0.30.0.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-0.30.0.dist-info/METADATA,sha256=Aa-cjhsMmS6_6MiwVsCC1TboUlR_-y6Yqxp_fhd00O4,6194
-sovereign-0.30.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sovereign-0.30.0.dist-info/entry_points.txt,sha256=CTCjlomxNz2Ii4hYbN-gEZPBrZNUCcmJcb7NYqm4Nn8,1328
-sovereign-0.30.0.dist-info/RECORD,,
+sovereign-0.32.0.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-0.32.0.dist-info/METADATA,sha256=efYUaL5x25dJS2K7wC_US0L9fei1kdo0TZfKc8K5vWo,6194
+sovereign-0.32.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+sovereign-0.32.0.dist-info/entry_points.txt,sha256=CTCjlomxNz2Ii4hYbN-gEZPBrZNUCcmJcb7NYqm4Nn8,1328
+sovereign-0.32.0.dist-info/RECORD,,