Update rs/src/management/http_client.rs

Co-authored-by: Connor Peet <[email protected]>
microsoft · Oct 12, 2023 · b214852 · b214852
1 parent fa6a4f7
commit b214852
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/rs/src/management/http_client.rs b/rs/src/management/http_client.rs
@@ -103,11 +103,12 @@ impl TunnelManagementClient {
         mut tunnel: Tunnel,
         options: &TunnelRequestOptions,
     ) -> HttpResult<Tunnel> {
-        if tunnel.tunnel_id.is_none() || tunnel.tunnel_id.as_ref().unwrap().is_empty() {
-            tunnel.tunnel_id = Some(TunnelManagementClient::generate_tunnel_id());
-        }
         let mut url = self.build_uri(tunnel.cluster_id.as_deref(), TUNNELS_API_PATH);
-        let new_path = url.path().to_owned() + "/" + tunnel.tunnel_id.as_ref().unwrap();
+        let tunnel_id = match tunnel.tunnel_id.as_ref() {
+            None | Some("") => TunnelManagementClient::generate_tunnel_id(),
+            Some(tunnel_id) => tunnel_id.to_owned(),
+        };
+        let new_path = url.path().to_owned() + "/" + tunnel_id;
         url.set_path(&new_path);
         let mut request = self.make_tunnel_request(Method::PUT, url, options).await?;
         json_body(&mut request, tunnel);