write ActivateListener in protobuf

sozu-proxy · Apr 5, 2023 · c2df4b0 · c2df4b0
1 parent 7254b98
commit c2df4b0
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 64 deletions.
diff --git a/bin/src/ctl/request_builder.rs b/bin/src/ctl/request_builder.rs
@@ -6,12 +6,12 @@ use sozu_command_lib::{
     certificate::{calculate_fingerprint, split_certificate_chain, Fingerprint},
     config::{Config, ListenerBuilder},
     proto::command::{
-        AddBackend, AddCertificate, CertificateAndKey, Cluster, FrontendFilters, ListenerType,
-        LoadBalancingParams, MetricsConfiguration, PathRule, ProxyProtocolConfig, RemoveBackend,
-        RemoveCertificate, RemoveListener, ReplaceCertificate, RequestHttpFrontend,
+        ActivateListener, AddBackend, AddCertificate, CertificateAndKey, Cluster, FrontendFilters,
+        ListenerType, LoadBalancingParams, MetricsConfiguration, PathRule, ProxyProtocolConfig,
+        RemoveBackend, RemoveCertificate, RemoveListener, ReplaceCertificate, RequestHttpFrontend,
         RequestTcpFrontend, RulePosition, TlsVersion,
     },
-    request::{ActivateListener, DeactivateListener, Request},
+    request::{DeactivateListener, Request},
 };
 
 use crate::{
@@ -406,11 +406,11 @@ impl CommandManager {
     pub fn activate_listener(
         &mut self,
         address: String,
-        proxy: ListenerType,
+        listener_type: ListenerType,
     ) -> anyhow::Result<()> {
         self.order_request(Request::ActivateListener(ActivateListener {
             address: address.parse().with_context(|| "wrong socket address")?,
-            proxy,
+            proxy: listener_type.into(),
             from_scm: false,
         }))
     }

diff --git a/command/src/command.proto b/command/src/command.proto
@@ -65,6 +65,12 @@ message TcpListenerConfig {
     required bool active = 7 [default = false];
 }
 
+message ActivateListener {
+    required string address = 1;
+    required ListenerType proxy = 2;
+    required bool from_scm = 3;
+}
+
 message RemoveListener {
     required string address = 1;
     required ListenerType proxy = 2;

diff --git a/command/src/config.rs b/command/src/config.rs
@@ -15,12 +15,12 @@ use toml;
 use crate::{
     certificate::split_certificate_chain,
     proto::command::{
-        AddBackend, AddCertificate, CertificateAndKey, Cluster, HttpListenerConfig,
-        HttpsListenerConfig, ListenerType, LoadBalancingAlgorithms, LoadBalancingParams,
-        LoadMetric, PathRule, ProxyProtocolConfig, RequestHttpFrontend, RequestTcpFrontend,
-        RulePosition, TcpListenerConfig, TlsVersion,
+        ActivateListener, AddBackend, AddCertificate, CertificateAndKey, Cluster,
+        HttpListenerConfig, HttpsListenerConfig, ListenerType, LoadBalancingAlgorithms,
+        LoadBalancingParams, LoadMetric, PathRule, ProxyProtocolConfig, RequestHttpFrontend,
+        RequestTcpFrontend, RulePosition, TcpListenerConfig, TlsVersion,
     },
-    request::{ActivateListener, Request, WorkerRequest},
+    request::{Request, WorkerRequest},
 };
 
 /// [`DEFAULT_RUSTLS_CIPHER_LIST`] provides all supported cipher suites exported by Rustls TLS
@@ -1360,7 +1360,7 @@ impl Config {
                     id: format!("CONFIG-{count}"),
                     content: Request::ActivateListener(ActivateListener {
                         address: listener.address.clone(),
-                        proxy: ListenerType::Http,
+                        proxy: ListenerType::Http.into(),
                         from_scm: false,
                     }),
                 });
@@ -1372,7 +1372,7 @@ impl Config {
                     id: format!("CONFIG-{count}"),
                     content: Request::ActivateListener(ActivateListener {
                         address: listener.address.clone(),
-                        proxy: ListenerType::Https,
+                        proxy: ListenerType::Https.into(),
                         from_scm: false,
                     }),
                 });
@@ -1384,7 +1384,7 @@ impl Config {
                     id: format!("CONFIG-{count}"),
                     content: Request::ActivateListener(ActivateListener {
                         address: listener.address.clone(),
-                        proxy: ListenerType::Tcp,
+                        proxy: ListenerType::Tcp.into(),
                         from_scm: false,
                     }),
                 });

