all acceptance tests passing

Author: TomPallister

src/Ocelot/Configuration/Creator/ConfigurationCreator.cs

@@ -13,20 +13,23 @@ public class ConfigurationCreator : IConfigurationCreator
         private readonly IHttpHandlerOptionsCreator _httpHandlerOptionsCreator;
         private readonly IAdministrationPath _adminPath;
         private readonly ILoadBalancerOptionsCreator _loadBalancerOptionsCreator;
+        private readonly IVersionCreator _versionCreator;
 
         public ConfigurationCreator(
             IServiceProviderConfigurationCreator serviceProviderConfigCreator,
             IQoSOptionsCreator qosOptionsCreator,
             IHttpHandlerOptionsCreator httpHandlerOptionsCreator,
             IServiceProvider serviceProvider,
-            ILoadBalancerOptionsCreator loadBalancerOptionsCreator
+            ILoadBalancerOptionsCreator loadBalancerOptionsCreator,
+            IVersionCreator versionCreator
             )
         {
             _adminPath = serviceProvider.GetService<IAdministrationPath>();
             _loadBalancerOptionsCreator = loadBalancerOptionsCreator;
             _serviceProviderConfigCreator = serviceProviderConfigCreator;
             _qosOptionsCreator = qosOptionsCreator;
             _httpHandlerOptionsCreator = httpHandlerOptionsCreator;
+            _versionCreator = versionCreator;
         }
 
         public InternalConfiguration Create(FileConfiguration fileConfiguration, List<ReRoute> reRoutes)
@@ -41,14 +44,17 @@ public InternalConfiguration Create(FileConfiguration fileConfiguration, List<Re
 
             var adminPath = _adminPath != null ? _adminPath.Path : null;
 
+            var version = _versionCreator.Create(fileConfiguration.GlobalConfiguration.DownstreamHttpVersion);
+
             return new InternalConfiguration(reRoutes,
                 adminPath,
                 serviceProviderConfiguration,
                 fileConfiguration.GlobalConfiguration.RequestIdKey,
                 lbOptions,
                 fileConfiguration.GlobalConfiguration.DownstreamScheme,
                 qosOptions,
-                httpHandlerOptions
+                httpHandlerOptions,
+                version
                 );
         }
     }

src/Ocelot/Configuration/Creator/DynamicsCreator.cs

@@ -8,10 +8,12 @@ namespace Ocelot.Configuration.Creator
     public class DynamicsCreator : IDynamicsCreator
     {
         private readonly IRateLimitOptionsCreator _rateLimitOptionsCreator;
+        private readonly IVersionCreator _versionCreator;
 
-        public DynamicsCreator(IRateLimitOptionsCreator rateLimitOptionsCreator)
+        public DynamicsCreator(IRateLimitOptionsCreator rateLimitOptionsCreator, IVersionCreator versionCreator)
         {
             _rateLimitOptionsCreator = rateLimitOptionsCreator;
+            _versionCreator = versionCreator;
         }
 
         public List<ReRoute> Create(FileConfiguration fileConfiguration)
@@ -26,10 +28,13 @@ private ReRoute SetUpDynamicReRoute(FileDynamicReRoute fileDynamicReRoute, FileG
             var rateLimitOption = _rateLimitOptionsCreator
                 .Create(fileDynamicReRoute.RateLimitRule, globalConfiguration);
 
+            var version = _versionCreator.Create(fileDynamicReRoute.DownstreamHttpVersion);
+
             var downstreamReRoute = new DownstreamReRouteBuilder()
                 .WithEnableRateLimiting(rateLimitOption.EnableRateLimiting)
                 .WithRateLimitOptions(rateLimitOption)
                 .WithServiceName(fileDynamicReRoute.ServiceName)
+                .WithDownstreamHttpVersion(version)
                 .Build();
 
             var reRoute = new ReRouteBuilder()

src/Ocelot/Configuration/File/FileDynamicReRoute.cs

@@ -4,5 +4,6 @@ public class FileDynamicReRoute
     {
         public string ServiceName { get; set; }
         public FileRateLimitRule RateLimitRule { get; set; }
+        public string DownstreamHttpVersion { get; set; }
     }
 }

src/Ocelot/Configuration/File/FileGlobalConfiguration.cs

@@ -26,5 +26,7 @@ public FileGlobalConfiguration()
         public string DownstreamScheme { get; set; }
 
         public FileHttpHandlerOptions HttpHandlerOptions { get; set; }
+
+        public string DownstreamHttpVersion { get; set; }
     }
 }

