make the method configurable through the cli

sozu-proxy · Jul 13, 2022 · af38431 · af38431
1 parent f96d1ac
commit af38431
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/bin/src/cli.rs b/bin/src/cli.rs
@@ -244,6 +244,8 @@ pub enum HttpFrontendCmd {
     hostname: String,
     #[structopt(short = "p", long = "path", help="URL prefix of the frontend")]
     path_begin: Option<String>,
+    #[structopt(short = "m", long = "method", help="HTTP method")]
+    method: Option<String>,
   },
   #[structopt(name = "remove")]
   Remove {
@@ -255,6 +257,8 @@ pub enum HttpFrontendCmd {
     hostname: String,
     #[structopt(short = "p", long = "path", help="URL prefix of the frontend")]
     path_begin: Option<String>,
+    #[structopt(short = "m", long = "method", help="HTTP method")]
+    method: Option<String>,
   },
 }
 

diff --git a/bin/src/ctl/command.rs b/bin/src/ctl/command.rs
@@ -1008,15 +1008,15 @@ pub fn remove_application(channel: Channel<CommandRequest,CommandResponse>, time
 }
 
 pub fn add_http_frontend(channel: Channel<CommandRequest,CommandResponse>,
-  timeout: u64, route: Route, address: SocketAddr, hostname: &str, path: &str,
-  https: bool)
-  -> Result<(), anyhow::Error> {
+  timeout: u64, route: Route, address: SocketAddr, hostname: &str, path: &str, method: Option<&str>,
+  https: bool) -> Result<(), anyhow::Error> {
   if https {
     order_command(channel, timeout, ProxyRequestData::AddHttpsFrontend(HttpFrontend {
       route,
       address,
       hostname: String::from(hostname),
       path: PathRule::Prefix(String::from(path)),
+      method: method.map(String::from),
       position: RulePosition::Tree,
     }))
   } else {
@@ -1025,21 +1025,22 @@ pub fn add_http_frontend(channel: Channel<CommandRequest,CommandResponse>,
       address,
       hostname: String::from(hostname),
       path: PathRule::Prefix(String::from(path)),
+      method: method.map(String::from),
       position: RulePosition::Tree,
     }))
   }
 }
 
 pub fn remove_http_frontend(channel: Channel<CommandRequest,CommandResponse>,
   timeout: u64, route: Route, address: SocketAddr, hostname: &str, path: &str,
-  https: bool)
-  -> Result<(), anyhow::Error> {
+  method: Option<&str>, https: bool) -> Result<(), anyhow::Error> {
   if https {
     order_command(channel, timeout, ProxyRequestData::RemoveHttpsFrontend(HttpFrontend {
       route,
       address,
       hostname: String::from(hostname),
       path: PathRule::Prefix(String::from(path)),
+      method: method.map(String::from),
       position: RulePosition::Tree,
     }))
   } else {
@@ -1048,6 +1049,7 @@ pub fn remove_http_frontend(channel: Channel<CommandRequest,CommandResponse>,
       address,
       hostname: String::from(hostname),
       path: PathRule::Prefix(String::from(path)),
+      method: method.map(String::from),
       position: RulePosition::Tree,
     }))
   }

diff --git a/bin/src/ctl/mod.rs b/bin/src/ctl/mod.rs
@@ -70,19 +70,23 @@ pub fn ctl(matches: Sozu) -> Result<(), anyhow::Error>{
     SubCmd::Frontend{ cmd } => {
       match cmd {
         FrontendCmd::Http{ cmd } => match cmd {
-          HttpFrontendCmd::Add{ hostname, path_begin, address, route } => {
-            add_http_frontend(channel, timeout, route.into(), address, &hostname, &path_begin.unwrap_or("".to_string()), false)
+          HttpFrontendCmd::Add{ hostname, path_begin, address, method, route } => {
+            add_http_frontend(channel, timeout, route.into(), address, &hostname,
+              &path_begin.unwrap_or("".to_string()), method.as_deref(), false)
           },
-          HttpFrontendCmd::Remove{ hostname, path_begin, address, route } => {
-            remove_http_frontend(channel, timeout, route.into(), address, &hostname, &path_begin.unwrap_or("".to_string()), false)
+          HttpFrontendCmd::Remove{ hostname, path_begin, address, method, route } => {
+            remove_http_frontend(channel, timeout, route.into(), address, &hostname,
+              &path_begin.unwrap_or("".to_string()), method.as_deref(), false)
           },
         },
         FrontendCmd::Https{ cmd } => match cmd {
-          HttpFrontendCmd::Add{ hostname, path_begin, address, route } => {
-            add_http_frontend(channel, timeout, route.into(), address, &hostname, &path_begin.unwrap_or("".to_string()), true)
+          HttpFrontendCmd::Add{ hostname, path_begin, address, method, route } => {
+            add_http_frontend(channel, timeout, route.into(), address, &hostname,
+              &path_begin.unwrap_or("".to_string()), method.as_deref(), true)
           },
-          HttpFrontendCmd::Remove{ hostname, path_begin, address, route } => {
-            remove_http_frontend(channel, timeout, route.into(), address, &hostname, &path_begin.unwrap_or("".to_string()), true)
+          HttpFrontendCmd::Remove{ hostname, path_begin, address, method, route } => {
+            remove_http_frontend(channel, timeout, route.into(), address, &hostname,
+              &path_begin.unwrap_or("".to_string()), method.as_deref(), true)
           },
         },
         FrontendCmd::Tcp { cmd } => match cmd {