fix: command 'migrate nodes' validate HSM groups

refactor: housekeeping with module files
eth-cscs · Sep 29, 2024 · 24e955f · 24e955f
1 parent df00812
commit 24e955f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 0 deletions.
diff --git a/src/cli/commands/apply_hw_cluster_pin.rs → src/cli/commands/apply_hw_cluster_pin/mod.rs b/src/cli/commands/apply_hw_cluster_pin.rs → src/cli/commands/apply_hw_cluster_pin/mod.rs
diff --git a/src/cli/commands/apply_hw_cluster_unpin.rs → ...li/commands/apply_hw_cluster_unpin/mod.rs b/src/cli/commands/apply_hw_cluster_unpin.rs → ...li/commands/apply_hw_cluster_unpin/mod.rs
diff --git a/src/cli/commands/apply_sat_file.rs → src/cli/commands/apply_sat_file/mod.rs b/src/cli/commands/apply_sat_file.rs → src/cli/commands/apply_sat_file/mod.rs
diff --git a/src/cli/commands/delete_sessions.rs → src/cli/commands/delete_sessions/mod.rs b/src/cli/commands/delete_sessions.rs → src/cli/commands/delete_sessions/mod.rs
diff --git a/src/cli/commands.rs → src/cli/commands/mod.rs b/src/cli/commands.rs → src/cli/commands/mod.rs
diff --git a/src/cli.rs → src/cli/mod.rs b/src/cli.rs → src/cli/mod.rs
diff --git a/src/cli/process.rs b/src/cli/process.rs
@@ -1872,6 +1872,27 @@ pub async fn process_cli(
 
                 let xnames_string: &String = cli_migrate_nodes.get_one("XNAMES").unwrap();
 
+                // Validate user has access to 'from' HSM group
+                let _ = get_target_hsm_group_vec_or_all(
+                    shasta_token,
+                    shasta_base_url,
+                    shasta_root_cert,
+                    Some(from),
+                    settings_hsm_group_name_opt,
+                )
+                .await;
+
+                // Validate user has access to 'to' HSM group
+                let _ = get_target_hsm_group_vec_or_all(
+                    shasta_token,
+                    shasta_base_url,
+                    shasta_root_cert,
+                    Some(to),
+                    settings_hsm_group_name_opt,
+                )
+                .await;
+
+                // Migrate nodes
                 add_nodes::exec(
                     shasta_token,
                     shasta_base_url,

diff --git a/src/common.rs → src/common/mod.rs b/src/common.rs → src/common/mod.rs