remove type CertificateWithNames

sozu-proxy · May 22, 2023 · 308f22f · 308f22f
1 parent 4776d5f
commit 308f22f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/command/src/command.proto b/command/src/command.proto
@@ -315,15 +315,6 @@ message CertificatesByAddress {
     repeated CertificateSummary certificate_summaries = 2;
 }
 
-// TODO: get rid of this type, use CertificateAndKey instead
-// A certificate matching a request by fingerprint,
-// and the list of domain names associated
-message CertificateWithNames {
-    required string certificate = 1;
-    // domain names associated to the fingerprint
-    repeated string names = 2;
-}
-
 // to reply to several certificate queries
 message CertificatesWithFingerprints {
     // a map of fingerprint -> certificate_and_key

diff --git a/command/src/proto/display.rs b/command/src/proto/display.rs
@@ -2,18 +2,7 @@ use std::fmt::{Display, Formatter};
 
 use crate::proto::command::TlsVersion;
 
-use super::command::{CertificateAndKey, CertificateWithNames};
-
-impl Display for CertificateWithNames {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "\thostnames: {}\n\tcertificate: {}",
-            concatenate_vector(&self.names),
-            self.certificate
-        )
-    }
-}
+use super::command::CertificateAndKey;
 
 impl Display for CertificateAndKey {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {

diff --git a/lib/src/server.rs b/lib/src/server.rs
@@ -17,11 +17,11 @@ use sozu_command::{
     channel::Channel,
     config::Config,
     proto::command::{
-        request::RequestType, response_content::ContentType, ActivateListener, AddBackend, Cluster,
-        ClusterHashes, ClusterInformations, DeactivateListener, Event, HttpListenerConfig,
-        HttpsListenerConfig, ListenerType, LoadBalancingAlgorithms, LoadMetric,
-        MetricsConfiguration, RemoveBackend, ResponseStatus,
-        TcpListenerConfig as CommandTcpListener, CertificatesWithFingerprints,
+        request::RequestType, response_content::ContentType, ActivateListener, AddBackend,
+        CertificatesWithFingerprints, Cluster, ClusterHashes, ClusterInformations,
+        DeactivateListener, Event, HttpListenerConfig, HttpsListenerConfig, ListenerType,
+        LoadBalancingAlgorithms, LoadMetric, MetricsConfiguration, RemoveBackend, ResponseStatus,
+        TcpListenerConfig as CommandTcpListener,
     },
     ready::Ready,
     request::WorkerRequest,