File tree 2 files changed +3
-3
lines changed
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -512,7 +512,8 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
512
512
"sys_db_name"
513
513
]
514
514
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" ]
516
517
517
518
# Telemetry config
518
519
if "telemetry" not in provided_config or provided_config ["telemetry" ] is None :
Original file line number Diff line number Diff line change @@ -1049,7 +1049,6 @@ def test_overwrite_config_minimal(mocker):
1049
1049
app_db_name: appdbname
1050
1050
sys_db_name: sysdbname
1051
1051
ssl: true
1052
- ssl_ca: cert.pem
1053
1052
migrate:
1054
1053
- alembic upgrade head
1055
1054
telemetry:
@@ -1079,7 +1078,7 @@ def test_overwrite_config_minimal(mocker):
1079
1078
assert config ["database" ]["app_db_name" ] == "appdbname"
1080
1079
assert config ["database" ]["sys_db_name" ] == "sysdbname"
1081
1080
assert config ["database" ]["ssl" ] == True
1082
- assert config [ "database" ][ " ssl_ca"] == "cert.pem"
1081
+ assert " ssl_ca" not in config [ "database" ]
1083
1082
assert config ["telemetry" ]["OTLPExporter" ]["tracesEndpoint" ] == [
1084
1083
"thetracesendpoint"
1085
1084
]
You can’t perform that action at this time.
0 commit comments