sovereign 0.23.0__py3-none-any.whl → 0.24.1__py3-none-any.whl

sovereign/__init__.py

@@ -92,6 +92,8 @@ cipher_suite = CipherContainer(
 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_suite,

sovereign/configuration.py

@@ -61,6 +61,8 @@ POLLER = SourcePoller(
 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_SUITE,

sovereign/context.py

@@ -1,13 +1,30 @@
+import asyncio
 import traceback
-from typing import Dict, Any, Generator, Iterable, NoReturn, Optional
 from copy import deepcopy
+from typing import (
+    Any,
+    Awaitable,
+    Dict,
+    Generator,
+    Iterable,
+    NamedTuple,
+    NoReturn,
+    Optional,
+)
+
 from fastapi import HTTPException
+from structlog.stdlib import BoundLogger
+
 from sovereign.config_loader import Loadable
 from sovereign.schemas import DiscoveryRequest, XdsTemplate
 from sovereign.sources import SourcePoller
-from sovereign.utils.crypto import CipherSuite, CipherContainer
+from sovereign.utils.crypto import CipherContainer, CipherSuite
 from sovereign.utils.timer import poll_forever, poll_forever_cron
-from structlog.stdlib import BoundLogger
+
+
+class LoadContextResponse(NamedTuple):
+    context_name: str
+    context: Dict[str, Any]
 
 
 class TemplateContext:
@@ -15,9 +32,11 @@ class TemplateContext:
         self,
         refresh_rate: Optional[int],
         refresh_cron: Optional[str],
+        refresh_num_retries: int,
+        refresh_retry_interval_secs: int,
         configured_context: Dict[str, Loadable],
         poller: SourcePoller,
-        encryption_suite: CipherContainer,
+        encryption_suite: Optional[CipherContainer],
         disabled_suite: CipherSuite,
         logger: BoundLogger,
         stats: Any,
@@ -25,13 +44,15 @@ class TemplateContext:
         self.poller = poller
         self.refresh_rate = refresh_rate
         self.refresh_cron = refresh_cron
+        self.refresh_num_retries = refresh_num_retries
+        self.refresh_retry_interval_secs = refresh_retry_interval_secs
         self.configured_context = configured_context
         self.crypto = encryption_suite
         self.disabled_suite = disabled_suite
         self.logger = logger
         self.stats = stats
         # initial load
-        self.context = self.load_context_variables()
+        self.context = asyncio.run(self.load_context_variables())
 
     async def start_refresh_context(self) -> NoReturn:
         if self.refresh_cron is not None:
@@ -42,30 +63,66 @@ class TemplateContext:
         raise RuntimeError("Failed to start refresh_context, this should never happen")
 
     async def refresh_context(self) -> None:
-        self.context = self.load_context_variables()
+        self.context = await self.load_context_variables()
 
-    def load_context_variables(self) -> Dict[str, Any]:
-        ret = dict()
-        for k, v in self.configured_context.items():
+    async def _load_context(
+        self,
+        context_name: str,
+        context_config: Loadable | str,
+        refresh_num_retries: int,
+        refresh_retry_interval_secs: int,
+    ) -> LoadContextResponse:
+        retries_left = refresh_num_retries
+        context_response = {}
+
+        while True:
             try:
-                if isinstance(v, Loadable):
-                    ret[k] = v.load()
-                elif isinstance(v, str):
-                    ret[k] = Loadable.from_legacy_fmt(v).load()
+                if isinstance(context_config, Loadable):
+                    context_response = context_config.load()
+                elif isinstance(context_config, str):
+                    context_response = Loadable.from_legacy_fmt(context_config).load()
                 self.stats.increment(
                     "context.refresh.success",
-                    tags=[f"context:{k}"],
+                    tags=[f"context:{context_name}"],
                 )
-            except Exception as e:  # pylint: disable=broad-exception-caught
-                tb = [line for line in traceback.format_exc().split("\n")]
-                self.logger.error(str(e), traceback=tb)
-                self.stats.increment(
-                    "context.refresh.error",
-                    tags=[f"context:{k}"],
+                return LoadContextResponse(context_name, context_response)
+            # pylint: disable=broad-except
+            except Exception as e:
+                retries_left -= 1
+                if retries_left < 0:
+                    tb = [line for line in traceback.format_exc().split("\n")]
+                    self.logger.error(str(e), traceback=tb)
+                    self.stats.increment(
+                        "context.refresh.error",
+                        tags=[f"context:{context_name}"],
+                    )
+                    return LoadContextResponse(context_name, context_response)
+                else:
+                    await asyncio.sleep(refresh_retry_interval_secs)
+
+    async def load_context_variables(self) -> Dict[str, Any]:
+        context_response: Dict[str, Any] = dict()
+
+        context_coroutines: list[Awaitable[LoadContextResponse]] = []
+        for context_name, context_config in self.configured_context.items():
+            context_coroutines.append(
+                self._load_context(
+                    context_name,
+                    context_config,
+                    self.refresh_num_retries,
+                    self.refresh_retry_interval_secs,
                 )
-        if "crypto" not in ret:
-            ret["crypto"] = self.crypto
-        return ret
+            )
+
+        context_results: list[LoadContextResponse] = await asyncio.gather(
+            *context_coroutines
+        )
+        for context_result in context_results:
+            context_response[context_result.context_name] = context_result.context
+
+        if "crypto" not in context_response and self.crypto:
+            context_response["crypto"] = self.crypto
+        return context_response
 
     def build_new_context_from_instances(self, node_value: str) -> Dict[str, Any]:
         matches = self.poller.match_node(node_value=node_value)

sovereign/schemas.py

@@ -542,6 +542,8 @@ class ContextConfiguration(BaseSettings):
     refresh: bool = False
     refresh_rate: Optional[int] = None
     refresh_cron: Optional[str] = None
+    refresh_num_retries: int = 3
+    refresh_retry_interval_secs: int = 10
 
     @staticmethod
     def context_from_legacy(context: Dict[str, str]) -> Dict[str, Loadable]:
@@ -585,6 +587,10 @@ class ContextConfiguration(BaseSettings):
             "refresh": {"env": "SOVEREIGN_REFRESH_CONTEXT"},
             "refresh_rate": {"env": "SOVEREIGN_CONTEXT_REFRESH_RATE"},
             "refresh_cron": {"env": "SOVEREIGN_CONTEXT_REFRESH_CRON"},
+            "refresh_num_retries": {"env": "SOVEREIGN_CONTEXT_REFRESH_NUM_RETRIES"},
+            "refresh_retry_interval_secs": {
+                "env": "SOVEREIGN_CONTEXT_REFRESH_RETRY_INTERVAL_SECS"
+            },
         }
 
 

{sovereign-0.23.0.dist-info → sovereign-0.24.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sovereign
-Version: 0.23.0
+Version: 0.24.1
 Summary: Envoy Proxy control-plane written in Python
 Home-page: https://pypi.org/project/sovereign/
 License: Apache-2.0
@@ -29,23 +29,23 @@ Provides-Extra: statsd
 Provides-Extra: ujson
 Requires-Dist: Jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: PyYAML (>=6.0.1,<7.0.0)
-Requires-Dist: aiofiles (>=23.1.0,<24.0.0)
-Requires-Dist: boto3 (>=1.26.136,<2.0.0) ; extra == "boto"
+Requires-Dist: aiofiles (>=23.2.1,<24.0.0)
+Requires-Dist: boto3 (>=1.28.62,<2.0.0) ; extra == "boto"
 Requires-Dist: cachelib (>=0.10.2,<0.11.0)
-Requires-Dist: cashews[redis] (>=6.1.0,<7.0.0) ; extra == "caching"
-Requires-Dist: croniter (>=1.3.14,<2.0.0)
-Requires-Dist: cryptography (>=41.0.2,<42.0.0)
-Requires-Dist: datadog (>=0.45.0,<0.46.0) ; extra == "statsd"
-Requires-Dist: fastapi (>=0.95.2,<0.96.0)
+Requires-Dist: cashews[redis] (>=6.3.0,<7.0.0) ; extra == "caching"
+Requires-Dist: croniter (>=1.4.1,<2.0.0)
+Requires-Dist: cryptography (>=41.0.4,<42.0.0)
+Requires-Dist: datadog (>=0.47.0,<0.48.0) ; extra == "statsd"
+Requires-Dist: fastapi (>=0.99.1,<0.100.0)
 Requires-Dist: glom (>=23.3.0,<24.0.0)
-Requires-Dist: gunicorn (>=20.1.0,<21.0.0)
-Requires-Dist: httptools (>=0.5.0,<0.6.0) ; extra == "httptools"
-Requires-Dist: orjson (>=3.8.12,<4.0.0) ; extra == "orjson"
-Requires-Dist: requests (>=2.30.0,<3.0.0)
+Requires-Dist: gunicorn (>=21.2.0,<22.0.0)
+Requires-Dist: httptools (>=0.6.0,<0.7.0) ; extra == "httptools"
+Requires-Dist: orjson (>=3.9.7,<4.0.0) ; extra == "orjson"
+Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: sentry-sdk (>=1.23.1,<2.0.0) ; extra == "sentry"
 Requires-Dist: structlog (>=23.1.0,<24.0.0)
-Requires-Dist: ujson (>=5.7.0,<6.0.0) ; extra == "ujson"
-Requires-Dist: uvicorn (>=0.22.0,<0.23.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.17.0,<0.18.0)
 Project-URL: Documentation, https://vsyrakis.bitbucket.io/sovereign/docs/
 Project-URL: Repository, https://bitbucket.org/atlassian/sovereign/src/master/

{sovereign-0.23.0.dist-info → sovereign-0.24.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-sovereign/__init__.py,sha256=VglKS_mlkPm4DipSmN9Mwbz9yHMq3f_mas7_GdUbkmc,3282
+sovereign/__init__.py,sha256=IJscxrxp9cWH85Ee1x_5joMR0b-31l1-sXi6E6wgxOI,3436
 sovereign/app.py,sha256=uozeEQJjefBUV6dZfIooTBJgDhEE4bd2ozRxWVdVMK4,4085
 sovereign/config_loader.py,sha256=ZLKlyuvJ8Wqhsg6xZI-zp_5ABslB3Tc9zEdpds7-d7Q,6349
-sovereign/configuration.py,sha256=sB0iV9srKKn12RPRF3lQEmfZI-46maUaV-I6pyDan8g,2511
+sovereign/configuration.py,sha256=rpZWNgn5ySNO1bdHlUix02yzo3wOefJaWkif5_4HjyE,2665
 sovereign/constants.py,sha256=qdWD1lTvkaW5JGF7TmZhfksQHlRAJFVqbG7v6JQA9k8,46
-sovereign/context.py,sha256=OXXMo7GkQW3ZF3d7oH7ACdbdnVyokZiKGMUp7EP7J5Y,4571
+sovereign/context.py,sha256=zpkYSfGLhFNKQEGLGjcDnYaR-GF5TorlG646glttGBw,6427
 sovereign/discovery.py,sha256=TPecAoUDHx6SbS5hE2K73uEgDro0Uzz3qsvOQMpFtGI,5899
 sovereign/error_info.py,sha256=r2KXBYq9Fo7AI2pmIpATWFm0pykr2MqfrKH0WWW5Sfk,1488
 sovereign/logging/access_logger.py,sha256=JMMzQvi7doFJGA__YYqyasdfAT9W31Ycu_oZ2ovAMis,2565
@@ -16,7 +16,7 @@ sovereign/modifiers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 sovereign/modifiers/lib.py,sha256=DbXsxrrjnFE4Y7rbwpeiM5tS5w5NBwSdYH58AtDTP0I,2884
 sovereign/modifiers/test.py,sha256=7_c2hWXn_sYJ6997N1_uSWtClOikcOzu1yRCY56-l-4,361
 sovereign/response_class.py,sha256=beMAFV-4L6DwyWzJzy71GkEW4gb7fzH1jd8-Tul13cU,427
-sovereign/schemas.py,sha256=H8K7cevb9shyiz7R1QoMIa367c6WJ0NLRH0ajOfT47M,27484
+sovereign/schemas.py,sha256=ylUlHeaLzpsNJnOQCfdcVKt5kaNh0oo8nkDwRuchIWk,27775
 sovereign/server.py,sha256=z8Uz1UYIZix0S40Srk774WIMDN2jl2SozO8irib0wc4,1402
 sovereign/sources/__init__.py,sha256=g9hEpFk8j5i1ApHQpbc9giTyJW41Ppgsqv5P9zGxOJk,78
 sovereign/sources/file.py,sha256=A4UWoRU39v2Ex5Mtdl_uw53iMkslYylF4CiiwW7LOpk,689
@@ -48,8 +48,8 @@ sovereign/views/crypto.py,sha256=nxp6bkPU9GZw_zOk0fsJdz_XRQPXxPI6cXQDL9-cigU,204
 sovereign/views/discovery.py,sha256=DzFfG8fdFHKAZzmWZi9YzFP2PYLCf3tPlEAY3udNyNg,5980
 sovereign/views/healthchecks.py,sha256=_WkMunlrFpqGTLgtNtRr7gCsDCv5kiuYxCyTi-dMEKM,1357
 sovereign/views/interface.py,sha256=Y2fbR26cSF8eKQHfTbnv5WKEdgqaGNwys0lEGUTjXqw,7041
-sovereign-0.23.0.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
-sovereign-0.23.0.dist-info/METADATA,sha256=WSi5WtASCKtha-xDeZGxPadXdUu3fbktV228E9G1qHw,6290
-sovereign-0.23.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-sovereign-0.23.0.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
-sovereign-0.23.0.dist-info/RECORD,,
+sovereign-0.24.1.dist-info/LICENSE.txt,sha256=2X125zvAb9AYLjCgdMDQZuufhm0kwcg31A8pGKj_-VY,560
+sovereign-0.24.1.dist-info/METADATA,sha256=e_YoN1lhq0XIZdyFsxN8t4AaQfa5S3FXjguJDFPzvcQ,6288
+sovereign-0.24.1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+sovereign-0.24.1.dist-info/entry_points.txt,sha256=kOn848ucVbNvtsGABDuwzOHmNiOb0Ey8dV85Z3dLv3Y,222
+sovereign-0.24.1.dist-info/RECORD,,

{sovereign-0.23.0.dist-info → sovereign-0.24.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.7.0
 Root-Is-Purelib: true
 Tag: py3-none-any