Skip to content

Commit 6db23d3

Browse files
committed
only overwrite ssl CA if provided by the file (#256)
1 parent 4114878 commit 6db23d3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dbos/_dbos_config.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,8 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
512512
"sys_db_name"
513513
]
514514
provided_config["database"]["ssl"] = config_from_file["database"]["ssl"]
515-
provided_config["database"]["ssl_ca"] = config_from_file["database"]["ssl_ca"]
515+
if "ssl_ca" in config_from_file["database"]:
516+
provided_config["database"]["ssl_ca"] = config_from_file["database"]["ssl_ca"]
516517

517518
# Telemetry config
518519
if "telemetry" not in provided_config or provided_config["telemetry"] is None:

tests/test_config.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,6 @@ def test_overwrite_config_minimal(mocker):
10491049
app_db_name: appdbname
10501050
sys_db_name: sysdbname
10511051
ssl: true
1052-
ssl_ca: cert.pem
10531052
migrate:
10541053
- alembic upgrade head
10551054
telemetry:
@@ -1079,7 +1078,7 @@ def test_overwrite_config_minimal(mocker):
10791078
assert config["database"]["app_db_name"] == "appdbname"
10801079
assert config["database"]["sys_db_name"] == "sysdbname"
10811080
assert config["database"]["ssl"] == True
1082-
assert config["database"]["ssl_ca"] == "cert.pem"
1081+
assert "ssl_ca" not in config["database"]
10831082
assert config["telemetry"]["OTLPExporter"]["tracesEndpoint"] == [
10841083
"thetracesendpoint"
10851084
]

0 commit comments

Comments
 (0)