Make Ocelot work with service fabric DNS and naming service for guest exe and stateless (#242)

* test for issue

* added service fabric sample

* working!!

* changed sample naming to Ocelot

* removed files we dont need

* removed files we dont need

* updated sample gitignore

* updated sample gitignore

* getting ocelot to work with service fabric using the reverse proxy

* #238 - added support for service fabric discovery provider, proxies requests through naming service, wont work on partioned service fabric services yet

* #238 - Manually tested service fabric using sample..all seems OK. Made some changes after testing, added docs

* #238 - added docs for servic fabric

test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs

@@ -1,4 +1,5 @@
-using Ocelot.Middleware;
+using Ocelot.Configuration;
+using Ocelot.Middleware;
 
 namespace Ocelot.UnitTests.DownstreamUrlCreator
 {
@@ -27,7 +28,6 @@ namespace Ocelot.UnitTests.DownstreamUrlCreator
     public class DownstreamUrlCreatorMiddlewareTests
     {
         private readonly Mock<IDownstreamPathPlaceholderReplacer> _downstreamUrlTemplateVariableReplacer;
-        private readonly Mock<IUrlBuilder> _urlBuilder;
         private OkResponse<DownstreamPath> _downstreamPath;
         private Mock<IOcelotLoggerFactory> _loggerFactory;
         private Mock<IOcelotLogger> _logger;
@@ -42,7 +42,6 @@ namespace Ocelot.UnitTests.DownstreamUrlCreator
             _logger = new Mock<IOcelotLogger>();
             _loggerFactory.Setup(x => x.CreateLogger<DownstreamUrlCreatorMiddleware>()).Returns(_logger.Object);
             _downstreamUrlTemplateVariableReplacer = new Mock<IDownstreamPathPlaceholderReplacer>();
-            _urlBuilder = new Mock<IUrlBuilder>();
             _downstreamContext.DownstreamRequest = new HttpRequestMessage(HttpMethod.Get, "https://my.url/abc/?q=123");
             _next = async context => {
                 //do nothing
@@ -58,6 +57,9 @@ namespace Ocelot.UnitTests.DownstreamUrlCreator
                 .WithDownstreamScheme("https")
                 .Build();
 
+            var config = new ServiceProviderConfigurationBuilder()
+                .Build();
+
             this.Given(x => x.GivenTheDownStreamRouteIs(
                     new DownstreamRoute(
                     new List<PlaceholderNameAndValue>(), 
@@ -66,15 +68,81 @@ namespace Ocelot.UnitTests.DownstreamUrlCreator
                         .WithUpstreamHttpMethod(new List<string> { "Get" })
                         .Build())))
                 .And(x => x.GivenTheDownstreamRequestUriIs("http://my.url/abc?q=123"))
+                .And(x => GivenTheServiceProviderConfigIs(config))
                 .And(x => x.GivenTheUrlReplacerWillReturn("/api/products/1"))
                 .When(x => x.WhenICallTheMiddleware())
                 .Then(x => x.ThenTheDownstreamRequestUriIs("https://my.url:80/api/products/1?q=123"))
                 .BDDfy();
         }
 
+        [Fact]
+        public void should_not_create_service_fabric_url()
+        {
+            var downstreamReRoute = new DownstreamReRouteBuilder()
+                .WithDownstreamPathTemplate("any old string")
+                .WithUpstreamHttpMethod(new List<string> { "Get" })
+                .WithDownstreamScheme("https")
+                .Build();
+
+            var config = new ServiceProviderConfigurationBuilder()
+                .WithServiceDiscoveryProviderType("ServiceFabric")
+                .WithServiceDiscoveryProviderHost("localhost")
+                .WithServiceDiscoveryProviderPort(19081)
+                .Build();
+
+            this.Given(x => x.GivenTheDownStreamRouteIs(
+                    new DownstreamRoute(
+                        new List<PlaceholderNameAndValue>(),
+                        new ReRouteBuilder()
+                            .WithDownstreamReRoute(downstreamReRoute)
+                            .WithUpstreamHttpMethod(new List<string> { "Get" })
+                            .Build())))
+                .And(x => x.GivenTheDownstreamRequestUriIs("http://my.url/abc?q=123"))
+                .And(x => GivenTheServiceProviderConfigIs(config))
+                .And(x => x.GivenTheUrlReplacerWillReturn("/api/products/1"))
+                .When(x => x.WhenICallTheMiddleware())
+                .Then(x => x.ThenTheDownstreamRequestUriIs("https://my.url:80/api/products/1?q=123"))
+                .BDDfy();
+        }
+
+        [Fact]
+        public void should_create_service_fabric_url()
+        {
+            var downstreamReRoute = new DownstreamReRouteBuilder()
+                .WithDownstreamScheme("http")
+                .WithServiceName("Ocelot/OcelotApp")
+                .WithUseServiceDiscovery(true)
+                .Build();
+
+            var downstreamRoute = new DownstreamRoute(
+                new List<PlaceholderNameAndValue>(),
+                new ReRouteBuilder()
+                    .WithDownstreamReRoute(downstreamReRoute)
+                    .Build());
+
+            var config = new ServiceProviderConfigurationBuilder()
+                .WithServiceDiscoveryProviderType("ServiceFabric")
+                .WithServiceDiscoveryProviderHost("localhost")
+                .WithServiceDiscoveryProviderPort(19081)
+                .Build();
+
+            this.Given(x => x.GivenTheDownStreamRouteIs(downstreamRoute))
+                .And(x => GivenTheServiceProviderConfigIs(config))
+                .And(x => x.GivenTheDownstreamRequestUriIs("http://localhost:19081"))
+                .And(x => x.GivenTheUrlReplacerWillReturn("/api/products/1"))
+                .When(x => x.WhenICallTheMiddleware())
+                .Then(x => x.ThenTheDownstreamRequestUriIs("http://localhost:19081/Ocelot/OcelotApp/api/products/1?cmd=instance"))
+                .BDDfy();
+        }
+
+        private void GivenTheServiceProviderConfigIs(ServiceProviderConfiguration config)
+        {
+            _downstreamContext.ServiceProviderConfiguration = config;
+        }
+
         private void WhenICallTheMiddleware()
         {
-            _middleware = new DownstreamUrlCreatorMiddleware(_next, _loggerFactory.Object, _downstreamUrlTemplateVariableReplacer.Object, _urlBuilder.Object);
+            _middleware = new DownstreamUrlCreatorMiddleware(_next, _loggerFactory.Object, _downstreamUrlTemplateVariableReplacer.Object);
             _middleware.Invoke(_downstreamContext).GetAwaiter().GetResult();
         }
 

test/Ocelot.UnitTests/DownstreamUrlCreator/UrlBuilderTests.cs

@@ -1,122 +0,0 @@
-using System;
-using Ocelot.DownstreamUrlCreator;
-using Ocelot.Responses;
-using Ocelot.Values;
-using Shouldly;
-using TestStack.BDDfy;
-using Xunit;
-
-namespace Ocelot.UnitTests.DownstreamUrlCreator
-{
-    public class UrlBuilderTests
-    {
-        private readonly IUrlBuilder _urlBuilder;
-        private string _dsPath;
-        private string _dsScheme;
-        private string _dsHost;
-        private int _dsPort;
-
-        private Response<DownstreamUrl> _result;
-
-        public UrlBuilderTests()
-        {
-            _urlBuilder = new UrlBuilder();
-        }
-
-        [Fact]
-        public void should_return_error_when_downstream_path_is_null()
-        {
-            this.Given(x => x.GivenADownstreamPath(null))
-                .When(x => x.WhenIBuildTheUrl())
-                .Then(x => x.ThenThereIsAnErrorOfType<DownstreamPathNullOrEmptyError>())
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_return_error_when_downstream_scheme_is_null()
-        {
-            this.Given(x => x.GivenADownstreamScheme(null))
-                .And(x => x.GivenADownstreamPath("test"))
-                .When(x => x.WhenIBuildTheUrl())
-                .Then(x => x.ThenThereIsAnErrorOfType<DownstreamSchemeNullOrEmptyError>())
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_return_error_when_downstream_host_is_null()
-        {
-            this.Given(x => x.GivenADownstreamScheme(null))
-                .And(x => x.GivenADownstreamPath("test"))
-                .And(x => x.GivenADownstreamScheme("test"))
-                .When(x => x.WhenIBuildTheUrl())
-                .Then(x => x.ThenThereIsAnErrorOfType<DownstreamHostNullOrEmptyError>())
-                .BDDfy();
-        }
-
-        [Fact]
-        public void should_not_use_port_if_zero()
-        {
-            this.Given(x => x.GivenADownstreamPath("/api/products/1"))
-           .And(x => x.GivenADownstreamScheme("http"))
-           .And(x => x.GivenADownstreamHost("127.0.0.1"))
-           .And(x => x.GivenADownstreamPort(0))
-           .When(x => x.WhenIBuildTheUrl())
-           .Then(x => x.ThenTheUrlIsReturned("http://127.0.0.1/api/products/1"))
-           .And(x => x.ThenTheUrlIsWellFormed())
-           .BDDfy();
-        }
-
-        [Fact]
-        public void should_build_well_formed_uri()
-        {
-            this.Given(x => x.GivenADownstreamPath("/api/products/1"))
-                .And(x => x.GivenADownstreamScheme("http"))
-                .And(x => x.GivenADownstreamHost("127.0.0.1"))
-                .And(x => x.GivenADownstreamPort(5000))
-                .When(x => x.WhenIBuildTheUrl())
-                .Then(x => x.ThenTheUrlIsReturned("http://127.0.0.1:5000/api/products/1"))
-                .And(x => x.ThenTheUrlIsWellFormed())
-                .BDDfy();
-        }
-
-        private void ThenThereIsAnErrorOfType<T>()
-        {
-            _result.Errors[0].ShouldBeOfType<T>();
-        }
-
-        private void GivenADownstreamPath(string dsPath)
-        {
-            _dsPath = dsPath;
-        }
-
-        private void GivenADownstreamScheme(string dsScheme)
-        {
-            _dsScheme = dsScheme;
-        }
-
-        private void GivenADownstreamHost(string dsHost)
-        {
-            _dsHost = dsHost;
-        }
-
-        private void GivenADownstreamPort(int dsPort)
-        {
-            _dsPort = dsPort;
-        }
-
-        private void WhenIBuildTheUrl()
-        {
-            _result = _urlBuilder.Build(_dsPath, _dsScheme, new ServiceHostAndPort(_dsHost, _dsPort));
-        }
-
-        private void ThenTheUrlIsReturned(string expected)
-        {
-            _result.Data.Value.ShouldBe(expected);
-        }
-
-        private void ThenTheUrlIsWellFormed()
-        {
-            Uri.IsWellFormedUriString(_result.Data.Value, UriKind.Absolute).ShouldBeTrue();
-        }
-    }
-}