sovereign 0.29.4__py3-none-any.whl → 0.31.0__py3-none-any.whl

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
@@ -92,6 +110,7 @@ def instances(
         title="Whether the sources should run Modifiers/Global Modifiers prior to being returned",
     ),
 ) -> JSONResponse:
+    assert poller is not None  # how else would there be sources
     node = mock_discovery_request(service_cluster=service_cluster).node
     args = {
         "modify": yaml.safe_load(modified),

sovereign/views/crypto.py

@@ -4,7 +4,8 @@ from fastapi import APIRouter, Body
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel, Field
 
-from sovereign import json_response_class, logs, server_cipher_container
+from sovereign import logs, server_cipher_container
+from sovereign.response_class import json_response_class
 from sovereign.schemas import EncryptionConfig
 from sovereign.utils.crypto.crypto import CipherContainer
 from sovereign.utils.crypto.suites import EncryptionType

sovereign/views/healthchecks.py

@@ -2,7 +2,8 @@ from typing import List
 from fastapi import Response
 from fastapi.routing import APIRouter
 from fastapi.responses import PlainTextResponse
-from sovereign import XDS_TEMPLATES, __version__, json_response_class
+from sovereign import XDS_TEMPLATES, __version__
+from sovereign.response_class import json_response_class
 from sovereign.utils.mock import mock_discovery_request
 from sovereign.views.discovery import perform_discovery
 

sovereign/views/interface.py

@@ -6,7 +6,8 @@ from fastapi.encoders import jsonable_encoder
 from fastapi.requests import Request
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse, Response
 
-from sovereign import XDS_TEMPLATES, html_templates, json_response_class, poller
+from sovereign import XDS_TEMPLATES, html_templates, poller, config
+from sovereign.response_class import json_response_class
 from sovereign.discovery import DiscoveryTypes
 from sovereign.utils.mock import mock_discovery_request
 from sovereign.views.discovery import perform_discovery
@@ -18,6 +19,12 @@ all_types = [t.value for t in DiscoveryTypes]
 
 @router.get("/")
 async def ui_main(request: Request) -> HTMLResponse:
+    if poller is not None:
+        last_update = str(poller.last_updated)
+    else:
+        # TODO: incorporate with cache? template context?
+        last_update = ""
+
     try:
         return html_templates.TemplateResponse(
             request=request,
@@ -25,7 +32,7 @@ async def ui_main(request: Request) -> HTMLResponse:
             media_type="text/html",
             context={
                 "all_types": all_types,
-                "last_update": str(poller.last_updated),
+                "last_update": last_update,
             },
         )
     except IndexError:
@@ -37,7 +44,7 @@ async def ui_main(request: Request) -> HTMLResponse:
                 "title": "No resource types configured",
                 "message": "A template should be defined for every resource "
                 "type that you want your envoy proxies to discover.",
-                "doc_link": "https://vsyrakis.bitbucket.io/sovereign/docs/tutorial/templates/",
+                "doc_link": "https://developer.atlassian.com/platform/sovereign/tutorial/templates/#templates",
             },
         )
 
