Skip to content

Commit 4eec020

Browse files
author
Alex Grosu
committed
Merge remote-tracking branch 'origin/develop' into feat-rspy582/remove-deprecated-code
2 parents 9af606f + fce9167 commit 4eec020

File tree

19 files changed

+555
-537
lines changed

19 files changed

+555
-537
lines changed

docs/poetry.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

poetry.lock

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ pytest-httpx = "^0.34.0"
7171
pytest-mock = "^3.14.0"
7272
black = "^24.10.0"
7373
mypy = "^1.14.1"
74-
pre-commit = "^4.0.1"
74+
pre-commit = "^4.1.0"
7575
types-requests = "^2.32.0.20241016"
7676
flake8 = "^7.1.1"
7777
bandit = "^1.8.2"
7878
safety = "^3.2.14"
7979
pylint = "^3.3.0"
8080
flake8-pyproject = "^1.2.3"
8181
httpx = "^0.27.2"
82-
moto = "==5.0.26"
82+
moto = "==5.0.27"
8383
flask = "^3.0.3"
8484
flask-cors = "^5.0.0"
8585
sphinx = "^8.1.3"

resources/sync_config_files.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ def new_representer(dumper, data):
129129

130130
# Replace local urls like http(s)://(127.0.0.1|localhost):5xxx
131131
REGEX_URL = re.compile(r"(https?://)(127.0.0.1|localhost):5\d+")
132+
REGEX_DOMAIN = re.compile(r"mockup-.+-svc.processing.svc.cluster.local")
132133

133134
# Replace k8s values
134135
REGEX_RANGE_START = r"({{-?\s*range\s.*-?}})"
@@ -324,13 +325,13 @@ def update_single_value(value: str) -> str:
324325
if not isinstance(value, str):
325326
raise RuntimeError(f"Invalid argument: {value}")
326327
if station.adgs:
327-
return re.sub(REGEX_URL, r"\g<1>adgs-station:5000", value)
328+
return re.sub(REGEX_DOMAIN, "adgs-station", re.sub(REGEX_URL, r"\g<1>adgs-station:5000", value))
328329
if station.cadip:
329-
return re.sub(REGEX_URL, r"\g<1>cadip-station:5000", value)
330+
return re.sub(REGEX_DOMAIN, "cadip-station", re.sub(REGEX_URL, r"\g<1>cadip-station:5000", value))
330331
if station.lta:
331-
return re.sub(REGEX_URL, r"\g<1>lta-station:5000", value)
332+
return re.sub(REGEX_DOMAIN, "lta-station", re.sub(REGEX_URL, r"\g<1>lta-station:5000", value))
332333
if station.prip:
333-
return re.sub(REGEX_URL, r"\g<1>prip-station:5000", value)
334+
return re.sub(REGEX_DOMAIN, "prip-station", re.sub(REGEX_URL, r"\g<1>prip-station:5000", value))
334335
# No modification
335336
return value
336337

services/adgs/poetry.lock

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)