Merge pull request #53 from LRZ-BADW/dependabot/cargo/secrecy-0.10.0

chore(cargo): update: Bump secrecy from 0.8.0 to 0.10.0

.github/dependabot.yml

@@ -5,7 +5,7 @@ updates:
     schedule:
       interval: "daily"
     commit-message:
-      prefix: "chore(cargo): update"
+      prefix: "chore(cargo)"
     labels: []
 
   - package-ecosystem: "github-actions"
@@ -15,5 +15,5 @@ updates:
     schedule:
       interval: "daily"
     commit-message:
-      prefix: "chore(ci): update"
+      prefix: "chore(ci)"
     labels: []

api/Cargo.toml

@@ -40,7 +40,7 @@ tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
 tracing-bunyan-formatter = "0.3"
 tracing-log = "0.2"
 tracing-actix-web = "0.7"
-secrecy = { version = "0.8", features = ["serde"] }
+secrecy = { version = "0.10.1", features = ["serde"] }
 anyhow = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"

api/src/configuration.rs

@@ -1,4 +1,5 @@
-use secrecy::{ExposeSecret, Secret};
+use secrecy::{ExposeSecret, SecretString};
+use serde::Deserialize;
 use serde_aux::field_attributes::deserialize_number_from_string;
 use sqlx::mysql::{MySqlConnectOptions, MySqlSslMode};
 
@@ -17,10 +18,21 @@ pub struct ApplicationSettings {
     pub base_url: String,
 }
 
+fn deserialize_secret_string<'de, D>(
+    deserializer: D,
+) -> Result<SecretString, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let s = String::deserialize(deserializer)?;
+    Ok(SecretString::from(s))
+}
+
 #[derive(Clone, serde::Deserialize)]
 pub struct DatabaseSettings {
     pub username: String,
-    pub password: Secret<String>,
+    #[serde(deserialize_with = "deserialize_secret_string")]
+    pub password: SecretString,
     #[serde(deserialize_with = "deserialize_number_from_string")]
     pub port: u16,
     pub host: String,

api/src/main.rs

@@ -10,7 +10,7 @@ async fn main() -> anyhow::Result<()> {
 
     let configuration =
         get_configuration().expect("Failed to read configuration.");
-    let application = Application::build(configuration.clone()).await?;
+    let application = Application::build(configuration).await?;
     application.run_until_stopped().await?;
 
     Ok(())