sovereign 0.31.0__tar.gz → 0.32.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.31.0
+Version: 0.32.0
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sovereign"
-version = "0.31.0"
+version = "0.32.0"
 description = "Envoy Proxy control-plane written in Python"
 license = "Apache-2.0"
 packages = [

{sovereign-0.31.0 → sovereign-0.32.0}/src/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]