@@ -109,6 +116,15 @@ async def resources(
         ret["resources"] = [{"sovereign_error": str(e)}]
     else:
         ret["resources"] = response.deserialize_resources()
+
+    if poller is not None:
+        last_update = str(poller.last_updated)
+        match_keys = poller.match_keys
+    else:
+        # TODO: incorporate with cache? template context?
+        last_update = ""
+        match_keys = config.expected_service_clusters
+
     return html_templates.TemplateResponse(
         request=request,
         name="resources.html",
@@ -123,8 +139,8 @@ async def resources(
             "version": envoy_version,
             "available_versions": list(XDS_TEMPLATES.keys()),
             "service_cluster": service_cluster,
-            "available_service_clusters": poller.match_keys,
-            "last_update": str(poller.last_updated),
+            "available_service_clusters": match_keys,
+            "last_update": last_update,
         },
     )
 

{sovereign-0.29.4.dist-info → sovereign-0.31.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.29.4
+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)
@@ -51,60 +51,70 @@ Requires-Dist: pydantic-settings (<2.6.0)
 Requires-Dist: redis (<=5.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: sentry-sdk (>=2.14.0,<3.0.0) ; extra == "sentry"
+Requires-Dist: starlette-context (>=0.3.6,<0.4.0)
 Requires-Dist: structlog (>=23.1.0,<24.0.0)
 Requires-Dist: ujson (>=5.8.0,<6.0.0) ; extra == "ujson"
 Requires-Dist: uvicorn (>=0.23.2,<0.24.0)
 Requires-Dist: uvloop (>=0.19.0,<0.20.0)
-Project-URL: Documentation, https://vsyrakis.bitbucket.io/sovereign/docs/
+Project-URL: Documentation, https://developer.atlassian.com/platform/sovereign/
 Project-URL: Repository, https://bitbucket.org/atlassian/sovereign/src/master/
 Description-Content-Type: text/markdown
 
 sovereign
 =========
 
+
 Mission statement
 -----------------
 This project implements a JSON control-plane based on the [envoy](https://envoyproxy.io) [data-plane-api](https://github.com/envoyproxy/data-plane-api)
 
-The purpose of `sovereign` is to supply downstream envoy proxies with 
-configuration in near-realtime by responding to discovery requests.
+The purpose of `sovereign` is to supply downstream envoy proxies with dynamic configuration.
+
 
 Mechanism of Operation
 ----------------------
-tl;dr version:
-```
-* Polls HTTP/File/Other for data
-* (optional) Applies transforms to the data
-* Uses the data to generate Envoy configuration from templates
-```
+Sovereign allows you to define templates that represent each resource type
+provided by Envoy. For example, clusters, routes, listeners, secrets,
+extension_configs, etc.
+
+In order to enrich the templates with data, Sovereign has ways of polling data
+out-of-band which it then includes as variables that can be accessed within the
+templates.
+
+This allows Sovereign to provide configuration to Envoy that changes over time
+depending on the data sources, without needing to redeploy the control-plane.
 
-In a nutshell, Sovereign 
-gathers contextual data (*"sources"* and *"template context"*), 
-optionally applies transforms to that data (using *"modifiers"*) and finally 
-uses the data to generate envoy configuration from either python code, or jinja2 templates.
+Sovereign provides some built-in ways of polling data (such as over HTTP, or
+on-disk) but also exposes extension points, allowing you to write your own
+plugins in Python.
 
-This is performed in a semi-stateless way, where the only state is data cached in memory.
 
-Template context is intended to be statically configured, whereas *Sources* 
-are meant to be dynamic - for example, fetching from an API, an S3 bucket, 
-or a file that receives updates.
+Support
+------------
+[Submit new issues here](https://bitbucket.org/atlassian/sovereign/issues/new)
+
+If you're unable to submit an issue on Bitbucket, send an email to [vsyrakis@atlassian.com](mailto:vsyrakis@atlassian.com)
+
 
-*Modifiers* can mutate the data retrieved from sources, just in case the data 
-is in a less than favorable structure.
+Release
+------------
+See [RELEASE.md]
 
-Both modifiers and sources are pluggable, i.e. it's easy to write your own and 
-plug them into Sovereign for your use-case.
 
-Currently, Sovereign supports only providing configuration to Envoy as JSON. 
-That is to say, gRPC is not supported yet. Contributions in this area are highly
-appreciated!
+Roadmap
+------------
+* Performance improvements
+* Data persistence
+* Push API (versus polling)
+* Client for Sovereign
+* gRPC
 
-The JSON configuration can be viewed in real-time with Sovereign's read-only web interface.
 
 Requirements
 ------------
 * Python 3.8+
 
+
 Installation
 ------------
 ```
@@ -113,62 +123,52 @@ pip install sovereign
 
 Documentation
 -------------
-[Read the docs here!](https://vsyrakis.bitbucket.io/sovereign/docs/)
+[Read the docs here!](https://developer.atlassian.com/platform/sovereign/)
 
-:new: Read-only user interface
-------------------------
-Added in `v0.5.3`!
 
-This interface allows you to browse the resources currently returned by Sovereign.
-
-![Sovereign User Interface Screenshot](https://bitbucket.org/atlassian/sovereign/src/master/assets/sovereign_ui.png)
 
 Local development
 =================
 
+
 Requirements
 ------------
+* Poetry
 * Docker
 * Docker-compose
 
+
 Installing dependencies for dev
 -------------------------------
-I recommend creating a virtualenv before doing any dev work
-
+Dependencies and creation of virtualenv is handled by poetry
 ```
-python3 -m venv venv
-source venv/bin/activate
-pip install -r requirements-dev.txt
+poetry install
+poetry shell
 ```
 
 Running locally
 ---------------
 Running the test env
-
 ```
 make run
 ```
     
 Running the test env daemonized
-
 ```
 make run-daemon
 ```
 
 Pylint
-
 ```
 make lint
 ```
 
 Unit tests
-
 ```
 make unit
 ```
 
 Acceptance tests
-
 ```
 make run-daemon acceptance
 ```
@@ -176,7 +176,6 @@ make run-daemon acceptance
 
 Contributors
 ============
-
 Pull requests, issues and comments welcome. For pull requests:
 
 * Add tests for new features and bug fixes
@@ -205,7 +204,6 @@ those contributing as an individual.
 
 License
 ========
-
 Copyright (c) 2018 Atlassian and others.
 Apache 2.0 licensed, see [LICENSE.txt](LICENSE.txt) file.
 

{sovereign-0.29.4.dist-info → sovereign-0.31.0.dist-info}/RECORD

@@ -1,49 +1,49 @@
-sovereign/__init__.py,sha256=L0PLw5Su5XX_HdSEXCJVtbCitxUMjZP5nlyl21sQ3eA,3256
-sovereign/app.py,sha256=udDhuprAcJdYNgXufl94-oh-G74H9hXVzr8cKhgdQYI,4087
-sovereign/configuration.py,sha256=BCezlWYIpTsFRZwQIBwU-XrfBk1MdjTKMLA8huN-VPg,2484
+sovereign/__init__.py,sha256=AEvYuDWafstmB6K9OqBA_hf1RPFUqiq9_PeVCfpshso,2994
+sovereign/app.py,sha256=WIetM8_4m5nZ6eD12Kd_jDKeUkcDRqdkk7L4wCKyP40,4257
 sovereign/constants.py,sha256=qdWD1lTvkaW5JGF7TmZhfksQHlRAJFVqbG7v6JQA9k8,46
-sovereign/context.py,sha256=Vwr-Jmo1I_05rFraxv6GoYEC83oFl87LG16px4R7IfA,6461
-sovereign/discovery.py,sha256=LrgrojgehyZIObZl4wICi_s5PHwIl73wSym3tSNBkfI,6409
-sovereign/dynamic_config/__init__.py,sha256=QoRNcuCAqV26zeyHm0iavsR55K3TwMohabWpPGIq_rM,2838
-sovereign/dynamic_config/deser.py,sha256=CYTP9UNx8falCXU_bEaWGNatyQlYrV4T57NPXNhTn0o,1842
-sovereign/dynamic_config/loaders.py,sha256=HxDT-6hlqg_ewPjrFu2RaWi6O1mmJ_Mpnu8AQk_enNg,2923
+sovereign/context.py,sha256=qeo1Alb26kuyD3mDqJleh3MTJviQqdm7HE5lvHpVAF4,7009
+sovereign/discovery.py,sha256=iQ3QJzXuxB6su79dDqgjmlzhVWAGrxq4XOrCwwwIPi8,6373
+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
-sovereign/logging/access_logger.py,sha256=JMMzQvi7doFJGA__YYqyasdfAT9W31Ycu_oZ2ovAMis,2565
-sovereign/logging/application_logger.py,sha256=VI8EBRv_dB8vvTnSh3n-IaFtVh-GaNN4atjtLJdr2kI,1843
-sovereign/logging/base_logger.py,sha256=T-nZVv0_K8wtB2DY7dpQp1FOfBt9zpEc9OLEX9IQ_Zg,1918
-sovereign/logging/bootstrapper.py,sha256=6Az0Mn9uXzrtCFIzs7Ph6p9ShV2-tkWYfUyXLhqKPi4,1185
+sovereign/logging/access_logger.py,sha256=G-R6kSPDQlrunSh34qXIT3LwbamAhdASuPgPOaXCRdM,2983
+sovereign/logging/application_logger.py,sha256=HjrGTi2zZ06AaToDVdSv4MNIF6aWN6vFW5heAdfqwlk,1800
+sovereign/logging/base_logger.py,sha256=ScOzHs8Rt1RZaUZGvaJSAlDEjD0BxkD5sLKSm2GgM0I,1243
+sovereign/logging/bootstrapper.py,sha256=m2arNfP0MgAeZC1slp3Sqtcwpye8pnZ-i5VTzYt50mo,1185
 sovereign/logging/types.py,sha256=rGqJAEVvgvzHy4aPfvEH6yQ-yblXNkEcWG7G8l9ALEA,282
-sovereign/middlewares.py,sha256=UoLdfhqMj_E6jXgtr-n0maQIBYe9n95s3BwaQZfebHo,3097
+sovereign/middlewares.py,sha256=tQazHAtIdUc1hWhopg33x83-g-JcilU4HdjzoxFe6NU,3053
 sovereign/modifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sovereign/modifiers/lib.py,sha256=DbXsxrrjnFE4Y7rbwpeiM5tS5w5NBwSdYH58AtDTP0I,2884
+sovereign/modifiers/lib.py,sha256=Cx0VrpTKbSjb3YmHyG4Jy6YEaPlrwpeqNaom3zu1_hw,2885
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
-sovereign/schemas.py,sha256=NfbBub6Fnozrb-cQNwchwIH0FRlVozycOhmm6Vyqpb4,31286
+sovereign/schemas.py,sha256=XY5UQiAwy3TgxMqZt0HxsiytRnvaIx-rgBe3stEMYJg,33473
 sovereign/server.py,sha256=z8Uz1UYIZix0S40Srk774WIMDN2jl2SozO8irib0wc4,1402
 sovereign/sources/__init__.py,sha256=g9hEpFk8j5i1ApHQpbc9giTyJW41Ppgsqv5P9zGxOJk,78
 sovereign/sources/file.py,sha256=prUThsDCSPNwZaZpkKXhAm-GVRZWbBoGKGU0It4HHXs,690
-sovereign/sources/inline.py,sha256=bNqVZyelcUofYBWHFOUIhOUU9az32CdBEfaYRzNzFFE,1002
-sovereign/sources/lib.py,sha256=LIbnlKkL0bQT10y4GT2E8yypjYxqfJYbB9FkGB5C2oc,1030
-sovereign/sources/poller.py,sha256=61zV8oHzvC0x453kN8dyfJaOSnykgXHuKiMtLRAHt0w,11059
+sovereign/sources/inline.py,sha256=pP77m7bHjqE3sSoqZthcuw1ARVMf9gooVwbz4B8OAek,1003
+sovereign/sources/lib.py,sha256=0hk_G6mKJrB65WokVZnqF5kdJ3vsQZMNPuJqJO0mBsI,1031
+sovereign/sources/poller.py,sha256=SdpWRb79-ronyNjX-bYVviQ9r-z12MQxbOTmKR1uESw,10891
+sovereign/static/panel.js,sha256=fgAGJo2d_MvAG5rcraY9rvY-TgmTtBbCs4SvzugYssE,2005
 sovereign/static/sass/style.scss,sha256=tPHPEm3sZeBFGDyyn3pHcA-nbaKT-h-UsSTsf6dHNDU,1158
+sovereign/static/search_filter.js,sha256=StfTXTu9mGnkwObkIbuWk1DfwFTheXzrQ6OVq_7E3v4,697
 sovereign/static/style.css,sha256=vG8HPsbCbPIZfHgy7gSeof97Pnp0okkyaXyJzIEEW-8,447517
 sovereign/statistics.py,sha256=Xfj4oWMfCkbYc2ibF7rDUpbw6Zw6dI4N5BpCLDQc4j4,2336
 sovereign/templates/base.html,sha256=5vw3-NmN291pXRdArpCwhSce9bAYBWCJVRhvO5EmE9g,2296
 sovereign/templates/err.html,sha256=a3cEzOqyqWOIe3YxfTEjkxbTfxBxq1knD6GwzEFljfs,603
-sovereign/templates/resources.html,sha256=_mcqw3POMEI0uWR4xF1QlCsdmzgWheYT5zklJhHdPqE,7857
-sovereign/templates/ul_filter.html,sha256=LrzZv5408Qq5UP4lcHVRwY2G6lXd3IiSNiJn1aH7Yqo,666
+sovereign/templates/resources.html,sha256=feN7iClAUccPu7WQ-xIOyDZ7qEaTK5l5NahxzFGv2Wg,7803
 sovereign/testing/loaders.py,sha256=mcmErhI9ZkJUBZl8jv2qP-PCBRFeAIgyBFlfCgU4Vvk,199
 sovereign/testing/modifiers.py,sha256=7_c2hWXn_sYJ6997N1_uSWtClOikcOzu1yRCY56-l-4,361
-sovereign/tracing.py,sha256=KHpqddxUm8A6ucIqnY7xo44ULH7K6ZGdyayObOdDwcw,2239
+sovereign/tracing.py,sha256=Xo3npgh6yesACSlynv9j6qnXxvYEBzXv5LL4Zkc1QDw,2446
 sovereign/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sovereign/utils/auth.py,sha256=sQC8eLPWtk0RIXKwwxnYqILUvUCOaEGtGrtdJflat8E,1692
 sovereign/utils/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sovereign/utils/crypto/crypto.py,sha256=s6qYB3cmY5f4Sacq1LlSARzIWMTys7l2o9mMsCGLfmU,4526
 sovereign/utils/crypto/suites/__init__.py,sha256=smMvNa1VsQ0PvsNj6lnRNh4ktB7dMnas1CqeTOFqgGA,526
 sovereign/utils/crypto/suites/aes_gcm_cipher.py,sha256=Yjfj1LCQDGTzHBjrZR3-koh29L_N34v65kPoIfta0aw,1239
-sovereign/utils/crypto/suites/base_cipher.py,sha256=xJWey-Wy7RFnIH6E3yBSSnn3OAi9PZEZNSJEY9R5ftQ,494
+sovereign/utils/crypto/suites/base_cipher.py,sha256=kUOZh_ZIILyo5zv99-qzbJZDpeMmt76vhkBDEPvAt4A,454
 sovereign/utils/crypto/suites/disabled_cipher.py,sha256=0_vzydVdVIUlX4pYEAMgB_RvHpyZ25uDC4pz1jRJ5wE,573
 sovereign/utils/crypto/suites/fernet_cipher.py,sha256=rP6M5ys1vctyadOxDGNFoyerWPUOunLQdZ2jjS1pxzc,701
-sovereign/utils/dictupdate.py,sha256=JkDjg16u7sW6A_4Q2oX1PY_MtJU7m1VivZWn9VLZ9V8,2559
+sovereign/utils/dictupdate.py,sha256=Bi7QaC7en-k3EOepwNJqpOKRNBgp6ZsBZVOvH_0nMtc,2558
 sovereign/utils/eds.py,sha256=sCEDj1y-0Crs40cHZLiPGVb7ed1f8vFqgHLY5R2LMbw,4377
 sovereign/utils/entry_point_loader.py,sha256=BEVodk-um70RvT1nSOu_IB-hr1K4ppthXod0VZEiZJ8,526
 sovereign/utils/mock.py,sha256=M4hvNKSS3c4wYwHgVaHtwMspoufzZR4rCx_3TB-HD4U,1261
@@ -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=DlazEqI8P9M3h1llVUgRoAnUlmjYH3f1UZnrQmzLXI8,4261
-sovereign/views/crypto.py,sha256=o8NSyiUBy7v1pMOXt_1UBi68FNcGkXSlEVg9C18y8kY,3324
+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/healthchecks.py,sha256=_WkMunlrFpqGTLgtNtRr7gCsDCv5kiuYxCyTi-dMEKM,1357
-sovereign/views/interface.py,sha256=CPKitUWDk9Hgm7ljF-pH2MroVfn8lXoRXOTM3Emspbo,7255
-sovereign-0.29.4.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-0.29.4.dist-info/METADATA,sha256=iOKQp2qSZTz6H2wVGHJpIg00JZNsp2DyA7JfzrNNwTM,6650
-sovereign-0.29.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sovereign-0.29.4.dist-info/entry_points.txt,sha256=2mUHQjqeXEokMF6ZjDmvqQ9Fxk-Or2S4eC0h70ZxKmk,1201
-sovereign-0.29.4.dist-info/RECORD,,
+sovereign/views/healthchecks.py,sha256=8BA11nigm1btnBOdtXGN1B04Ow2uswWNNsuKoPLXgh0,1393
+sovereign/views/interface.py,sha256=KoLB3YIZGulrYOV6MA6ucmQzlmSDrYEO8uq045awy1Q,7712
+sovereign-0.31.0.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-0.31.0.dist-info/METADATA,sha256=_3lQ9SMGUe-JRSnoRuyqg-Jd8w1tGouGpJqh6WazXsA,6194
+sovereign-0.31.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+sovereign-0.31.0.dist-info/entry_points.txt,sha256=CTCjlomxNz2Ii4hYbN-gEZPBrZNUCcmJcb7NYqm4Nn8,1328
+sovereign-0.31.0.dist-info/RECORD,,

{sovereign-0.29.4.dist-info → sovereign-0.31.0.dist-info}/entry_points.txt

@@ -5,7 +5,9 @@ sovereign=sovereign.server:main
 jinja=sovereign.dynamic_config.deser:JinjaDeserializer
 jinja2=sovereign.dynamic_config.deser:JinjaDeserializer
 json=sovereign.dynamic_config.deser:JsonDeserializer
+none=sovereign.dynamic_config.deser:PassthroughDeserializer
 orjson=sovereign.dynamic_config.deser:OrjsonDeserializer
+passthrough=sovereign.dynamic_config.deser:PassthroughDeserializer
 raw=sovereign.dynamic_config.deser:PassthroughDeserializer
 string=sovereign.dynamic_config.deser:StringDeserializer
 ujson=sovereign.dynamic_config.deser:UjsonDeserializer

sovereign/configuration.py

@@ -1,66 +0,0 @@
-import os
-from typing import Any, Mapping
-
-from pydantic import ValidationError
-
-from sovereign import dynamic_config
-from sovereign.context import TemplateContext
-from sovereign.logging.bootstrapper import LoggerBootstrapper
-from sovereign.schemas import SovereignAsgiConfig, SovereignConfig, SovereignConfigv2
-from sovereign.sources import SourcePoller
-from sovereign.statistics import configure_statsd
-from sovereign.utils.crypto.crypto import CipherContainer
-from sovereign.utils.dictupdate import merge  # type: ignore
-
-
-def parse_raw_configuration(path: str) -> Mapping[Any, Any]:
-    ret: Mapping[Any, Any] = dict()
-    for p in path.split(","):
-        spec = dynamic_config.Loadable.from_legacy_fmt(p)
-        ret = merge(obj_a=ret, obj_b=spec.load(), merge_lists=True)
-    return ret
-
-
-def load_sovereign_configuration() -> SovereignConfigv2:
-    config_path = os.getenv("SOVEREIGN_CONFIG", "file:///etc/sovereign.yaml")
-    try:
-        return SovereignConfigv2(**parse_raw_configuration(config_path))
-    except ValidationError:
-        old_config = SovereignConfig(**parse_raw_configuration(config_path))
-        return SovereignConfigv2.from_legacy_config(old_config)
-
-
-CONFIG = load_sovereign_configuration()
-ASGI_CONFIG = SovereignAsgiConfig()
-XDS_TEMPLATES = CONFIG.xds_templates()
-
-LOGS = LoggerBootstrapper(CONFIG)
-STATS = configure_statsd(config=CONFIG.statsd)
-ENCRYPTION_CONFIGS = CONFIG.authentication.encryption_configs
-CIPHER_CONTAINER = CipherContainer.from_encryption_configs(
-    encryption_configs=ENCRYPTION_CONFIGS,
-    logger=LOGS.application_logger.logger,
-)
-
-POLLER = SourcePoller(
-    sources=CONFIG.sources,
-    matching_enabled=CONFIG.matching.enabled,
-    node_match_key=CONFIG.matching.node_key,
-    source_match_key=CONFIG.matching.source_key,
-    source_refresh_rate=CONFIG.source_config.refresh_rate,
-    logger=LOGS.application_logger.logger,
-    stats=STATS,
-)
-TEMPLATE_CONTEXT = TemplateContext(
-    refresh_rate=CONFIG.template_context.refresh_rate,
-    refresh_cron=CONFIG.template_context.refresh_cron,
-    refresh_num_retries=CONFIG.template_context.refresh_num_retries,
-    refresh_retry_interval_secs=CONFIG.template_context.refresh_retry_interval_secs,
-    configured_context=CONFIG.template_context.context,
-    poller=POLLER,
-    encryption_suite=CIPHER_CONTAINER,
-    logger=LOGS.application_logger.logger,
-    stats=STATS,
-)
-POLLER.lazy_load_modifiers(CONFIG.modifiers)
-POLLER.lazy_load_global_modifiers(CONFIG.global_modifiers)

sovereign/templates/ul_filter.html

@@ -1,22 +0,0 @@
-<script>
-function filter_results(id, list) {
-  // Declare variables
-  let input, filter, container, iterable, resource, i, txtValue;
-  input = document.getElementById(id);
-  filter = input.value.toUpperCase();
-
-  container = document.getElementById(list);
-  iterable = container.getElementsByTagName("a");
-
-  // Loop through all list items, and hide those who don't match the search query
-  for (i = 0; i < iterable.length; i++) {
-    resource = iterable[i];
-    txtValue = resource.textContent;
-    if (txtValue.toUpperCase().indexOf(filter) > -1) {
-      iterable[i].style.display = "";
-    } else {
-      iterable[i].style.display = "none";
-    }
-  }
-}
-</script>