cleanup

Author: fredr

runtimes/core/src/api/gateway/mod.rs

@@ -56,13 +56,12 @@ impl GatewayCtx {
             builder = builder.authority(authority.clone());
         }
 
-        let path_and_query = if let Some(query) = req.uri.query() {
-            format!("{}?{}", self.upstream_path, query)
+        if let Some(query) = req.uri.query() {
+            builder = builder.path_and_query(format!("{}?{}", self.upstream_path, query));
         } else {
-            self.upstream_path.clone()
+            builder = builder.path_and_query(&self.upstream_path);
         };
 
-        builder = builder.path_and_query(path_and_query);
         builder.build().context("failed to build uri")
     }
 }
@@ -130,8 +129,8 @@ impl GatewayServer {
         }
     }
 
-    pub fn is_empty(&self) -> bool {
-        self.gateways.is_empty()
+    pub fn has_configurations(&self) -> bool {
+        !self.gateways.is_empty()
     }
 
     pub fn get_gateway(&self, name: &str) -> Option<&Arc<Gateway>> {
@@ -301,7 +300,7 @@ impl ProxyHttp for GatewayServer {
                         target
                     } else {
                         return Err(api::Error::internal(anyhow::anyhow!(
-                            "route path was not prefixed with target service name"
+                            "path was not prefixed with target service name"
                         ))
                         .into());
                     }

runtimes/core/src/api/manager.rs

@@ -162,7 +162,7 @@ impl ManagerConfig<'_> {
             let routes = paths::compute(
                 endpoints
                     .iter()
-                    // TODO(fredr) we should filter out only public routs here
+                    // TODO(fredr): we should filter out only public routes here
                     // .filter(|(_, ep)| ep.exposed.contains(name))
                     .map(|(_, ep)| RoutePerService(ep.to_owned())),
             );