diff --git a/command/src/request.rs b/command/src/request.rs
@@ -10,7 +10,7 @@ use anyhow::Context;
 use crate::{
     certificate::Fingerprint,
     proto::command::{
-        AddBackend, AddCertificate, Cluster, FrontendFilters, HttpListenerConfig,
+        ActivateListener, AddBackend, AddCertificate, Cluster, FrontendFilters, HttpListenerConfig,
         HttpsListenerConfig, ListenerType, LoadBalancingAlgorithms, MetricsConfiguration,
         PathRuleKind, QueryClusterByDomain, QueryMetricsOptions, RemoveBackend, RemoveCertificate,
         RemoveListener, ReplaceCertificate, RequestHttpFrontend, RequestTcpFrontend, RulePosition,
@@ -212,13 +212,6 @@ pub fn default_sticky_name() -> String {
     String::from("SOZUBALANCEID")
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct ActivateListener {
-    pub address: String,
-    pub proxy: ListenerType,
-    pub from_scm: bool,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct DeactivateListener {
     pub address: String,

diff --git a/command/src/state.rs b/command/src/state.rs
@@ -13,12 +13,12 @@ use anyhow::{bail, Context};
 use crate::{
     certificate::{calculate_fingerprint, Fingerprint},
     proto::command::{
-        AddBackend, AddCertificate, CertificateAndKey, Cluster, HttpListenerConfig,
-        HttpsListenerConfig, ListenerType, PathRule, RemoveBackend, RemoveCertificate,
-        RemoveListener, ReplaceCertificate, RequestHttpFrontend, RequestTcpFrontend,
-        TcpListenerConfig,
+        ActivateListener, AddBackend, AddCertificate, CertificateAndKey, Cluster,
+        HttpListenerConfig, HttpsListenerConfig, ListenerType, PathRule, RemoveBackend,
+        RemoveCertificate, RemoveListener, ReplaceCertificate, RequestHttpFrontend,
+        RequestTcpFrontend, TcpListenerConfig,
     },
-    request::{ActivateListener, DeactivateListener, Request},
+    request::{DeactivateListener, Request},
     response::{Backend, ClusterInformation, HttpFrontend, TcpFrontend},
 };
 
@@ -213,8 +213,8 @@ impl ConfigState {
     }
 
     fn activate_listener(&mut self, activate: &ActivateListener) -> anyhow::Result<()> {
-        match activate.proxy {
-            ListenerType::Http => {
+        match ListenerType::from_i32(activate.proxy) {
+            Some(ListenerType::Http) => {
                 if self
                     .http_listeners
                     .get_mut(&activate.address)
@@ -224,7 +224,7 @@ impl ConfigState {
                     bail!("No http listener found with address {}", activate.address)
                 }
             }
-            ListenerType::Https => {
+            Some(ListenerType::Https) => {
                 if self
                     .https_listeners
                     .get_mut(&activate.address)
@@ -234,7 +234,7 @@ impl ConfigState {
                     bail!("No https listener found with address {}", activate.address)
                 }
             }
-            ListenerType::Tcp => {
+            Some(ListenerType::Tcp) => {
                 if self
                     .tcp_listeners
                     .get_mut(&activate.address)
@@ -244,6 +244,7 @@ impl ConfigState {
                     bail!("No tcp listener found with address {}", activate.address)
                 }
             }
+            None => bail!("Wrong variant for ListenerType on request"),
         }
         Ok(())
     }
@@ -520,7 +521,7 @@ impl ConfigState {
             if listener.active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: listener.address.clone(),
-                    proxy: ListenerType::Http,
+                    proxy: ListenerType::Http.into(),
                     from_scm: false,
                 }));
             }
@@ -531,7 +532,7 @@ impl ConfigState {
             if listener.active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: listener.address.clone(),
-                    proxy: ListenerType::Https,
+                    proxy: ListenerType::Https.into(),
                     from_scm: false,
                 }));
             }
@@ -542,7 +543,7 @@ impl ConfigState {
             if listener.active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: listener.address.clone(),
-                    proxy: ListenerType::Tcp,
+                    proxy: ListenerType::Tcp.into(),
                     from_scm: false,
                 }));
             }
