move QueryAnswerCertificate::All to ResponseContent::AllCertificates

sozu-proxy · Mar 22, 2023 · 3387628 · 3387628
1 parent eb9b18e
commit 3387628
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/bin/src/ctl/command.rs b/bin/src/ctl/command.rs
@@ -98,6 +98,7 @@ impl CommandManager {
                             | ResponseContent::ClustersHashes(_)
                             | ResponseContent::Clusters(_)
                             | ResponseContent::Certificates(_)
+                            | ResponseContent::AllCertificates(_)
                             | ResponseContent::AvailableMetrics(_)
                             | ResponseContent::Event(_) => {}
                             ResponseContent::State(state) => match json {

diff --git a/bin/src/ctl/display.rs b/bin/src/ctl/display.rs
@@ -1,7 +1,4 @@
-use std::{
-    collections::{BTreeMap, HashMap, HashSet},
-    process::exit,
-};
+use std::collections::{BTreeMap, HashMap, HashSet};
 
 use anyhow::{self, Context};
 use prettytable::{Row, Table};
@@ -621,20 +618,9 @@ pub fn print_certificates(
         return Ok(());
     }
 
-    //println!("received: {:?}", data);
-    let it = response_contents.iter().map(|(k, v)| match v {
-        ResponseContent::Certificates(c) => (k, c),
-        v => {
-            eprintln!("unexpected certificates query answer: {v:?}");
-            exit(1);
-        }
-    });
-
-    for (k, v) in it {
-        println!("process '{k}':");
-
-        match v {
-            QueryAnswerCertificate::All(h) => {
+    for (_worker_id, response_content) in response_contents.iter() {
+        match response_content {
+            ResponseContent::AllCertificates(h) => {
                 for (addr, h2) in h.iter() {
                     println!("\t{addr}:");
 
@@ -645,7 +631,7 @@ pub fn print_certificates(
                     println!();
                 }
             }
-            QueryAnswerCertificate::Domain(h) => {
+            ResponseContent::Certificates(QueryAnswerCertificate::Domain(h)) => {
                 for (addr, opt) in h.iter() {
                     println!("\t{addr}:");
                     if let Some((key, fingerprint)) = opt {
@@ -657,13 +643,14 @@ pub fn print_certificates(
                     println!();
                 }
             }
-            QueryAnswerCertificate::Fingerprint(opt) => {
+            ResponseContent::Certificates(QueryAnswerCertificate::Fingerprint(opt)) => {
                 if let Some((s, v)) = opt {
                     println!("\tfrontends: {v:?}\ncertificate:\n{s}");
                 } else {
                     println!("\tnot found");
                 }
             }
+            _ => {}
         }
         println!();
     }

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -81,6 +81,9 @@ pub enum ResponseContent {
     /// cluster id -> hash of cluster information
     ClustersHashes(BTreeMap<String, u64>),
     Certificates(QueryAnswerCertificate),
+
+    /// returns a list of certificates: domain -> fingerprint
+    AllCertificates(HashMap<SocketAddr, BTreeMap<String, Vec<u8>>>),
 }
 
 #[derive(Default, Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -94,8 +97,6 @@ pub struct QueryAnswerCluster {
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum QueryAnswerCertificate {
-    /// returns a list of certificates: domain -> fingerprint
-    All(HashMap<SocketAddr, BTreeMap<String, Vec<u8>>>),
     /// returns a fingerprint
     Domain(HashMap<SocketAddr, Option<(String, Vec<u8>)>>),
     /// returns the certificate

diff --git a/lib/src/https.rs b/lib/src/https.rs
@@ -960,9 +960,7 @@ impl HttpsProxy {
             certificates
         );
 
-        Ok(Some(ResponseContent::Certificates(
-            QueryAnswerCertificate::All(certificates),
-        )))
+        Ok(Some(ResponseContent::AllCertificates(certificates)))
     }
 
     pub fn query_certificate_for_domain(