src/Ocelot/Configuration/IInternalConfiguration.cs

@@ -2,6 +2,8 @@
 
 namespace Ocelot.Configuration
 {
+    using System;
+
     public interface IInternalConfiguration
     {
         List<ReRoute> ReRoutes { get; }
@@ -19,5 +21,7 @@ public interface IInternalConfiguration
         QoSOptions QoSOptions { get; }
 
         HttpHandlerOptions HttpHandlerOptions { get; }
+
+        Version DownstreamHttpVersion { get;  }
     }
 }

src/Ocelot/Configuration/InternalConfiguration.cs

@@ -2,6 +2,8 @@
 
 namespace Ocelot.Configuration
 {
+    using System;
+
     public class InternalConfiguration : IInternalConfiguration
     {
         public InternalConfiguration(
@@ -12,7 +14,8 @@ public InternalConfiguration(
             LoadBalancerOptions loadBalancerOptions,
             string downstreamScheme,
             QoSOptions qoSOptions,
-            HttpHandlerOptions httpHandlerOptions)
+            HttpHandlerOptions httpHandlerOptions,
+            Version downstreamHttpVersion)
         {
             ReRoutes = reRoutes;
             AdministrationPath = administrationPath;
@@ -22,6 +25,7 @@ public InternalConfiguration(
             DownstreamScheme = downstreamScheme;
             QoSOptions = qoSOptions;
             HttpHandlerOptions = httpHandlerOptions;
+            DownstreamHttpVersion = downstreamHttpVersion;
         }
 
         public List<ReRoute> ReRoutes { get; }
@@ -32,5 +36,7 @@ public InternalConfiguration(
         public string DownstreamScheme { get; }
         public QoSOptions QoSOptions { get; }
         public HttpHandlerOptions HttpHandlerOptions { get; }
+
+        public Version DownstreamHttpVersion { get; }
     }
 }

src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteCreator.cs

@@ -1,5 +1,6 @@
 namespace Ocelot.DownstreamRouteFinder.Finder
 {
+    using System;
     using Configuration;
     using Configuration.Builder;
     using Configuration.Creator;
@@ -54,6 +55,7 @@ public Response<DownstreamRoute> Get(string upstreamUrlPath, string upstreamQuer
                 .WithQosOptions(qosOptions)
                 .WithDownstreamScheme(configuration.DownstreamScheme)
                 .WithLoadBalancerOptions(configuration.LoadBalancerOptions)
+                .WithDownstreamHttpVersion(configuration.DownstreamHttpVersion)
                 .WithUpstreamPathTemplate(upstreamPathTemplate);
 
             var rateLimitOptions = configuration.ReRoutes != null

test/Ocelot.AcceptanceTests/LoadBalancerTests.cs

@@ -27,7 +27,7 @@ public LoadBalancerTests()
         public void should_load_balance_request_with_least_connection()
         {
             int portOne = 50591;
-            int portTwo = 51482;
+            int portTwo = 54483;
 
             var downstreamServiceOneUrl = $"http://localhost:{portOne}";
             var downstreamServiceTwoUrl = $"http://localhost:{portTwo}";

test/Ocelot.AcceptanceTests/Steps.cs

@@ -392,6 +392,7 @@ public void GivenOcelotIsRunningUsingConsulToStoreConfig()
             _ocelotServer = new TestServer(_webHostBuilder);
 
             _ocelotClient = _ocelotServer.CreateClient();
+            Thread.Sleep(1000);
         }
 
         public void WhenIGetUrlOnTheApiGatewayWaitingForTheResponseToBeOk(string url)

test/Ocelot.Benchmarks/DownstreamRouteFinderMiddlewareBenchmarks.cs

@@ -59,7 +59,7 @@ public void SetUp()
 
             _downstreamContext = new DownstreamContext(httpContext)
             {
-                Configuration = new InternalConfiguration(new List<ReRoute>(), null, null, null, null, null, null, null)
+                Configuration = new InternalConfiguration(new List<ReRoute>(), null, null, null, null, null, null, null, null)
             };
         }