@@ -595,7 +596,7 @@ impl ConfigState {
         {
             v.push(Request::ActivateListener(ActivateListener {
                 address: front.to_string(),
-                proxy: ListenerType::Http,
+                proxy: ListenerType::Http.into(),
                 from_scm: false,
             }));
         }
@@ -608,7 +609,7 @@ impl ConfigState {
         {
             v.push(Request::ActivateListener(ActivateListener {
                 address: front.to_string(),
-                proxy: ListenerType::Https,
+                proxy: ListenerType::Https.into(),
                 from_scm: false,
             }));
         }
@@ -620,7 +621,7 @@ impl ConfigState {
         {
             v.push(Request::ActivateListener(ActivateListener {
                 address: front.to_string(),
-                proxy: ListenerType::Tcp,
+                proxy: ListenerType::Tcp.into(),
                 from_scm: false,
             }));
         }
@@ -670,7 +671,7 @@ impl ConfigState {
             if other.tcp_listeners[*address].active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: address.to_string(),
-                    proxy: ListenerType::Tcp,
+                    proxy: ListenerType::Tcp.into(),
                     from_scm: false,
                 }));
             }
@@ -699,7 +700,7 @@ impl ConfigState {
             if other.http_listeners[*address].active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: address.to_string(),
-                    proxy: ListenerType::Http,
+                    proxy: ListenerType::Http.into(),
                     from_scm: false,
                 }));
             }
@@ -728,7 +729,7 @@ impl ConfigState {
             if other.https_listeners[*address].active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: address.to_string(),
-                    proxy: ListenerType::Https,
+                    proxy: ListenerType::Https.into(),
                     from_scm: false,
                 }));
             }
@@ -760,7 +761,7 @@ impl ConfigState {
             if !my_listener.active && their_listener.active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: addr.to_string(),
-                    proxy: ListenerType::Tcp,
+                    proxy: ListenerType::Tcp.into(),
                     from_scm: false,
                 }));
             }
@@ -792,7 +793,7 @@ impl ConfigState {
             if !my_listener.active && their_listener.active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: addr.to_string(),
-                    proxy: ListenerType::Http,
+                    proxy: ListenerType::Http.into(),
                     from_scm: false,
                 }));
             }
@@ -824,7 +825,7 @@ impl ConfigState {
             if !my_listener.active && their_listener.active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: addr.to_string(),
-                    proxy: ListenerType::Https,
+                    proxy: ListenerType::Https.into(),
                     from_scm: false,
                 }));
             }
