Switch config from TOML to JSON

Author: allan2

crates/devolutions-pedm/Cargo.toml

@@ -11,7 +11,17 @@ publish = false
 
 [dependencies]
 anyhow = "1.0"
-axum = { version = "0.8", default-features = false, features = ["http1", "json", "tokio", "query", "tracing", "tower-log", "form", "original-uri", "matched-path"] }
+axum = { version = "0.8", default-features = false, features = [
+  "http1",
+  "json",
+  "tokio",
+  "query",
+  "tracing",
+  "tower-log",
+  "form",
+  "original-uri",
+  "matched-path",
+] }
 base16ct = { version = "0.2", features = ["std", "alloc"] }
 base64 = "0.22"
 digest = "0.10"
@@ -25,27 +35,32 @@ sha2 = "0.10"
 tokio = { version = "1.44", features = ["net", "rt-multi-thread"] }
 tower-service = "0.3"
 win-api-wrappers = { path = "../win-api-wrappers" }
-devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = ["policy"]}
+devolutions-pedm-shared = { path = "../devolutions-pedm-shared", features = [
+  "policy",
+] }
 devolutions-gateway-task = { path = "../devolutions-gateway-task" }
 devolutions-agent-shared = { path = "../devolutions-agent-shared" }
 camino = { version = "1", features = ["serde1"] }
 async-trait = "0.1"
 tracing = "0.1"
-aide = { version = "0.14", features = ["axum", "axum-extra", "axum-json", "axum-tokio"] }
+aide = { version = "0.14", features = [
+  "axum",
+  "axum-extra",
+  "axum-json",
+  "axum-tokio",
+] }
 tower-http = { version = "0.5", features = ["timeout"] }
 parking_lot = "0.12"
 cfg-if = "1.0"
 uuid = "1"
 dunce = "1.0"
 tower = "0.5"
 futures-util = "0.3"
-toml = "0.8"
-libsql = { version = "0.9", optional = true, features = [ "core", "stream"] }
+libsql = { version = "0.9", optional = true, features = ["core", "stream"] }
 tokio-postgres = { version = "0.7", optional = true }
 bb8 = { version = "0.9.0", optional = true }
 bb8-postgres = { version = "0.9.0", optional = true }
 
-
 [features]
 default = ["libsql"]
 libsql = ["dep:libsql"]

crates/devolutions-pedm/config.example.json

@@ -0,0 +1,12 @@
+{
+    "db": "libsql",
+    "libsql": {
+        "path": "C:/ProgramData/Devolutions/Agent/pedm/pedm.sqlite"
+    },
+    "postgres": {
+        "host": "192.168.0.100",
+        "dbname": "pedm",
+        "user": "pedm",
+        "password": "pedm"
+    }
+}

crates/devolutions-pedm/config.example.toml

@@ -9,7 +9,6 @@ use crate::data_dir;
 
 /// The application config.
 #[derive(Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
 pub(crate) struct Config {
     /// The selected database backend.
     ///
@@ -36,14 +35,14 @@ impl Config {
         match fs::read_to_string(path) {
             Ok(s) => {
                 info!("Loading config from {path}");
-                let c: Self = toml::from_str(&s)?;
+                let c: Self = serde_json::from_str(&s)?;
                 c.validate()?;
                 Ok(c)
             }
             Err(e) if e.kind() == io::ErrorKind::NotFound => {
                 info!("Config not found at {path}. Initializing default config");
                 let c = Config::standard();
-                fs::write(path, toml::to_string(&c)?).map_err(|e| ConfigError::Io(e, path.into()))?;
+                fs::write(path, serde_json::to_string(&c)?).map_err(|e| ConfigError::Io(e, path.into()))?;
                 Ok(c)
             }
             Err(e) => Err(ConfigError::Io(e, path.into())),
@@ -108,17 +107,15 @@ pub(crate) struct PgConfig {
 #[derive(Debug)]
 pub enum ConfigError {
     Io(io::Error, Utf8PathBuf),
-    TomlDe(toml::de::Error),
-    TomlSer(toml::ser::Error),
+    Json(serde_json::Error),
     MissingSection(DbBackend),
 }
 
 impl error::Error for ConfigError {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         match self {
             Self::Io(e, _) => Some(e),
-            Self::TomlDe(e) => Some(e),
-            Self::TomlSer(e) => Some(e),
+            Self::Json(e) => Some(e),
             Self::MissingSection(_) => None,
         }
     }
@@ -128,20 +125,14 @@ impl fmt::Display for ConfigError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Io(e, path) => write!(f, "IO error while loading config at {path}: {e}"),
-            Self::TomlDe(e) => e.fmt(f),
-            Self::TomlSer(e) => e.fmt(f),
+            Self::Json(e) => e.fmt(f),
             Self::MissingSection(s) => write!(f, "{s} config section is missing"),
         }
     }
 }
 
-impl From<toml::de::Error> for ConfigError {
-    fn from(e: toml::de::Error) -> Self {
-        Self::TomlDe(e)
-    }
-}
-impl From<toml::ser::Error> for ConfigError {
-    fn from(e: toml::ser::Error) -> Self {
-        Self::TomlSer(e)
+impl From<serde_json::Error> for ConfigError {
+    fn from(e: serde_json::Error) -> Self {
+        Self::Json(e)
     }
 }