diff --git a/src/bin/detee-cli.rs b/src/bin/detee-cli.rs index bac0688..d5d41c2 100644 --- a/src/bin/detee-cli.rs +++ b/src/bin/detee-cli.rs @@ -1,10 +1,9 @@ use clap::{builder::PossibleValue, Arg, ArgMatches, Command}; use clap_complete::{generate, Shell}; -use detee_cli::general::cli_handler::handle_operators; +use detee_cli::general::cli_handler::{handle_operators, handle_packagers}; use detee_cli::sgx::cli_handler::handle_app; use detee_cli::snp::cli_handler::{handle_vm, handle_vm_nodes}; use detee_cli::*; -use std::error::Error; use std::io; const ABOUT: &str = r#"The DeTEE CLI allows you to manage and deploy applications and virtual machines. @@ -618,9 +617,3 @@ fn handle_account(matches: &ArgMatches) { _ => cli_print(Ok(config::Config::get_account_data())), } } - -fn handle_packagers( - _matches: &ArgMatches, -) -> Result, Box> { - Ok(crate::packagers::get_packagers()) -} diff --git a/src/general/cli_handler.rs b/src/general/cli_handler.rs index bbec7bf..79decbf 100644 --- a/src/general/cli_handler.rs +++ b/src/general/cli_handler.rs @@ -1,6 +1,8 @@ use super::operators; +use super::packagers; use crate::{cli_print, config}; use clap::ArgMatches; +use std::error::Error; pub fn handle_operators(matches: &ArgMatches) { match matches.subcommand() { @@ -34,3 +36,7 @@ pub fn handle_operators(matches: &ArgMatches) { _ => println!("To get more information about operators, use: detee-cli operator --help"), } } + +pub fn handle_packagers(_matches: &ArgMatches) -> Result, Box> { + Ok(packagers::get_packagers()) +} diff --git a/src/general/mod.rs b/src/general/mod.rs index acc8bc5..94d2e08 100644 --- a/src/general/mod.rs +++ b/src/general/mod.rs @@ -1,3 +1,4 @@ pub mod cli_handler; pub mod operators; +pub mod packagers; // pub mod grpc; diff --git a/src/packagers.rs b/src/general/packagers.rs similarity index 100% rename from src/packagers.rs rename to src/general/packagers.rs diff --git a/src/lib.rs b/src/lib.rs index 002890f..8fb6570 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,6 @@ pub mod config; pub mod constants; pub mod general; pub mod name_generator; -pub mod packagers; pub mod sgx; pub mod snp; pub mod utils;