move QueryAnswerCertificate::Domain to ResponseContent::CertificatesB…

…yDomain
sozu-proxy · Mar 22, 2023 · 30ae223 · 30ae223
1 parent 3387628
commit 30ae223
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 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::CertificatesByDomain(_)
                             | ResponseContent::AllCertificates(_)
                             | ResponseContent::AvailableMetrics(_)
                             | ResponseContent::Event(_) => {}

diff --git a/bin/src/ctl/display.rs b/bin/src/ctl/display.rs
@@ -631,7 +631,7 @@ pub fn print_certificates(
                     println!();
                 }
             }
-            ResponseContent::Certificates(QueryAnswerCertificate::Domain(h)) => {
+            ResponseContent::CertificatesByDomain(h) => {
                 for (addr, opt) in h.iter() {
                     println!("\t{addr}:");
                     if let Some((key, fingerprint)) = opt {

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -84,6 +84,9 @@ pub enum ResponseContent {
 
     /// returns a list of certificates: domain -> fingerprint
     AllCertificates(HashMap<SocketAddr, BTreeMap<String, Vec<u8>>>),
+
+    /// returns certificates matching a certificate request by domain
+    CertificatesByDomain(HashMap<SocketAddr, Option<(String, Vec<u8>)>>),
 }
 
 #[derive(Default, Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -97,8 +100,10 @@ pub struct QueryAnswerCluster {
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum QueryAnswerCertificate {
+    /*
     /// returns a fingerprint
     Domain(HashMap<SocketAddr, Option<(String, Vec<u8>)>>),
+    */
     /// returns the certificate
     Fingerprint(Option<(String, Vec<String>)>),
 }

diff --git a/lib/src/https.rs b/lib/src/https.rs
@@ -54,10 +54,7 @@ use crate::{
             AddCertificate, Cluster, QueryCertificateType, RemoveCertificate, RemoveListener,
             ReplaceCertificate, Request, WorkerRequest,
         },
-        response::{
-            HttpFrontend, HttpsListenerConfig, QueryAnswerCertificate, ResponseContent, Route,
-            WorkerResponse,
-        },
+        response::{HttpFrontend, HttpsListenerConfig, ResponseContent, Route, WorkerResponse},
         scm_socket::ScmSocket,
         state::ClusterId,
     },
@@ -987,9 +984,7 @@ impl HttpsProxy {
             domain, certificates
         );
 
-        Ok(Some(ResponseContent::Certificates(
-            QueryAnswerCertificate::Domain(certificates),
-        )))
+        Ok(Some(ResponseContent::CertificatesByDomain(certificates)))
     }
 
     pub fn activate_listener(