get TcpFrontends::tags out of its Option<>

sozu-proxy · May 4, 2023 · b978a89 · b978a89
1 parent a1c02b6
commit b978a89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/command/src/response.rs b/command/src/response.rs
@@ -146,17 +146,16 @@ impl std::fmt::Display for PathRule {
 pub struct TcpFrontend {
     pub cluster_id: String,
     pub address: SocketAddr,
-    // TODO: remove the Option here, the map may as well be empty
     /// custom tags to identify the frontend in the access logs
-    pub tags: Option<BTreeMap<String, String>>,
+    pub tags: BTreeMap<String, String>,
 }
 
 impl Into<RequestTcpFrontend> for TcpFrontend {
     fn into(self) -> RequestTcpFrontend {
         RequestTcpFrontend {
             cluster_id: self.cluster_id,
             address: self.address.to_string(),
-            tags: self.tags.unwrap_or(BTreeMap::new()),
+            tags: self.tags.clone(),
         }
     }
 }

diff --git a/command/src/state.rs b/command/src/state.rs
@@ -421,7 +421,7 @@ impl ConfigState {
                 .address
                 .parse()
                 .with_context(|| "wrong socket address")?,
-            tags: Some(front.tags.clone()),
+            tags: front.tags.clone(),
         };
         if tcp_frontends.contains(&tcp_frontend) {
             bail!("This tcp frontend is already present: {:?}", tcp_frontend);