Skip to content

Commit fa88e22

Browse files
authored
chore: swap core for yggdrasil (#322)
1 parent fd59b80 commit fa88e22

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+333
-2540
lines changed

β€ŽUnleashClient/__init__.pyβ€Ž

Lines changed: 111 additions & 208 deletions
Large diffs are not rendered by default.

β€ŽUnleashClient/api/features.pyβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def get_feature_toggles(
1919
request_retries: int,
2020
project: Optional[str] = None,
2121
cached_etag: str = "",
22-
) -> Tuple[dict, str]:
22+
) -> Tuple[str, str]:
2323
"""
2424
Retrieves feature flags from unleash central server.
2525
@@ -82,10 +82,10 @@ def get_feature_toggles(
8282
if resp.status_code == 304:
8383
return None, etag
8484

85-
return resp.json(), etag
85+
return resp.text, etag
8686
except Exception as exc:
8787
LOGGER.exception(
8888
"Unleash Client feature fetch failed due to exception: %s", exc
8989
)
9090

91-
return {}, ""
91+
return None, ""

β€ŽUnleashClient/api/register.pyβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from platform import python_implementation, python_version
44

55
import requests
6+
import yggdrasil_engine
67
from requests.exceptions import InvalidHeader, InvalidSchema, InvalidURL, MissingSchema
78

89
from UnleashClient.constants import (
@@ -52,7 +53,7 @@ def register_client(
5253
"interval": metrics_interval,
5354
"platformName": python_implementation(),
5455
"platformVersion": python_version(),
55-
"yggdrasilVersion": None,
56+
"yggdrasilVersion": yggdrasil_engine.__yggdrasil_core_version__,
5657
"specVersion": CLIENT_SPEC_VERSION,
5758
}
5859

β€ŽUnleashClient/cache.pyβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def bootstrap_from_dict(self, initial_config: dict) -> None:
9191
9292
:param initial_config: Dictionary that contains initial configuration.
9393
"""
94-
self.set(FEATURES_URL, initial_config)
94+
self.set(FEATURES_URL, json.dumps(initial_config))
9595
self.bootstrapped = True
9696

9797
def bootstrap_from_file(self, initial_config_file: Path) -> None:
@@ -103,7 +103,7 @@ def bootstrap_from_file(self, initial_config_file: Path) -> None:
103103
:param initial_configuration_file: Path to document containing initial configuration. Must be JSON.
104104
"""
105105
with open(initial_config_file, "r", encoding="utf8") as bootstrap_file:
106-
self.set(FEATURES_URL, json.loads(bootstrap_file.read()))
106+
self.set(FEATURES_URL, bootstrap_file.read())
107107
self.bootstrapped = True
108108

109109
def bootstrap_from_url(
@@ -122,7 +122,7 @@ def bootstrap_from_url(
122122
"""
123123
timeout = request_timeout if request_timeout else self.request_timeout
124124
response = requests.get(initial_config_url, headers=headers, timeout=timeout)
125-
self.set(FEATURES_URL, response.json())
125+
self.set(FEATURES_URL, response.text)
126126
self.bootstrapped = True
127127

128128
def set(self, key: str, value: Any):

β€ŽUnleashClient/constraints/Constraint.pyβ€Ž

Lines changed: 0 additions & 266 deletions
This file was deleted.

β€ŽUnleashClient/constraints/__init__.pyβ€Ž

Lines changed: 0 additions & 2 deletions
This file was deleted.

β€ŽUnleashClient/deprecation_warnings.pyβ€Ž

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
Β (0)