move QueryAnswerCertificate::Fingerprint to ResponseContent::Certific…

…ateByFingerprint
sozu-proxy · Mar 22, 2023 · 72259e7 · 72259e7
1 parent 30ae223
commit 72259e7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/bin/src/ctl/command.rs b/bin/src/ctl/command.rs
@@ -99,6 +99,7 @@ impl CommandManager {
                             | ResponseContent::Clusters(_)
                             | ResponseContent::Certificates(_)
                             | ResponseContent::CertificatesByDomain(_)
+                            | ResponseContent::CertificateByFingerprint(_)
                             | ResponseContent::AllCertificates(_)
                             | ResponseContent::AvailableMetrics(_)
                             | ResponseContent::Event(_) => {}

diff --git a/bin/src/ctl/display.rs b/bin/src/ctl/display.rs
@@ -643,7 +643,7 @@ pub fn print_certificates(
                     println!();
                 }
             }
-            ResponseContent::Certificates(QueryAnswerCertificate::Fingerprint(opt)) => {
+            ResponseContent::CertificateByFingerprint(opt) => {
                 if let Some((s, v)) = opt {
                     println!("\tfrontends: {v:?}\ncertificate:\n{s}");
                 } else {

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -87,6 +87,10 @@ pub enum ResponseContent {
 
     /// returns certificates matching a certificate request by domain
     CertificatesByDomain(HashMap<SocketAddr, Option<(String, Vec<u8>)>>),
+
+    /// returns the certificate matching a request by fingerprint,
+    /// and the list of domain names associated
+    CertificateByFingerprint(Option<(String, Vec<String>)>),
 }
 
 #[derive(Default, Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -103,9 +107,9 @@ pub enum QueryAnswerCertificate {
     /*
     /// returns a fingerprint
     Domain(HashMap<SocketAddr, Option<(String, Vec<u8>)>>),
-    */
     /// returns the certificate
     Fingerprint(Option<(String, Vec<String>)>),
+    */
 }
 
 /// lists of available metrics in a worker, or in the main process (in which case there are no cluster metrics)

diff --git a/lib/src/server.rs b/lib/src/server.rs
@@ -916,8 +916,9 @@ impl Server {
                     QueryCertificateType::Fingerprint(f) => {
                         push_queue(WorkerResponse::ok_with_content(
                             message.id.clone(),
-                            ResponseContent::Certificates(QueryAnswerCertificate::Fingerprint(
-                                get_certificate(&self.config_state, f),
+                            ResponseContent::CertificateByFingerprint(get_certificate(
+                                &self.config_state,
+                                f,
                             )),
                         ));
                         return;