Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion python/src/smooai_config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
init_container_config,
select_mode,
)
from smooai_config.env_config import find_and_process_env_config
from smooai_config.eso_manifests import (
BootstrapSecretRef,
ExternalSecretOptions,
Expand All @@ -36,7 +37,6 @@
TokenSource,
run_eso_refresher,
)
from smooai_config.env_config import find_and_process_env_config
from smooai_config.file_config import find_and_process_file_config, find_config_directory
from smooai_config.local import LocalConfigManager
from smooai_config.merge import merge_replace_arrays
Expand All @@ -47,6 +47,7 @@
__all__ = [
"DEFAULT_CACHE_TTL_MS",
"DEFAULT_TOKEN_REFRESH_BUFFER_SECONDS",
"BootstrapSecretRef",
"BuildBundleResult",
"CloudRegionResult",
"ConfigBootstrapError",
Expand All @@ -56,15 +57,22 @@
"ConfigManager",
"ConfigTier",
"ContainerConfigHandle",
"EsoRefresherHandle",
"EvaluateFeatureFlagResponse",
"ExternalSecretOptions",
"FeatureFlagContextError",
"FeatureFlagEvaluationError",
"FeatureFlagNotFoundError",
"LocalConfigManager",
"SecretMapping",
"SecretWriter",
"SelectModeInputs",
"SmooaiConfigError",
"TokenSource",
"UndefinedKeyError",
"build_bundle",
"build_cluster_secret_store",
"build_external_secret",
"build_config_runtime",
"camel_to_upper_snake",
"classify_from_schema",
Expand All @@ -79,5 +87,7 @@
"init_container_config",
"merge_replace_arrays",
"read_baked_config",
"resolve_secret_mapping",
"run_eso_refresher",
"select_mode",
]
3 changes: 2 additions & 1 deletion python/src/smooai_config/eso_manifests.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ def build_cluster_secret_store(

ref = bootstrap_secret or BootstrapSecretRef()
base = api_url.rstrip("/")
url = f"{base}/organizations/{org_id}/config/values/{{{{ .remoteRef.key }}}}?environment={quote(environment, safe='')}"
env = quote(environment, safe="")
url = f"{base}/organizations/{org_id}/config/values/{{{{ .remoteRef.key }}}}?environment={env}"

return {
"apiVersion": ESO_API_VERSION,
Expand Down
3 changes: 2 additions & 1 deletion python/src/smooai_config/eso_refresher.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
from __future__ import annotations

import threading
from collections.abc import Callable
from dataclasses import dataclass
from typing import Callable, Protocol
from typing import Protocol

from smooai_config.utils import SmooaiConfigError

Expand Down
11 changes: 9 additions & 2 deletions python/tests/test_eso_manifests.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from __future__ import annotations

import pytest

from smooai_config.eso_manifests import (
BootstrapSecretRef,
ExternalSecretOptions,
Expand Down Expand Up @@ -40,7 +41,8 @@ def test_cluster_secret_store_overrides():
bootstrap_secret=BootstrapSecretRef(name="s", namespace="ns", key="k"),
)
assert store["metadata"]["name"] == "smooai-config-prod"
assert store["spec"]["provider"]["webhook"]["secrets"][0]["secretRef"] == {"name": "s", "namespace": "ns", "key": "k"}
ref = store["spec"]["provider"]["webhook"]["secrets"][0]["secretRef"]
assert ref == {"name": "s", "namespace": "ns", "key": "k"}


def test_cluster_secret_store_required_fields():
Expand Down Expand Up @@ -76,7 +78,12 @@ def test_build_external_secret_maps_keys():

def test_build_external_secret_distinct_target():
es = build_external_secret(
ExternalSecretOptions(name="litellm-config-eso", namespace="smooai-litellm", secrets=["mimoApiKey"], target_secret_name="litellm-config-eso")
ExternalSecretOptions(
name="litellm-config-eso",
namespace="smooai-litellm",
secrets=["mimoApiKey"],
target_secret_name="litellm-config-eso",
)
)
assert es["spec"]["target"]["name"] == "litellm-config-eso"

Expand Down
10 changes: 8 additions & 2 deletions python/tests/test_eso_refresher.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

from __future__ import annotations

from typing import Callable
from collections.abc import Callable

import pytest

from smooai_config.eso_refresher import run_eso_refresher
from smooai_config.utils import SmooaiConfigError

Expand Down Expand Up @@ -115,5 +116,10 @@ def test_required_fields():

def test_honors_interval_override():
sched = ManualScheduler()
run_eso_refresher(token_source=FakeTokenSource(["t"]), secret_writer=RecordingWriter(), interval_seconds=123.0, scheduler=sched)
run_eso_refresher(
token_source=FakeTokenSource(["t"]),
secret_writer=RecordingWriter(),
interval_seconds=123.0,
scheduler=sched,
)
assert sched.interval == 123.0
Loading