Update to confique 0.3

backend/Cargo.toml

@@ -25,7 +25,7 @@ bunt = "0.2.7"
 bytes = "1"
 chrono = { version = "0.4", default-features = false, features = ["serde", "std"] }
 clap = { version = "4.2.2", features = ["derive", "string"] }
-confique = { version = "0.2.0", default-features = false, features = ["toml"] }
+confique = { version = "0.3", features = ["toml"] }
 cookie = "0.18.0"
 deadpool = { version = "0.10.0", default-features = false, features = ["managed", "rt_tokio_1"] }
 deadpool-postgres = { version = "0.12.1", default-features = false, features = ["rt_tokio_1"] }

backend/src/auth/config.rs

@@ -11,6 +11,7 @@ use super::JwtConfig;
 
 /// Authentification and authorization
 #[derive(Debug, Clone, confique::Config)]
+#[config(validate = Self::validate)]
 pub(crate) struct AuthConfig {
     /// How incoming HTTP requests are authenticated. See the documentation!
     #[config(default = "none")]

backend/src/config/color.rs

@@ -82,7 +82,7 @@ impl TryFrom<String> for Color {
 type Vars = Vec<(String, String)>;
 
 impl ColorConfig {
-    pub(crate) fn validate(&self) -> Result<()> {
+    pub(crate) fn lint(&self) {
         // Make sure the primary color is in a good range.
         //
         // Regarding the minimum of 35: We have two variations, with one being
@@ -130,9 +130,6 @@ impl ColorConfig {
                 );
             }
         }
-
-
-        Ok(())
     }
 
     /// Returns the CSS variables for light and dark themes, respectively.

backend/src/config/mod.rs

@@ -128,22 +128,15 @@ impl Config {
         let mut config = Config::from_file(path)
             .context(format!("failed to read config file '{}'", path.display()))?;
 
-        config.validate().context("failed to validate configuration")?;
         config.fix_paths(path)?;
 
         Ok(config)
     }
 
-    /// Performs some validation of the configuration to find some
-    /// illegal or conflicting values.
-    pub(crate) fn validate(&self) -> Result<()> {
-        debug!("Validating configuration...");
-        self.auth.validate()?;
-        self.opencast.validate()?;
-        self.db.validate()?;
-        self.theme.validate()?;
-
-        Ok(())
+    /// Checks the config for problematic things that deserve a warning, but
+    /// should not bring down Tobira.
+    pub(crate) fn lint(&self) {
+        self.theme.color.lint();
     }
 
     /// Goes through all paths in the configuration and changes relative paths

backend/src/config/opencast.rs

@@ -10,6 +10,7 @@ use crate::{
 
 
 #[derive(Debug, confique::Config)]
+#[config(validate = Self::validate)]
 pub(crate) struct OpencastConfig {
     /// URL to Opencast. Currently used for all purposes (syncing, Studio,
     /// upload, ...) unless overwritten below. In the future, Tobira might use

backend/src/config/theme.rs

@@ -1,6 +1,5 @@
 use std::{path::PathBuf, fmt};
 
-use crate::prelude::*;
 use super::color::ColorConfig;
 
 
@@ -87,10 +86,6 @@ pub(crate) struct FontConfig {
 }
 
 impl ThemeConfig {
-    pub(crate) fn validate(&self) -> Result<()> {
-        self.color.validate()
-    }
-
     /// Returns a string containing CSS that sets lots of variables on the
     /// `:root` element.
     pub(crate) fn to_css(&self) -> String {

backend/src/db/mod.rs

@@ -35,6 +35,7 @@ pub(crate) use self::{
 
 
 #[derive(Debug, confique::Config, Clone)]
+#[config(validate = Self::validate)]
 pub(crate) struct DbConfig {
     /// The username of the database user.
     #[config(default = "tobira")]

backend/src/main.rs

@@ -189,8 +189,7 @@ fn load_config_and_init_logger(shared: &args::Shared, args: &Args, cmd: &str) ->
     info!(source_file = ?path.display(), "Loaded config");
     debug!(cmd, "Initialized logger");
 
-    // Call validate again, as some of the checks will only print warnings.
-    config.validate()?;
+    config.lint();
 
     Ok(config)
 }