From de8f761e1fc8cc30b1382dddde5f681476eaa6d5 Mon Sep 17 00:00:00 2001 From: Noor Date: Thu, 20 Mar 2025 21:45:46 +0530 Subject: [PATCH] refactor: handle_vm_nodes function to snp cli handler --- src/bin/detee-cli.rs | 22 +--------------------- src/snp/cli_handler.rs | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/bin/detee-cli.rs b/src/bin/detee-cli.rs index 517bd54..8cb1d98 100644 --- a/src/bin/detee-cli.rs +++ b/src/bin/detee-cli.rs @@ -1,7 +1,7 @@ use clap::{builder::PossibleValue, Arg, ArgMatches, Command}; use clap_complete::{generate, Shell}; use detee_cli::sgx::cli_handler::handle_app; -use detee_cli::snp::cli_handler::handle_vm; +use detee_cli::snp::cli_handler::{handle_vm, handle_vm_nodes}; use detee_cli::*; use std::error::Error; use std::io; @@ -599,26 +599,6 @@ fn handle_completion(matches: &ArgMatches, cmd: Command) { } } -fn handle_vm_nodes(matches: &ArgMatches) { - match matches.subcommand() { - Some(("search", _)) => cli_print(snp::print_nodes().map_err(Into::into)), - Some(("inspect", path_subcommand)) => { - let ip: String = path_subcommand.get_one::("ip").unwrap().clone(); - cli_print(snp::inspect_node(ip).map_err(Into::into)); - } - Some(("report", path_subcommand)) => { - let node_pubkey: String = path_subcommand.get_one::("pubkey").unwrap().clone(); - let contract_uuid: String = - path_subcommand.get_one::("contract").unwrap().clone(); - let reason: String = path_subcommand.get_one::("reason").unwrap().clone(); - cli_print(snp::report_node(node_pubkey, contract_uuid, reason).map_err(Into::into)) - } - _ => { - println!("Available commands are search and report. Use --help for more information.") - } - } -} - fn handle_account(matches: &ArgMatches) { match matches.subcommand() { Some(("show", _)) => cli_print(Ok(config::Config::get_account_data())), diff --git a/src/snp/cli_handler.rs b/src/snp/cli_handler.rs index 4602228..66b2cf7 100644 --- a/src/snp/cli_handler.rs +++ b/src/snp/cli_handler.rs @@ -24,6 +24,27 @@ pub fn handle_vm(matches: &ArgMatches) { _ => println!("No valid VM subcommand provided."), } } + +pub fn handle_vm_nodes(matches: &ArgMatches) { + match matches.subcommand() { + Some(("search", _)) => cli_print(snp::print_nodes().map_err(Into::into)), + Some(("inspect", path_subcommand)) => { + let ip: String = path_subcommand.get_one::("ip").unwrap().clone(); + cli_print(snp::inspect_node(ip).map_err(Into::into)); + } + Some(("report", path_subcommand)) => { + let node_pubkey: String = path_subcommand.get_one::("pubkey").unwrap().clone(); + let contract_uuid: String = + path_subcommand.get_one::("contract").unwrap().clone(); + let reason: String = path_subcommand.get_one::("reason").unwrap().clone(); + cli_print(snp::report_node(node_pubkey, contract_uuid, reason).map_err(Into::into)) + } + _ => { + println!("Available commands are search and report. Use --help for more information.") + } + } +} + fn handle_vm_deploy(matches: &ArgMatches) -> Result> { if let Some(path) = matches.get_one::("yaml-path") { return Ok(snp::deploy::Request::load_from_yaml(path)?);