types: Remove fallback "any" filesystem type

Signed-off-by: Ikey Doherty <[email protected]>

Author: ikeycode

crates/partitioning/src/formatter.rs

@@ -31,7 +31,6 @@ impl FilesystemExt for Filesystem {
                 types::StandardFilesystemType::Xfs => "mkfs.xfs",
                 types::StandardFilesystemType::Swap => "mkswap",
             },
-            Filesystem::Any => panic!("Cannot format with 'any' filesystem type"),
         }
     }
 
@@ -58,7 +57,6 @@ impl FilesystemExt for Filesystem {
                     vec![]
                 }
             }
-            Filesystem::Any => vec![],
         }
     }
 
@@ -85,7 +83,6 @@ impl FilesystemExt for Filesystem {
                     vec![]
                 }
             }
-            Filesystem::Any => panic!("Cannot format with 'any' filesystem type"),
         }
     }
 
@@ -98,7 +95,6 @@ impl FilesystemExt for Filesystem {
                 types::StandardFilesystemType::Xfs => vec!["-f".to_string()],
                 types::StandardFilesystemType::Swap => vec!["-f".to_string()],
             },
-            Filesystem::Any => vec![],
         }
     }
 }
@@ -118,12 +114,9 @@ impl Formatter {
         }
     }
 
-    /// Creates a new Formatter with force enabled
-    pub fn force(filesystem: Filesystem) -> Self {
-        Self {
-            filesystem,
-            force: true,
-        }
+    /// Forces the format operation
+    pub fn force(self) -> Self {
+        Self { force: true, ..self }
     }
 
     /// Returns a Command configured to format the given device with the filesystem
@@ -185,11 +178,4 @@ mod tests {
         assert_eq!(fs.uuid_arg(), vec!["-m".to_string(), format!("uuid={}", uuid)]);
         assert_eq!(fs.label_arg(), vec!["-L", "data"]);
     }
-
-    #[test]
-    #[should_panic(expected = "Cannot format with 'any' filesystem type")]
-    fn test_any_filesystem_panic() {
-        let fs = Filesystem::Any;
-        fs.mkfs_command();
-    }
 }

crates/provisioning/tests/use_whole_disk.kdl

@@ -45,7 +45,7 @@ strategy name="whole_disk" summary="Wipe and use an entire disk" {
         }
         type (GUID)"linux-fs"
         filesystem {
-            type "any"
+            type "xfs"
             label "ROOT"
         }
     }

crates/types/src/filesystem.rs

@@ -22,7 +22,6 @@ pub enum Filesystem {
         label: Option<String>,
         uuid: Option<String>,
     },
-    Any,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -63,7 +62,7 @@ impl FromKdlProperty<'_> for StandardFilesystemType {
         let value = kdl_value_to_string(entry)?;
         let v = value.parse().map_err(|_| crate::UnsupportedValue {
             at: entry.span(),
-            advice: Some("'fat32', 'ext4', 'f2fs', 'xfs' 'swap' and 'any' are supported".into()),
+            advice: Some("'fat32', 'ext4', 'f2fs', 'xfs' 'swap' are supported".into()),
         })?;
         Ok(v)
     }
@@ -108,7 +107,6 @@ impl Filesystem {
                 }
                 Ok(Filesystem::Fat32 { label, volume_id })
             }
-            "any" => Ok(Filesystem::Any),
             fs_type => {
                 if volume_id.is_some() {
                     return Err(crate::InvalidArguments {