@@ -1001,7 +1002,7 @@ impl ConfigState {
             if listener.active {
                 v.push(Request::ActivateListener(ActivateListener {
                     address: listener.address.clone(),
-                    proxy: ListenerType::Tcp,
+                    proxy: ListenerType::Tcp.into(),
                     from_scm: false,
                 }));
             }
@@ -1606,7 +1607,7 @@ mod tests {
         state
             .dispatch(&Request::ActivateListener(ActivateListener {
                 address: "0.0.0.0:1234".parse().unwrap(),
-                proxy: ListenerType::Tcp,
+                proxy: ListenerType::Tcp.into(),
                 from_scm: false,
             }))
             .expect("Could not execute request");
@@ -1628,7 +1629,7 @@ mod tests {
         state
             .dispatch(&Request::ActivateListener(ActivateListener {
                 address: "0.0.0.0:8443".parse().unwrap(),
-                proxy: ListenerType::Https,
+                proxy: ListenerType::Https.into(),
                 from_scm: false,
             }))
             .expect("Could not execute request");
@@ -1653,7 +1654,7 @@ mod tests {
         state2
             .dispatch(&Request::ActivateListener(ActivateListener {
                 address: "0.0.0.0:8080".parse().unwrap(),
-                proxy: ListenerType::Http,
+                proxy: ListenerType::Http.into(),
                 from_scm: false,
             }))
             .expect("Could not execute request");
@@ -1667,7 +1668,7 @@ mod tests {
         state2
             .dispatch(&Request::ActivateListener(ActivateListener {
                 address: "0.0.0.0:8443".parse().unwrap(),
-                proxy: ListenerType::Https,
+                proxy: ListenerType::Https.into(),
                 from_scm: false,
             }))
             .expect("Could not execute request");
@@ -1700,7 +1701,7 @@ mod tests {
             }),
             Request::ActivateListener(ActivateListener {
                 address: "0.0.0.0:8080".parse().unwrap(),
-                proxy: ListenerType::Http,
+                proxy: ListenerType::Http.into(),
                 from_scm: false,
             }),
             Request::RemoveListener(RemoveListener {

diff --git a/e2e/src/tests/mod.rs b/e2e/src/tests/mod.rs
@@ -4,8 +4,8 @@ use std::{io::stdin, net::SocketAddr};
 
 use sozu_command_lib::{
     config::{Config, ListenerBuilder},
-    proto::command::ListenerType,
-    request::{ActivateListener, Request},
+    proto::command::{ActivateListener, ListenerType},
+    request::Request,
     scm_socket::Listeners,
     state::ConfigState,
 };
@@ -48,7 +48,7 @@ pub fn setup_test<S: Into<String>>(
     ));
     worker.send_proxy_request(Request::ActivateListener(ActivateListener {
         address: front_address.to_string(),
-        proxy: ListenerType::Http,
+        proxy: ListenerType::Http.into(),
         from_scm: false,
     }));
     worker.send_proxy_request(Request::AddCluster(Worker::default_cluster("cluster_0")));

diff --git a/e2e/src/tests/tests.rs b/e2e/src/tests/tests.rs
@@ -12,9 +12,10 @@ use sozu_command_lib::{
     info,
     logging::{Logger, LoggerBackend},
     proto::command::{
-        AddCertificate, CertificateAndKey, ListenerType, RemoveBackend, RequestHttpFrontend,
+        ActivateListener, AddCertificate, CertificateAndKey, ListenerType, RemoveBackend,
+        RequestHttpFrontend,
     },
-    request::{ActivateListener, Request},
+    request::Request,
     state::ConfigState,
 };
 
@@ -289,7 +290,7 @@ pub fn try_issue_810_panic(part2: bool) -> State {
     ));
     worker.send_proxy_request(Request::ActivateListener(ActivateListener {
         address: front_address.to_string(),
-        proxy: ListenerType::Tcp,
+        proxy: ListenerType::Tcp.into(),
         from_scm: false,
     }));
     worker.send_proxy_request(Request::AddCluster(Worker::default_cluster("cluster_0")));
@@ -355,7 +356,7 @@ pub fn try_tls_endpoint() -> State {
 
     worker.send_proxy_request(Request::ActivateListener(ActivateListener {
         address: front_address.to_string(),
-        proxy: ListenerType::Https,
+        proxy: ListenerType::Https.into(),
         from_scm: false,
     }));
 
@@ -634,7 +635,7 @@ fn try_http_behaviors() -> State {
     ));
     worker.send_proxy_request(Request::ActivateListener(ActivateListener {
         address: front_address.to_string(),
-        proxy: ListenerType::Http,
+        proxy: ListenerType::Http.into(),
         from_scm: false,
     }));
     worker.read_to_last();