Merge pull request #1208 from ge-digital-firestorm/Fix1178

Fix issue where "Spring:Cloud:Config:Timeout" configuration property isn't respected
SteeltoeOSS · Oct 25, 2023 · 55211fe · 55211fe
2 parents a662cc1 + 10cb626
commit 55211fe
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/Common/src/Common.Http/HttpClientHelper.cs b/src/Common/src/Common.Http/HttpClientHelper.cs
@@ -72,7 +72,11 @@ public static HttpClient GetHttpClient(bool validateCertificates, HttpClientHand
             }
         }
 
-        client.Timeout = TimeSpan.FromMilliseconds(timeoutMillis);
+        if (timeoutMillis > 0)
+        {
+            client.Timeout = TimeSpan.FromMilliseconds(timeoutMillis);
+        }
+
         client.DefaultRequestHeaders.UserAgent.ParseAdd(SteeltoeUserAgent);
         return client;
     }

diff --git a/src/Configuration/src/ConfigServerBase/ConfigServerConfigurationProvider.cs b/src/Configuration/src/ConfigServerBase/ConfigServerConfigurationProvider.cs
@@ -140,9 +140,9 @@ internal void Initialize(ConfigServerClientSettings settings, IConfiguration con
         }
 
         _settings = settings;
-        _httpClient = httpClient ?? GetHttpClient(_settings);
-
         OnSettingsChanged();
+
+        _httpClient = httpClient ?? GetHttpClient(_settings);
     }
 
     private void OnSettingsChanged()
@@ -960,7 +960,7 @@ protected internal bool IsDiscoveryFirstEnabled()
     }
 
     /// <summary>
-    /// Creates an appropriatly configured HttpClient that will be used in communicating with the
+    /// Creates an appropriately configured HttpClient that will be used in communicating with the
     /// Spring Cloud Configuration Server
     /// </summary>
     /// <param name="settings">the settings used in configuring the HttpClient</param>

diff --git a/src/Configuration/test/ConfigServerBase.Test/ConfigServerConfigurationProviderTest.cs b/src/Configuration/test/ConfigServerBase.Test/ConfigServerConfigurationProviderTest.cs
@@ -82,6 +82,21 @@ public void SourceConstructor_WithDefaults_InitializesWithDefaultSettings()
         TestHelper.VerifyDefaults(provider.Settings);
     }
 
+    [Fact]
+    public void SourceConstructor_WithTimeoutConfigured_InitializesHttpClientWithConfiguredTimeout()
+    {
+        IConfiguration configuration = new ConfigurationBuilder()
+            .AddInMemoryCollection(new Dictionary<string, string>
+            {
+                { "spring:cloud:config:timeout", "30000" }
+            })
+            .Build();
+        var source = new ConfigServerConfigurationSource(configuration);
+        var provider = new TestConfigServerConfigurationProvider(source);
+
+        Assert.Equal(TimeSpan.FromMilliseconds(30000), provider.TheConfiguredClient.Timeout);
+    }
+
     [Fact]
     public void SourceConstructor_WithDefaults_ThrowsIfHttpClientNull()
     {
@@ -1160,6 +1175,11 @@ public TestConfigServerConfigurationProvider(ConfigServerClientSettings settings
         {
         }
 
+        public TestConfigServerConfigurationProvider(ConfigServerConfigurationSource source)
+            : base(source)
+        {
+        }
+
         public HttpClient TheConfiguredClient => _httpClient;
     }