create Request::QueryAllCertificates

remove QueryCertificateType::All
sozu-proxy · Mar 22, 2023 · f514bce · f514bce
1 parent a7e16f8
commit f514bce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/bin/src/ctl/command.rs b/bin/src/ctl/command.rs
@@ -387,22 +387,20 @@ impl CommandManager {
         fingerprint: Option<String>,
         domain: Option<String>,
     ) -> Result<(), anyhow::Error> {
-        let query = match (fingerprint, domain) {
-            (None, None) => QueryCertificateType::All,
+        let request = match (fingerprint, domain) {
+            (None, None) => Request::QueryAllCertificates,
             (Some(f), None) => match hex::decode(f) {
                 Err(e) => {
                     bail!("invalid fingerprint: {:?}", e);
                 }
-                Ok(f) => QueryCertificateType::Fingerprint(f),
+                Ok(f) => Request::QueryCertificates(QueryCertificateType::Fingerprint(f)),
             },
-            (None, Some(d)) => QueryCertificateType::Domain(d),
+            (None, Some(d)) => Request::QueryCertificates(QueryCertificateType::Domain(d)),
             (Some(_), Some(_)) => {
                 bail!("Error: Either request a fingerprint or a domain name");
             }
         };
 
-        let request = Request::QueryCertificates(query);
-
         self.send_request(request)?;
 
         loop {

diff --git a/command/src/request.rs b/command/src/request.rs
@@ -79,6 +79,7 @@ pub enum Request {
     ActivateListener(ActivateListener),
     DeactivateListener(DeactivateListener),
 
+    QueryAllCertificates,
     QueryCertificates(QueryCertificateType),
     QueryClusters(QueryClusterType),
     QueryClustersHashes,
@@ -110,6 +111,7 @@ impl Request {
             Request::AddHttpsFrontend(_)
             | Request::RemoveHttpsFrontend(_)
             | Request::AddCertificate(_)
+            | Request::QueryAllCertificates
             | Request::ReplaceCertificate(_)
             | Request::RemoveCertificate(_)
             | Request::QueryCertificates(_) => proxy_destination.to_https_proxy = true,
@@ -384,7 +386,6 @@ pub struct QueryClusterDomain {
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(tag = "type", content = "data", rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum QueryCertificateType {
-    All,
     Domain(String),
     Fingerprint(Vec<u8>),
 }

diff --git a/lib/src/https.rs b/lib/src/https.rs
@@ -1343,7 +1343,7 @@ impl ProxyConfiguration for HttpsProxy {
                 self.logging(logging_filter.clone())
                     .with_context(|| format!("Could not set logging level to {logging_filter}"))
             }
-            Request::QueryCertificates(QueryCertificateType::All) => {
+            Request::QueryAllCertificates => {
                 info!("{} query all certificates", request_id);
                 self.query_all_certificates()
                     .with_context(|| "Could not query all certificates")

diff --git a/lib/src/server.rs b/lib/src/server.rs
@@ -912,7 +912,6 @@ impl Server {
                     // forward the query to the TLS implementation
                     QueryCertificateType::Domain(_) => {}
                     // forward the query to the TLS implementation
-                    QueryCertificateType::All => {}
                     QueryCertificateType::Fingerprint(f) => {
                         push_queue(WorkerResponse::ok_with_content(
                             message.id.clone(),