Skip to content

Commit 0b38e76

Browse files
committed
use environment variables to overwrite rest api settings
1 parent eb290ac commit 0b38e76

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

.devcontainer/devcontainer.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
"args": [
8989
"run_develop"
9090
],
91+
"env": {
92+
"TIRA_API_BASE_URL": "https://127.0.0.1:8080",
93+
"TIRA_GRPC_BASE_URL": "https://127.0.0.1:8080",
94+
"TIRA_ARCHIVED_URL": "https://127.0.0.1:8080"
95+
},
9196
"django": true,
9297
"autoStartBrowser": false,
9398
"program": "${workspaceFolder:Backend}/src/manage.py"
@@ -144,7 +149,7 @@
144149
},
145150

146151
// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
147-
// "remoteUser": "devcontainer"
152+
"remoteUser": "ubuntu",
148153

149154
// Needed for parts of the python-client that build and run docker containers
150155
"privileged": true,

application/config/tira-application-config.yml

+9
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,12 @@ django_secret: !ENV ${DJANGO_SECRET:change-me!}
5959
grpc_host: local
6060
host_grpc_port: 50051
6161
application_grpc_port: 50052
62+
63+
tira_rest_api:
64+
base_url: !ENV ${TIRA_API_BASE_URL:https://www.tira.io}
65+
grpc_url: !ENV ${TIRA_GRPC_BASE_URL:https://www.tira.io}
66+
archived_url: !ENV ${TIRA_ARCHIVED_URL:https://archive.tira.io}
67+
login_url: !ENV ${TIRA_LOGIN_URL:https://www.tira.io}
68+
logout_url: !ENV ${TIRA_LOGOUT_URL:https://www.tira.io}
69+
disraptor_url: !ENV ${TIRA_DISRAPTOR_URL:https://www.tira.io}
70+
notifications_url: !ENV ${TIRA_NOTIFICATIONS_URL:https://www.tira.io}

application/src/django_admin/settings.py

+7-12
Original file line numberDiff line numberDiff line change
@@ -399,19 +399,14 @@ def logger_config(log_dir: Path):
399399
}
400400

401401
WELL_KNOWN = {
402-
"api": "https://www.tira.io",
403-
"grpc": "https://www.tira.io",
404-
"archived": "https://archive.tira.io",
405-
"login": "https://www.tira.io",
406-
"logout": "https://www.tira.io",
407-
"notifications": "fooo",
408-
"disraptorURL": "https://www.tira.io",
402+
"api": custom_settings['tira_rest_api']['base_url'],
403+
"grpc": custom_settings['tira_rest_api']['grpc_url'],
404+
"archived": custom_settings['tira_rest_api']['archived_url'],
405+
"login": custom_settings['tira_rest_api']['login_url'],
406+
"logout": custom_settings['tira_rest_api']['logout_url'],
407+
"notifications": custom_settings['tira_rest_api']['notifications_url'],
408+
"disraptorURL": custom_settings['tira_rest_api']['disraptor_url'],
409409
}
410410

411-
if "well_known" in custom_settings:
412-
for k in list(WELL_KNOWN.keys()):
413-
if k in custom_settings["well_known"]:
414-
WELL_KNOWN[k] = custom_settings["well_known"][k]
415-
416411
CODE_SUBMISSION_REPOSITORY_NAMESPACE = "tira-io"
417412
CSRF_TRUSTED_ORIGINS = ["https://127.0.0.1:8082", "https://127.0.0.1:8080", "https://127.0.0.1:8081"]

application/src/tira_app/endpoints/misc.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
rest_api_version = "v1.0.0-draft"
2020

21-
WELL_KNOWN = {i: settings.WELL_KNOWN[i] for i in ["api", "archived", "login", "logout", "disraptorURL", "grpc"]}
22-
2321

2422
try:
2523
SOFTWARE_COUNT = len(json.loads(public_submissions(None).content.decode("UTF-8")))
@@ -60,7 +58,7 @@ def info_endpoint(request: Request) -> Response:
6058

6159
@api_view(["GET"])
6260
def well_known_endpoint(request: Request) -> Response:
63-
return Response(WELL_KNOWN)
61+
return Response(settings.WELL_KNOWN)
6462

6563

6664
endpoints = [

0 commit comments

Comments
 (0)