repair: add sequoia subcommand that can migrate build users to the new 351+ UID range

src/action/base/add_user_to_group.rs

@@ -16,10 +16,10 @@ Create an operating system level user in the given group
 #[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
 #[serde(tag = "action_name", rename = "add_user_to_group")]
 pub struct AddUserToGroup {
-    name: String,
-    uid: u32,
-    groupname: String,
-    gid: u32,
+    pub(crate) name: String,
+    pub(crate) uid: u32,
+    pub(crate) groupname: String,
+    pub(crate) gid: u32,
 }
 
 impl AddUserToGroup {

src/action/base/create_user.rs

@@ -14,10 +14,10 @@ Create an operating system level user in the given group
 #[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
 #[serde(tag = "action_name", rename = "create_user")]
 pub struct CreateUser {
-    name: String,
-    uid: u32,
-    groupname: String,
-    gid: u32,
+    pub(crate) name: String,
+    pub(crate) uid: u32,
+    pub(crate) groupname: String,
+    pub(crate) gid: u32,
     comment: String,
 }
 
@@ -29,6 +29,7 @@ impl CreateUser {
         groupname: String,
         gid: u32,
         comment: String,
+        check_completed: bool,
     ) -> Result<StatefulAction<Self>, ActionError> {
         let this = Self {
             name: name.clone(),
@@ -50,29 +51,31 @@ impl CreateUser {
             },
         }
 
-        // Ensure user does not exists
-        if let Some(user) = User::from_name(name.as_str())
-            .map_err(|e| ActionErrorKind::GettingUserId(name.clone(), e))
-            .map_err(Self::error)?
-        {
-            if user.uid.as_raw() != uid {
-                return Err(Self::error(ActionErrorKind::UserUidMismatch(
-                    name.clone(),
-                    user.uid.as_raw(),
-                    uid,
-                )));
-            }
+        if check_completed {
+            // Ensure user does not exist
+            if let Some(user) = User::from_name(name.as_str())
+                .map_err(|e| ActionErrorKind::GettingUserId(name.clone(), e))
+                .map_err(Self::error)?
+            {
+                if user.uid.as_raw() != uid {
+                    return Err(Self::error(ActionErrorKind::UserUidMismatch(
+                        name.clone(),
+                        user.uid.as_raw(),
+                        uid,
+                    )));
+                }
 
-            if user.gid.as_raw() != gid {
-                return Err(Self::error(ActionErrorKind::UserGidMismatch(
-                    name.clone(),
-                    user.gid.as_raw(),
-                    gid,
-                )));
-            }
+                if user.gid.as_raw() != gid {
+                    return Err(Self::error(ActionErrorKind::UserGidMismatch(
+                        name.clone(),
+                        user.gid.as_raw(),
+                        gid,
+                    )));
+                }
 
-            tracing::debug!("Creating user `{}` already complete", this.name);
-            return Ok(StatefulAction::completed(this));
+                tracing::debug!("Creating user `{}` already complete", this.name);
+                return Ok(StatefulAction::completed(this));
+            }
         }
 
         Ok(StatefulAction::uncompleted(this))

src/action/common/create_users_and_groups.rs

@@ -10,14 +10,14 @@ use tracing::{span, Span};
 #[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
 #[serde(tag = "action_name", rename = "create_users_and_group")]
 pub struct CreateUsersAndGroups {
-    nix_build_user_count: u32,
-    nix_build_group_name: String,
-    nix_build_group_id: u32,
-    nix_build_user_prefix: String,
-    nix_build_user_id_base: u32,
-    create_group: StatefulAction<CreateGroup>,
-    create_users: Vec<StatefulAction<CreateUser>>,
-    add_users_to_groups: Vec<StatefulAction<AddUserToGroup>>,
+    pub(crate) nix_build_group_name: String,
+    pub(crate) nix_build_group_id: u32,
+    pub(crate) nix_build_user_count: u32,
+    pub(crate) nix_build_user_prefix: String,
+    pub(crate) nix_build_user_id_base: u32,
+    pub(crate) create_group: StatefulAction<CreateGroup>,
+    pub(crate) create_users: Vec<StatefulAction<CreateUser>>,
+    pub(crate) add_users_to_groups: Vec<StatefulAction<AddUserToGroup>>,
 }
 
 impl CreateUsersAndGroups {
@@ -37,6 +37,7 @@ impl CreateUsersAndGroups {
                     settings.nix_build_group_name.clone(),
                     settings.nix_build_group_id,
                     format!("Nix build user {index}"),
+                    true,
                 )
                 .await
                 .map_err(Self::error)?,

src/action/mod.rs

@@ -304,7 +304,7 @@ impl ActionDescription {
 }
 
 /// A 'tag' name an action has that corresponds to the one we serialize in [`typetag]`
-pub struct ActionTag(&'static str);
+pub struct ActionTag(pub &'static str);
 
 impl std::fmt::Display for ActionTag {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {