allow schema to be https if eureka tells it to be

gmcouto · May 11, 2020 · 3bdf257 · 3bdf257
1 parent b4cb166
commit 3bdf257
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 23 deletions.
diff --git a/feign-reactor-cloud/pom.xml b/feign-reactor-cloud/pom.xml
@@ -43,12 +43,23 @@
 
         <dependency>
             <groupId>com.netflix.ribbon</groupId>
-            <artifactId>ribbon-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.netflix.ribbon</groupId>
-            <artifactId>ribbon-loadbalancer</artifactId>
+      <artifactId>ribbon-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.netflix.ribbon</groupId>
+      <artifactId>ribbon-eureka</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.netflix.eureka</groupId>
+      <artifactId>eureka-client</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.netflix.ribbon</groupId>
+      <artifactId>ribbon-loadbalancer</artifactId>
         </dependency>
 
         <dependency>

diff --git a/feign-reactor-cloud/src/main/java/reactivefeign/cloud/publisher/RibbonPublisherClient.java b/feign-reactor-cloud/src/main/java/reactivefeign/cloud/publisher/RibbonPublisherClient.java
@@ -2,6 +2,7 @@
 
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.reactive.LoadBalancerCommand;
+import com.netflix.niws.loadbalancer.DiscoveryEnabledServer;
 import org.reactivestreams.Publisher;
 import org.springframework.web.util.UriComponentsBuilder;
 import reactivefeign.client.ReactiveHttpRequest;
@@ -24,7 +25,7 @@
  */
 public class RibbonPublisherClient implements PublisherHttpClient {
 
-    private final LazyInitialized<LoadBalancerCommand<Object>> loadBalancerCommand;
+  private final LazyInitialized<LoadBalancerCommand<Object>> loadBalancerCommand;
     private final PublisherHttpClient publisherClient;
     private final Type publisherType;
 
@@ -37,7 +38,7 @@ public RibbonPublisherClient(LoadBalancerCommandFactory loadBalancerCommandFacto
         this.publisherType = publisherType;
     }
 
-    @Override
+  @Override
     public Publisher<Object> executeRequest(ReactiveHttpRequest request) {
         LoadBalancerCommand<Object> loadBalancerCommand = this.loadBalancerCommand.get();
         if (loadBalancerCommand != null) {
@@ -52,12 +53,12 @@ public Publisher<Object> executeRequest(ReactiveHttpRequest request) {
             } else {
                 throw new IllegalArgumentException("Unknown publisherType: " + publisherType);
             }
-        } else {
-            return publisherClient.executeRequest(request);
-        }
+    } else {
+      return publisherClient.executeRequest(request);
     }
+  }
 
-    private Publisher<?> getLoadBalancedPublisher(
+  private Publisher<?> getLoadBalancedPublisher(
             ReactiveHttpRequest request,
             LoadBalancerCommand<Object> loadBalancerCommand,
             Context context) {
@@ -66,17 +67,25 @@ private Publisher<?> getLoadBalancedPublisher(
             ReactiveHttpRequest lbRequest = loadBalanceRequest(request, server);
 
             Publisher<Object> publisher = publisherClient.executeRequest(lbRequest);
-            return RxReactiveStreams.toObservable(withContext(publisher, publisherType, context));
-        });
+              return RxReactiveStreams.toObservable(withContext(publisher, publisherType, context));
+            });
 
-        return RxReactiveStreams.toPublisher(observable);
-    }
+    return RxReactiveStreams.toPublisher(observable);
+  }
 
-    protected ReactiveHttpRequest loadBalanceRequest(ReactiveHttpRequest request, Server server) {
-        URI lbUrl = UriComponentsBuilder.fromUri(request.uri())
-                .host(server.getHost())
-                .port(server.getPort())
-                .build(true).toUri();
-        return new ReactiveHttpRequest(request, lbUrl);
-    }
+  protected ReactiveHttpRequest loadBalanceRequest(ReactiveHttpRequest request, Server server) {
+    String scheme = "http";
+    if (server instanceof DiscoveryEnabledServer
+        && ((DiscoveryEnabledServer) server).getInstanceInfo() != null
+        && server.getPort() == ((DiscoveryEnabledServer) server).getInstanceInfo().getSecurePort())
+      scheme = "https";
+    URI lbUrl =
+        UriComponentsBuilder.fromUri(request.uri())
+            .host(server.getHost())
+            .scheme(scheme)
+            .port(server.getPort())
+            .build(true)
+            .toUri();
+    return new ReactiveHttpRequest(request, lbUrl);
+  }
 }