transform CLI command "query clusters" to "cluster get"

sozu-proxy · May 22, 2023 · cf5964b · cf5964b
1 parent acdc8c9
commit cf5964b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/bin/src/cli.rs b/bin/src/cli.rs
@@ -162,6 +162,13 @@ pub enum SubCmd {
     },
     #[clap(name = "cluster", about = "cluster management")]
     Cluster {
+        #[clap(
+            short = 'j',
+            long = "json",
+            help = "Print the command result in JSON format",
+            global = true
+        )]
+        json: bool,
         #[clap(subcommand)]
         cmd: ClusterCmd,
     },
@@ -192,18 +199,6 @@ pub enum SubCmd {
         #[clap(subcommand)]
         cmd: CertificateCmd,
     },
-    #[clap(name = "query", about = "configuration state verification")]
-    Query {
-        #[clap(
-            short = 'j',
-            long = "json",
-            help = "Print the command result in JSON format",
-            global = true
-        )]
-        json: bool,
-        #[clap(subcommand)]
-        cmd: QueryCmd,
-    },
     #[clap(name = "config", about = "configuration file management")]
     Config {
         #[clap(subcommand)]
@@ -290,6 +285,16 @@ pub enum StateCmd {
 
 #[derive(Subcommand, PartialEq, Eq, Clone, Debug)]
 pub enum ClusterCmd {
+    #[clap(
+        name = "get",
+        about = "Query clusters, all of them, or filtered by id or domain"
+    )]
+    Get {
+        #[clap(short = 'i', long = "id", help = "cluster identifier")]
+        id: Option<String>,
+        #[clap(short = 'd', long = "domain", help = "cluster domain name")]
+        domain: Option<String>,
+    },
     #[clap(name = "remove", about = "Remove a cluster")]
     Remove {
         #[clap(short = 'i', long = "id", help = "cluster id")]
@@ -757,7 +762,11 @@ pub enum CertificateCmd {
     Get {
         #[clap(short = 'f', long = "fingerprint", help = "certificate fingerprint")]
         fingerprint: Option<String>,
-        #[clap(short = 'd', long = "domain", help = "domain name of the queried certificates")]
+        #[clap(
+            short = 'd',
+            long = "domain",
+            help = "domain name of the queried certificates"
+        )]
         domain: Option<String>,
     },
     #[clap(name = "add", about = "Add a certificate")]
@@ -826,17 +835,6 @@ pub enum CertificateCmd {
     },
 }
 
-#[derive(Subcommand, PartialEq, Eq, Clone, Debug)]
-pub enum QueryCmd {
-    #[clap(name = "clusters", about = "Query clusters matching a specific filter")]
-    Clusters {
-        #[clap(short = 'i', long = "id", help = "cluster identifier")]
-        id: Option<String>,
-        #[clap(short = 'd', long = "domain", help = "cluster domain name")]
-        domain: Option<String>,
-    },
-}
-
 #[derive(Subcommand, PartialEq, Eq, Clone, Debug)]
 pub enum ConfigCmd {
     #[clap(name = "check", about = "check configuration file syntax and exit")]

diff --git a/bin/src/ctl/mod.rs b/bin/src/ctl/mod.rs
@@ -84,7 +84,7 @@ impl CommandManager {
                 StateCmd::Load { file } => self.load_state(file),
             },
             SubCmd::Reload { file, json } => self.reload_configuration(file, json),
-            SubCmd::Cluster { cmd } => self.cluster_command(cmd),
+            SubCmd::Cluster { cmd, json } => self.cluster_command(cmd, json),
             SubCmd::Backend { cmd } => self.backend_command(cmd),
             SubCmd::Frontend { cmd } => match cmd {
                 FrontendCmd::Http { cmd } => self.http_frontend_command(cmd),
@@ -148,9 +148,6 @@ impl CommandManager {
                     tls_versions,
                 ),
             },
-            SubCmd::Query { cmd, json } => match cmd {
-                QueryCmd::Clusters { id, domain } => self.query_cluster(json, id, domain),
-            },
             SubCmd::Config { cmd: _ } => Ok(()), // noop, handled at the beginning of the method
             SubCmd::Events => self.events(),
             rest => {

diff --git a/bin/src/ctl/request_builder.rs b/bin/src/ctl/request_builder.rs
@@ -169,7 +169,7 @@ impl CommandManager {
         }
     }
 
-    pub fn cluster_command(&mut self, cmd: ClusterCmd) -> anyhow::Result<()> {
+    pub fn cluster_command(&mut self, cmd: ClusterCmd, json: bool) -> anyhow::Result<()> {
         match cmd {
             ClusterCmd::Add {
                 id,
@@ -199,6 +199,7 @@ impl CommandManager {
             ClusterCmd::Remove { id } => self.order_request(Request {
                 request_type: Some(RequestType::RemoveCluster(id)),
             }),
+            ClusterCmd::Get { id, domain } => self.query_cluster(json, id, domain),
         }
     }