sovereign 0.19.3__py3-none-any.whl → 1.0.0a4__py3-none-any.whl

sovereign/templates/resources.html

@@ -1,66 +1,82 @@
 {%- extends 'base.html' %}
-{%- import 'ul_filter.html' as filter %}
 {% block title %}{{ resource_type|capitalize }}{% endblock %}
 
 {% block head %}
-    <meta name="last_update" content="{{ last_update }}">
-    {{ filter }}
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="/static/resources.css">
+    <script src="/static/resources.js"></script>
+    <script src="/static/panel.js"></script>
 {% endblock %}
 
 
 {%- block body %}
     <div class="content">
+        {% if error %}
+        <span class="panel-icon">
+            <i class="fas fa-arrow-right" aria-hidden="true"></i>
+        </span>
+        <div class="notification is-danger">
+            {{ error }}
+        </div>
+        {% endif %}
         <p class="content">
-        <div class="dropdown is-hoverable">
-            <div class="dropdown-trigger">
-                <button class="button is-dark" aria-haspopup="true" aria-controls="dropdown-menu">
-                    <span>Envoy Version</span>
-                    <span class="icon is-small">
-                        <i class="fas fa-angle-down" aria-hidden="true"></i>
-                    </span>
-                </button>
-            </div>
-            <div class="dropdown-menu" id="dropdown-menu" role="menu">
-                <div class="dropdown-content">
-                    <div class="dropdown-item">
-                        <p>All resources will be formatted for the selected version</p>
+        <div class="columns">
+            <div class="column is-narrow">
+                <div class="dropdown is-hoverable">
+                    <div class="dropdown-trigger">
+                        <button class="button is-primary" aria-haspopup="true" aria-controls="dropdown-menu">
+                            <span>Template Version</span>
+                            <span class="icon is-small">
+                                <i class="fas fa-angle-down" aria-hidden="false"></i>
+                            </span>
+                        </button>
+                    </div>
+                    <div class="dropdown-menu" id="dropdown-menu" role="menu">
+                        <div class="dropdown-content">
+                            <div class="dropdown-item">
+                                <p>All resources will be formatted for the selected version</p>
+                            </div>
+                            {% for v in available_versions %}
+                                <a class="dropdown-item{% if v == version %} is-active{% endif %}"
+                                   href="#" onclick="setEnvoyVersion('{{ v }}'); return false;">
+                                    {{ v.replace('_', '') }}
+                                </a>
+                            {% endfor %}
+                        </div>
                     </div>
-                    {% for v in available_versions %}
-                        <a class="dropdown-item{% if v == version %} is-active{% endif %}"
-                           href="/ui/set-version?version={{ v }}">
-                            {{ v.replace('_', '') }}
-                        </a>
-                    {% endfor %}
                 </div>
             </div>
-        </div>
-        <div class="dropdown is-hoverable">
-            <div class="dropdown-trigger">
-                <button class="button is-dark" aria-haspopup="true" aria-controls="dropdown-menu">
-                    <span>Service Cluster</span>
-                    <span class="icon is-small">
-                        <i class="fas fa-angle-down" aria-hidden="true"></i>
-                    </span>
-                </button>
+            <!-- node expression box --> 
+            <div class="column">
+                <form id="filterForm">
+                    <input id="filterInput" class="input" type="text" placeholder="Node filter expression"/>
+                </form>
+                <p id="filterMessage" class="help"></p>
             </div>
-            <div class="dropdown-menu" id="dropdown-menu" role="menu">
-                <div class="dropdown-content">
-                    <div class="dropdown-item">
-                        <p>Only resources for the selected service cluster will be shown</p>
-                    </div>
-                    {% for cluster in available_service_clusters %}
-                        <a class="dropdown-item{% if cluster == service_cluster %} is-active{% endif %}"
-                           href="/ui/set-service-cluster?service_cluster={{ cluster }}">
-                            {{ cluster.replace('*', 'any') }}
-                        </a>
-                    {% endfor %}
+            <div class="column is-narrow">
+                <div class="tooltip">
+                  <span class="button is-primary">?</span>
+                  <div class="tooltip-text">
+                      <p>Space-delimited Node filter.<p>
+                      Examples:<br>
+                      <code>id=envoy-1234</code><br>
+                      <code>cluster=a_service_cluster</code><br>
+                      <code>locality.zone=us-east-1</code><br>
+                      <code>locality.sub_zone=a</code><br>
+                      <code>metadata.field_name=abcdef</code>
+                  </div>
                 </div>
             </div>
