Skip to content

Relax validation on the postgres service address setting #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tankyleo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Relax validation on the postgres service address setting #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions rust/server/src/util/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct JwtAuthConfig {
struct PostgreSQLConfig {
username: Option<String>,
password: Option<String>,
address: Option<SocketAddr>,
address: Option<String>,
default_database: Option<String>,
vss_database: Option<String>,
tls: Option<TlsConfig>,
Expand Down Expand Up @@ -146,13 +146,7 @@ pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Confi

let username_env = read_env(PSQL_USER_VAR)?;
let password_env = read_env(PSQL_PASS_VAR)?;
let address_env: Option<SocketAddr> = read_env(PSQL_ADDR_VAR)?
.map(|address| {
address.parse().map_err(|e| {
format!("Unable to parse the postgresql address environment variable: {}", e)
})
})
.transpose()?;
let address_env: Option<String> = read_env(PSQL_ADDR_VAR)?;
let default_db_env = read_env(PSQL_DB_VAR)?;
let vss_db_env = read_env(PSQL_VSS_DB_VAR)?;
let tls_config_env = read_env(PSQL_TLS_VAR)?;
Expand Down