Print SNI from credentials file. (#1365)

* Print SNI from credentials file. * Update Cargo.lock * Cargo.lock update
edgedb · Sep 6, 2024 · 5d7d8ce · 5d7d8ce
1 parent 5917f7e
commit 5d7d8ce
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/portable/credentials.rs b/src/portable/credentials.rs
@@ -37,23 +37,30 @@ pub fn show_credentials(options: &Options, c: &ShowCredentials) -> anyhow::Resul
  }
  Some(url.to_string())
  } else {
- crate::table::settings(&[
+ let mut settings = vec![
  ("Host", creds.host.unwrap_or("localhost".to_string())),
  ("Port", creds.port.to_string()),
- ("User", creds.user),
+ ("User", creds.user.clone()),
  (
  "Password",
  creds
  .password
+ .as_ref()
  .map(|_| "<hidden>".to_string())
  .unwrap_or("<none>".to_string()),
  ),
  (
  "Database",
- creds.database.unwrap_or("<default>".to_string()),
+ creds.database.clone().unwrap_or("<default>".to_string()),
  ),
  ("TLS Security", format!("{:?}", creds.tls_security)),
- ]);
+ ];
+
+ if let Some(server_name) = creds.tls_server_name {
+ settings.push(("TLS Server Name", server_name.clone()));
+ }
+
+ crate::table::settings(&settings);
  None
  } {
  stdout()