+            </p>
         </div>
-        </p>
     </div>
 
-    <nav class="panel is-dark" id="resources">
+
+    {% set count = resources|length %}
+    {% if count > 0 %}
+    <nav class="panel is-primary" id="resources">
         <p class="panel-heading">
             {{ resource_type|capitalize }}
         </p>
@@ -71,8 +87,8 @@
                             class="input"
                             type="text"
                             id="search_filter"
-                            onkeyup="filter_results('search_filter', 'resources')"
-                            placeholder="Filter resources by any string"
+                            onkeyup="filter_results('search_filter')"
+                            placeholder="Filter {{ resource_type }} by any string"
                     >
                 </label>
                 <span class="icon is-left">
@@ -82,78 +98,163 @@
         </div>
 
         {% set res = resources|selectattr('get')|list %}
-        {% set count = res|length %}
         {% set plural = {
             0: 'resources',
             1: 'resource'
         } %}
-        {% for resource in res %}
-            {% 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>
-        {% endfor %}
+        {# begin pagination #}
+        <div id="resource-container">
+            {# Will be filled in #}
+        </div>
+        {# pagination control bar #}
         <div class="panel-block">
-            <p class="content is-small">
+            <p class="content is-small" id="resource-count">
                 {{ count }} {{ plural.get(count, 'resources') }}
             </p>
         </div>
     </nav>
+        {% if count < 10 %}
+            {% set hidden = "display: none;" %}
+        {% endif %}
+        <div style="{{ hidden }}">
+        <nav class="pagination is-right is-small" role="navigation" aria-label="pagination">
+          <a id="prev-btn" class="pagination-previous">Previous</a>
+          <a id="next-btn" class="pagination-next">Next</a>
+          <ul id="page-numbers" class="pagination-list"></ul>
+        </nav>
+        </div>
 
-    {% if resource_type == 'routes' %}
-        <nav class="panel" id="virtual_hosts">
-            <p class="panel-heading">
-                Virtual Hosts
-            </p>
-            <div class="panel-block">
+        {% if resource_type == 'routes' %}
+            <nav class="panel is-primary">
+              <p class="panel-heading">Virtual Hosts</p>
+              <div class="panel-block">
                 <p class="control has-icons-left">
-                    <label for="search_filter_virtual_hosts">
-                        <input
-                                class="input"
-                                type="text"
-                                id="search_filter_virtual_hosts"
-                                onkeyup="filter_results('search_filter_virtual_hosts', 'virtual_hosts')"
-                                placeholder="Filter resources by any string"
-                        >
-                    </label>
-                    <span class="icon is-left">
-                <i class="fas fa-search" aria-hidden="true"></i>
-            </span>
+                  <input id="searchInput" class="input" type="text" placeholder="Filter virtual-hosts by any string" />
+                  <span class="icon is-left">
+                    <i class="fas fa-search" aria-hidden="true"></i>
+                  </span>
                 </p>
-            </div>
-
-            {% set vs_count = 0 %}
-            {% for resource in res %}
-                {% set vs_len = resource['virtual_hosts']|length %}
-                {% set vs_count = vs_count + vs_len %}
-                {% for virtualhost in resource['virtual_hosts'] %}
-                    {% if loop.first and loop.last %}
-                        {# A single virtualhost makes no sense to render. It will be in one of the routes above. #}
-                    {% else %}
-                        <a class="panel-block"
-                           href="/ui/resources/routes/{{ resource['name'] }}/{{ virtualhost['name'] }}">
-            <span class="panel-icon">
-                <i class="fas fa-arrow-right" aria-hidden="true"></i>
-            </span>
-                            {{ virtualhost['name'] }}
-                        </a>
-                    {% endif %}
+              </div>
+              <p class="panel-tabs">
+                <a class="is-active" onclick="filterTabs(this, 'all')">All</a>
+                {% for resource in res %}
+                    <a onclick="filterTabs(this, '{{ resource["name"] }}')">
+                        {{ resource['name'] }}
+                    </a>
                 {% endfor %}
-            {% endfor %}
-            <div class="panel-block">
-                <p class="content is-small">
-                    {{ vs_count }} {{ plural.get(vs_count, 'resources') }}
-                </p>
-            </div>
-        </nav>
+              </p>
+              {% for resource in res %}
+                  {% if resource["virtual_hosts"] %}
+                  {% for virtualhost in resource['virtual_hosts'] %}
+                      <a class="panel-block virtualhost"
+                         data-category="{{ resource['name'] }}"
+                         href="#"
+                         onclick="loadVirtualHostInSidePanel('{{ resource['name'] }}', '{{ virtualhost['name'] }}'); return false;">
+                      <p class="tag is-small is-primary">
+                          {{ resource['name'] }}
+                      </p>
+                      <span class="panel-icon">
+                          <i class="fas fa-arrow-right" aria-hidden="true"></i>
+                      </span>
+                          {{ virtualhost['name'] }}
+                      </a>
+                  {% endfor %}
+                  {% else %}
+                    <span class="panel-icon">
+                        <i class="fas fa-arrow-right" aria-hidden="true"></i>
+                    </span>
+                    <div class="notification is-danger">
+                        No resources found
+                        <script>
+                          setTimeout(() => location.reload(), 6000);
+                        </script>
+                    </div>
+                  {% endif %}
+              {% endfor %}
+            </nav>
+        {% endif %}
+    {% else %}
+        <span class="panel-icon">
+            <i class="fas fa-arrow-right" aria-hidden="true"></i>
+        </span>
+        <div class="notification is-danger">
+            No resources found
+            <script>
+              setTimeout(() => location.reload(), 2000);
+            </script>
+        </div>
+    {% endif %}
+    {% if show_debuginfo %}
+    <pre>
+    {%- if discovery_request != None %}
+    ---
+    DiscoveryRequest:
+      Node:
+        Id: {{ discovery_request.node.id }}
+        Cluster: {{ discovery_request.node.cluster }}
+        Metadata: {{ discovery_request.node.metadata }}
+        Locality: {{ discovery_request.node.locality }}
+        Build Version: {{ discovery_request.node.build_version }}
+      Version Info: {{ discovery_request.version_info }}
+      Resource Names: {{ discovery_request.resources or "*" }}
+      # Sovereign-generated fields
+      Envoy Version: {{ discovery_request.envoy_version }}
+      Host Header: {{ discovery_request.desired_controlplane }}
+    {%- endif %}
+    {%- if discovery_response != None %}
+    ---
+    DiscoveryResponse:
+      Config version: {{ discovery_response.version }}
+    {%- endif %}
+    </pre>
     {% endif %}
+    
+    <!-- Side Panel Backdrop -->
+    <div id="sidePanelBackdrop" class="side-panel-backdrop"></div>
+    
+    <!-- Side Panel -->
+    <div id="sidePanel" class="side-panel has-background-dark has-text-white">
+        <div class="hero is-primary is-small">
+            <div class="hero-body p-4">
+                <div class="level">
+                    <div class="level-left">
+                        <h4 class="title is-4 has-text-white mb-0">
+                            <span id="sidePanelTitle">Resource Details</span>
+                        </h4>
+                    </div>
+                    <div class="level-right">
+                        <button class="delete is-large" onclick="closeSidePanel()"></button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="side-panel-content">
+            <div id="sidePanelContent">
+                <div class="content has-text-centered p-6">
+                    <p>Select a resource to view its details.</p>
+                </div>
+            </div>
+        </div>
+    </div>
 {% endblock -%}
 {% block footer %}
 <div class="content has-text-centered is-small">
-    <p>{{ last_update }}</p>
+    <script src="/static/node_expression.js"></script>
+    <script>
+      document.addEventListener('DOMContentLoaded', function() {
+        const resourceNames = [
+          {% for resource in resources %}
+            "{{ resource.name or resource.cluster_name or 'Unknown' }}"{% if not loop.last %},{% endif %}
+          {% endfor %}
+        ];
+        if (typeof initializeResources === 'function') {
+          initializeResources(resourceNames, '{{ resource_type }}');
+        }
+      });
+      function setEnvoyVersion(version) {
+        document.cookie = `envoy_version=${version}; path=/ui/resources/; max-age=31536000`;
+        window.location.reload();
+      }
+    </script>
 </div>
 {% endblock %}

sovereign/testing/loaders.py

@@ -0,0 +1,9 @@
+from typing import Any
+
+from sovereign.dynamic_config.loaders import CustomLoader
+
+
+class Multiply(CustomLoader):
+    def load(self, path: str) -> Any:
+        result = path * 2
+        return result

sovereign/{modifiers/test.py → testing/modifiers.py}

@@ -1,4 +1,3 @@
-from sovereign import template_context
 from sovereign.modifiers.lib import Modifier
 from sovereign.utils import eds, templates
 
@@ -8,7 +7,6 @@ class Test(Modifier):
         return True
 
     def apply(self) -> None:
-        assert template_context
         assert eds
         assert templates
         self.instance["modifier_test_executed"] = True

sovereign/tracing.py

@@ -0,0 +1,103 @@
+import time
+import uuid
+from contextlib import nullcontext
+from contextvars import ContextVar
+from typing import Any, TypedDict
+
+import requests
+from typing_extensions import NotRequired
+
+from sovereign import config
+from sovereign.configuration import TracingConfig
+
+_trace_id_ctx_var: ContextVar[str] = ContextVar("trace_id", default="")
+_span_id_ctx_var: ContextVar[str] = ContextVar("span_id", default="")
+
+
+def get_trace_id() -> str:
+    return _trace_id_ctx_var.get()
+
+
+def get_span_id() -> str:
+    return _span_id_ctx_var.get()
+
+
+def generate_128bit():
+    return str(uuid.uuid4()).replace("-", "")
+
+
+def generate_64bit():
+    return generate_128bit()[:32]
+
+
+def timestamp():
+    return str(time.time()).replace(".", "")
+
+
+TRACING = config.tracing
+TRACING_DISABLED = not getattr(TRACING, "enabled", False)
+
+
+class Trace(TypedDict):
+    traceId: str
+    id: str
+    name: str
+    timestamp: float
+    tags: dict[str, Any]
+    duration: NotRequired[float]
+    parentSpanId: NotRequired[str]
+
+
+class Tracer:
+    def __init__(self, span_name):
+        if TRACING_DISABLED:
+            return
+
+        self.tracing: TracingConfig = TRACING
+        span_id = get_span_id()
+        self.parent_span_id = None
+        if span_id != "":
+            # We are already inside a trace context
+            self.parent_span_id = span_id
+        self.trace_id = get_trace_id()
+        self.span_id = self.gen_id()
+        self.span_name = span_name
+
+    def gen_id(self):
+        if self.tracing.trace_id_128bit:
+            trace_id = generate_128bit()
+        else:
+            trace_id = generate_64bit()
+        _trace_id_ctx_var.set(trace_id)
+        return trace_id
+
+    def __enter__(self):
+        if TRACING_DISABLED:
+            return nullcontext()
+        self.trace = Trace(
+            {
+                "traceId": self.trace_id,
+                "id": self.span_id,
+                "name": self.span_name,
+                "timestamp": time.time(),
+                "tags": self.tracing.tags,
+            }
+        )
+        if self.parent_span_id:
+            self.trace["parentSpanId"] = self.parent_span_id
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        if TRACING_DISABLED:
+            return
+        self.trace["duration"] = time.time() - self.trace["timestamp"]
+        self.submit()
+
+    def submit(self):
+        print(f"{self.span_name}: {self.trace['duration']}")
+        try:
+            url = f"{self.tracing.collector}{self.tracing.endpoint}"
+            requests.post(url, json=self.trace)
+        # pylint: disable=broad-except
+        except Exception as e:
+            print(f"Failed to submit trace: {self.trace}, Error:{e}")