test: Add a config parsing test

Author: jan-auer

objectstore-server/src/config.rs

@@ -926,6 +926,8 @@ mod tests {
 
     use secrecy::ExposeSecret;
 
+    use crate::killswitches::Killswitch;
+
     use super::*;
 
     #[test]
@@ -1077,29 +1079,30 @@ mod tests {
             Ok(())
         });
     }
+
     #[test]
     fn configure_auth_with_yaml() {
         let mut tempfile = tempfile::NamedTempFile::new().unwrap();
         tempfile
             .write_all(
                 br#"
-            auth:
-                enforce: true
-                keys:
-                    kid1:
-                        key_versions:
-                            - "abcde"
-                            - "fghij"
-                            - |
-                              this is a test
-                                multiline string
-                              end of string
-                        max_permissions:
-                            - "object.read"
-                            - "object.write"
-                    kid2:
-                        key_versions:
-                            - "12345"
+                auth:
+                    enforce: true
+                    keys:
+                        kid1:
+                            key_versions:
+                                - "abcde"
+                                - "fghij"
+                                - |
+                                this is a test
+                                    multiline string
+                                end of string
+                            max_permissions:
+                                - "object.read"
+                                - "object.write"
+                        kid2:
+                            key_versions:
+                                - "12345"
             "#,
             )
             .unwrap();
@@ -1128,4 +1131,54 @@ mod tests {
             Ok(())
         });
     }
+
+    #[test]
+    fn configure_killswitches_with_yaml() {
+        let mut tempfile = tempfile::NamedTempFile::new().unwrap();
+        tempfile
+            .write_all(
+                br#"
+                killswitches:
+                  - usecase: broken_usecase
+                  - scopes:
+                      org: "42"
+                  - scopes:
+                      org: "42"
+                      project: "4711"
+                  - usecase: attachments
+                    scopes:
+                      org: "42"
+                "#,
+            )
+            .unwrap();
+
+        figment::Jail::expect_with(|_jail| {
+            let expected = [
+                Killswitch {
+                    usecase: Some("broken_usecase".into()),
+                    scopes: BTreeMap::new(),
+                },
+                Killswitch {
+                    usecase: None,
+                    scopes: BTreeMap::from([("org".into(), "42".into())]),
+                },
+                Killswitch {
+                    usecase: None,
+                    scopes: BTreeMap::from([
+                        ("org".into(), "42".into()),
+                        ("project".into(), "4711".into()),
+                    ]),
+                },
+                Killswitch {
+                    usecase: Some("attachments".into()),
+                    scopes: BTreeMap::from([("org".into(), "42".into())]),
+                },
+            ];
+
+            let config = Config::load(Some(tempfile.path())).unwrap();
+            assert_eq!(&config.killswitches.0, &expected,);
+
+            Ok(())
+        });
+    }
 }

objectstore-server/src/killswitches.rs

@@ -5,9 +5,10 @@ use serde::{Deserialize, Serialize};
 
 /// A list of killswitches that may disable access to certain object contexts.
 #[derive(Debug, Default, Deserialize, Serialize)]
-pub struct Killswitches(Vec<Killswitch>);
+pub struct Killswitches(pub Vec<Killswitch>);
 
 impl Killswitches {
+    /// Returns `true` if any of the contained killswitches matches the given context.
     pub fn matches(&self, context: &ObjectContext) -> bool {
         self.0.iter().any(|s| s.matches(context))
     }
@@ -17,7 +18,7 @@ impl Killswitches {
 ///
 /// Note that at least one of the fields should be set, or else the killswitch will match all
 /// contexts and discard all requests.
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, PartialEq, Deserialize, Serialize)]
 pub struct Killswitch {
     /// Optional usecase to match.
     ///
@@ -34,6 +35,7 @@ pub struct Killswitch {
 }
 
 impl Killswitch {
+    /// Returns `true` if this killswitch matches the given context.
     pub fn matches(&self, context: &ObjectContext) -> bool {
         if let Some(ref switch_usecase) = self.usecase
             && switch_usecase != &context.usecase