fixup internal routes

Author: fredr

runtimes/core/src/api/call.rs

@@ -96,6 +96,10 @@ impl ServiceRegistry {
         })
     }
 
+    pub fn service_names(&self) -> Vec<&EncoreName> {
+        self.base_urls.keys().collect()
+    }
+
     pub fn service_base_url<Q>(&self, service_name: &Q) -> Option<&String>
     where
         EncoreName: Borrow<Q>,

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

@@ -30,7 +30,6 @@ use crate::api::paths::PathSet;
 use crate::api::reqauth::caller::Caller;
 use crate::api::reqauth::platform;
 use crate::api::reqauth::{svcauth, CallMeta};
-use crate::encore::runtime::v1::ServiceDiscovery;
 use crate::{api, model, EncoreName};
 
 use super::auth::InboundRequest;
@@ -79,14 +78,14 @@ pub struct Gateway {
 impl Gateway {
     pub fn new(
         name: EncoreName,
-        service_discovery: &ServiceDiscovery,
+        service_registry: Arc<ServiceRegistry>,
         service_routes: PathSet<EncoreName, Arc<api::Endpoint>>,
         auth_handler: Option<auth::Authenticator>,
         cors_config: CorsHeadersConfig,
     ) -> anyhow::Result<Self> {
         let router = service_routes.try_into()?;
 
-        let services = service_discovery.services.keys().cloned().collect();
+        let services = service_registry.service_names();
         let internal_router = Router::new_internal(services)?;
 
         Ok(Gateway {
@@ -295,7 +294,9 @@ impl ProxyHttp for GatewayServer {
                         .internal_router
                         .route_to_service(method, path)?;
 
-                    if let Some(new_path) = upstream_path.strip_prefix(&*target.service_name) {
+                    if let Some(new_path) =
+                        upstream_path.strip_prefix(&format!("/{}", target.service_name))
+                    {
                         upstream_path = new_path;
                         target
                     } else {

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

@@ -18,12 +18,12 @@ impl Router {
         Router { main, fallback }
     }
 
-    pub fn new_internal(services: Vec<String>) -> anyhow::Result<Self> {
+    pub fn new_internal(services: Vec<&EncoreName>) -> anyhow::Result<Self> {
         let mut router = Router::new();
 
         for service in services {
             let target = Some(Target {
-                service_name: service.clone().into(),
+                service_name: service.clone(),
                 requires_auth: false,
             });
 

runtimes/core/src/api/manager.rs

@@ -170,7 +170,6 @@ impl ManagerConfig<'_> {
             let gw = build_gateway(
                 self.meta,
                 gw_cfg,
-                &self.service_discovery,
                 service_registry.clone(),
                 endpoints.clone(),
                 routes,
@@ -241,11 +240,9 @@ impl Pather for RoutePerService {
     }
 }
 
-#[allow(clippy::too_many_arguments)]
 fn build_gateway(
     meta: &meta::Data,
     gw_cfg: &runtime::Gateway,
-    service_discovery: &runtime::ServiceDiscovery,
     service_registry: Arc<ServiceRegistry>,
     endpoints: Arc<HashMap<EndpointName, Arc<Endpoint>>>,
     routes: PathSet<EncoreName, Arc<Endpoint>>,
@@ -280,7 +277,7 @@ fn build_gateway(
 
     Gateway::new(
         gw_cfg.encore_name.clone().into(),
-        service_discovery,
+        service_registry.clone(),
         routes,
         auth_handler,
         cors_config,