provisioning: Ergonomic processing, don't permit invalid nodes

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

Author: ikeycode

crates/provisioning/src/commands/create_partition.rs

@@ -23,6 +23,7 @@ pub struct Command {
     /// The GUID of the partition type
     pub partition_type: Option<PartitionTypeGuid>,
 
+    /// Constraints for the partition
     pub constraints: Constraints,
 }
 
@@ -36,23 +37,27 @@ pub(crate) fn parse(context: Context<'_>) -> Result<super::Command, crate::Error
         None
     };
 
-    let constraints =
-        if let Some(constraints) = context.node.iter_children().find(|n| n.name().value() == "constraints") {
-            Constraints::from_kdl_node(constraints)?
-        } else {
-            return Err(crate::Error::MissingNode("constraints"));
-        };
-
-    let partition_type = if let Some(partition_type) = context.node.iter_children().find(|n| n.name().value() == "type")
-    {
-        match PartitionTypeKDL::from_kdl_type(get_kdl_entry(partition_type, &0)?)? {
-            PartitionTypeKDL::GUID => Some(PartitionTypeGuid::from_kdl_node(partition_type)?),
+    let mut constraints = Constraints::default();
+    let mut partition_type = None;
+
+    for child in context.node.iter_children() {
+        match child.name().value() {
+            "constraints" => constraints = Constraints::from_kdl_node(child)?,
+            "type" => {
+                partition_type = match PartitionTypeKDL::from_kdl_type(get_kdl_entry(child, &0)?)? {
+                    PartitionTypeKDL::GUID => Some(PartitionTypeGuid::from_kdl_node(child)?),
+                }
+            }
+            _ => {
+                return Err(crate::UnsupportedNode {
+                    at: child.span(),
+                    name: child.name().value().into(),
+                }
+                .into())
+            }
         }
-    } else {
-        None
-    };
+    }
 
-    // TODO: Load constraints etc
     Ok(super::Command::CreatePartition(Box::new(Command {
         disk,
         id,

crates/provisioning/src/errors.rs

@@ -108,7 +108,7 @@ pub struct MissingEntry {
 /// Error for unsupported node types
 #[derive(Debug, Diagnostic, Error)]
 #[error("unsupported node: {name}")]
-#[diagnostic(severity(warning))]
+#[diagnostic(severity(error))]
 pub struct UnsupportedNode {
     #[label]
     pub at: SourceSpan,

crates/provisioning/src/types/constraints.rs

@@ -6,7 +6,7 @@ use crate::{get_kdl_entry, kdl_value_to_storage_size};
 
 /// Constraints for partition size, 1:1 mapping to SizeRequirements in
 /// partitioning strategy internals.
-#[derive(Debug)]
+#[derive(Debug, Default, Clone, Copy)]
 pub enum Constraints {
     /// Exact size in bytes
     Exact(u64),
@@ -16,6 +16,10 @@ pub enum Constraints {
     Range { min: u64, max: u64 },
     /// Use all remaining space
     Remaining,
+
+    /// Default constraints
+    #[default]
+    Invalid,
 }
 
 impl Constraints {

crates/provisioning/tests/use_whole_disk.kdl

@@ -18,6 +18,10 @@ strategy name="whole_disk" summary="Wipe and use an entire disk" {
             max (GiB)2
         }
         type (GUID)"efi-system-partition"
+        filesystem {
+            type "fat32"
+            label "ESP"
+        }
     }
 
     // Create xbootldr
@@ -27,6 +31,10 @@ strategy name="whole_disk" summary="Wipe and use an entire disk" {
             max (GiB)4
         }
         type (GUID) "linux-extended-boot"
+        filesystem {
+            type "fat32"
+            label "XBOOTLDR"
+        }
     }
 
     // Create a partition for rootfs
@@ -35,6 +43,10 @@ strategy name="whole_disk" summary="Wipe and use an entire disk" {
             min (GiB)30
             max (GiB)120
         }
+        filesystem {
+            type "any"
+            label "ROOT"
+        }
     }
 
     // find a partition (bound to root_disk here)