sovereign 0.27.0__tar.gz → 0.28.0__tar.gz

{sovereign-0.27.0 → sovereign-0.28.0}/PKG-INFO

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

{sovereign-0.27.0 → sovereign-0.28.0}/pyproject.toml

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

{sovereign-0.27.0 → sovereign-0.28.0}/src/sovereign/discovery.py

@@ -163,6 +163,8 @@ def filter_resources(
     that does not match the name of the resource.
     If Envoy did not specifically request anything, every resource is retained.
     """
+    if len(requested) == 0:
+        return generated
     return [resource for resource in generated if resource_name(resource) in requested]
 
 

{sovereign-0.27.0 → sovereign-0.28.0}/src/sovereign/schemas.py

@@ -294,7 +294,9 @@ class Resources(List[str]):
     """
 
     def __contains__(self, item: object) -> bool:
-        if len(self) == 0:
+        if (
+            len(self) == 0
+        ):  # TODO: refactor to remove overriding __contains__; its being used in multiple places
             return True
         return super().__contains__(item)
 
@@ -305,13 +307,17 @@ class Status(BaseModel):
     details: List[Any]
 
 
+def resources_factory() -> Resources:
+    return Resources()
+
+
 class DiscoveryRequest(BaseModel):
     node: Node = Field(..., title="Node information about the envoy proxy")
     version_info: str = Field(
         "0", title="The version of the envoy clients current configuration"
     )
-    resource_names: list[str] | Resources = Field(
-        Resources(), title="List of requested resource names"
+    resource_names: Resources = Field(
+        default_factory=resources_factory, title="List of requested resource names"
     )
     hide_private_keys: bool = False
     type_url: Optional[str] = Field(
@@ -353,6 +359,11 @@ class DiscoveryRequest(BaseModel):
             self.desired_controlplane,
         )
 
+    @field_validator("resource_names", mode="before")
+    @classmethod
+    def validate_resources(cls, v: Union[Resources, List[str]]) -> Resources:
+        return Resources(v)
+
 
 class DiscoveryResponse(BaseModel):
     version_info: str = Field(

{sovereign-0.27.0 → sovereign-0.28.0}/src/sovereign/templates/resources.html

@@ -88,14 +88,24 @@
             1: 'resource'
         } %}
         {% for resource in res %}
+            {% if "sovereign_error" in resource %}
+                <span class="panel-icon">
+                    <i class="fas fa-arrow-right" aria-hidden="true"></i>
+                </span>
+                <div class="notification is-danger">
+                    {{ resource["sovereign_error"] }}
+                </div>
+                {{ resource["sovereign_error"] }}
+            {% else %}
             {% set name = resource.get('name') or resource['cluster_name'] %}
             <a class="panel-block has-text-weight-medium"
-               href="/ui/resources/{{ resource_type }}/{{ name }}">
-        <span class="panel-icon">
-            <i class="fas fa-arrow-right" aria-hidden="true"></i>
-        </span>
-                {{ name }}
-            </a>
+                   href="/ui/resources/{{ resource_type }}/{{ name }}">
+                    <span class="panel-icon">
+                        <i class="fas fa-arrow-right" aria-hidden="true"></i>
+                    </span>
+                    {{ name }}
+                </a>
+            {% endif %}
         {% endfor %}
         <div class="panel-block">
             <p class="content is-small">

{sovereign-0.27.0 → sovereign-0.28.0}/src/sovereign/views/interface.py

@@ -103,8 +103,8 @@ async def resources(
             resource_type=xds_type,
             skip_auth=True,
         )
-    except KeyError:
-        ret["resources"] = []
+    except KeyError as e:
+        ret["resources"] = [{"sovereign_error": str(e)}]
     else:
         ret["resources"] += response.deserialize_resources()
     return html_templates.TemplateResponse(