Config Server stability improvements

src/Bootstrap/src/AutoConfiguration/BootstrapScanner.cs

@@ -91,7 +91,7 @@ public void ConfigureSteeltoe()
 
     private void WireConfigServer()
     {
-        _wrapper.AddConfigServer(_loggerFactory);
+        _wrapper.AddConfigServer(null, _loggerFactory);
 
         LogConfigServerConfigured();
     }

src/Common/src/Certificates/CertificateOptions.cs

@@ -14,6 +14,20 @@ public sealed class CertificateOptions
     internal const string ConfigurationKeyPrefix = "Certificates";
 
     public X509Certificate2? Certificate { get; set; }
-
     public IList<X509Certificate2> IssuerChain { get; } = [];
+
+    internal CertificateOptions Clone()
+    {
+        var clone = new CertificateOptions
+        {
+            Certificate = Certificate
+        };
+
+        foreach (X509Certificate2 issuer in IssuerChain)
+        {
+            clone.IssuerChain.Add(issuer);
+        }
+
+        return clone;
+    }
 }

src/Common/test/Certificates.Test/ConfigureCertificateOptionsTest.cs

@@ -148,7 +148,7 @@ public async Task CertificateOptions_update_on_changed_contents(string certifica
         string secondPrivateKeyContent = await File.ReadAllTextAsync("secondInstance.key", TestContext.Current.CancellationToken);
         using var secondX509 = X509Certificate2.CreateFromPemFile("secondInstance.crt", "secondInstance.key");
         string appSettings = BuildAppSettingsJson(certificateName, certificateFilePath, privateKeyFilePath);
-        string appSettingsPath = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
+        string appSettingsPath = sandbox.CreateFile("appsettings.json", appSettings);
         var configurationBuilder = new ConfigurationBuilder();
         configurationBuilder.AddJsonFile(appSettingsPath, false, true);
         IConfiguration configuration = configurationBuilder.Build();
@@ -167,7 +167,7 @@ public async Task CertificateOptions_update_on_changed_contents(string certifica
         await File.WriteAllTextAsync(privateKeyFilePath, secondPrivateKeyContent, TestContext.Current.CancellationToken);
 
         using Task pollTask = WaitUntilCertificateChangedToAsync(secondX509, optionsMonitor, certificateName, TestContext.Current.CancellationToken);
-        await pollTask.WaitAsync(TimeSpan.FromSeconds(1), TestContext.Current.CancellationToken);
+        await pollTask.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
         optionsMonitor.Get(certificateName).Certificate.Should().Be(secondX509);
     }
@@ -185,7 +185,7 @@ public async Task CertificateOptions_update_on_changed_path(string certificateNa
         string firstPrivateKeyFilePath = sandbox.CreateFile(Guid.NewGuid() + ".key", firstPrivateKeyContent);
         using var secondX509 = X509Certificate2.CreateFromPemFile("secondInstance.crt", "secondInstance.key");
         string appSettings = BuildAppSettingsJson(certificateName, firstCertificateFilePath, firstPrivateKeyFilePath);
-        string appSettingsPath = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, appSettings);
+        string appSettingsPath = sandbox.CreateFile("appsettings.json", appSettings);
         var configurationBuilder = new ConfigurationBuilder();
         configurationBuilder.AddJsonFile(appSettingsPath, false, true);
         IConfiguration configuration = configurationBuilder.Build();

src/Common/test/Common.Test/ApplicationInstanceInfoTest.cs

@@ -7,7 +7,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Steeltoe.Common.Extensions;
 using Steeltoe.Common.TestResources;
-using Steeltoe.Common.TestResources.IO;
 
 namespace Steeltoe.Common.Test;
 
@@ -24,7 +23,7 @@ public void ConstructorSetsDefaults()
     [Fact]
     public async Task ReadsApplicationConfiguration()
     {
-        const string configJson = """
+        const string appSettings = """
             {
               "Spring": {
                 "Application": {
@@ -34,13 +33,11 @@ public async Task ReadsApplicationConfiguration()
             }
             """;
 
-        using var sandbox = new Sandbox();
-        string path = sandbox.CreateFile(MemoryFileProvider.DefaultAppSettingsFileName, configJson);
-        string directory = Path.GetDirectoryName(path)!;
-        string fileName = Path.GetFileName(path);
+        var fileProvider = new MemoryFileProvider();
+        fileProvider.IncludeAppSettingsJsonFile(appSettings);
+
         var builder = new ConfigurationBuilder();
-        builder.SetBasePath(directory);
-        builder.AddJsonFile(fileName);
+        builder.AddInMemoryAppSettingsJsonFile(fileProvider);
         IConfiguration configuration = builder.Build();
 
         var services = new ServiceCollection();

src/Common/test/TestResources/MemoryFileProvider.cs

@@ -12,8 +12,6 @@ namespace Steeltoe.Common.TestResources;
 
 public sealed class MemoryFileProvider : IFileProvider
 {
-    public const string DefaultAppSettingsFileName = "appsettings.json";
-
     private static readonly char[] DirectorySeparators =
     [
         Path.DirectorySeparatorChar,

src/Common/test/TestResources/MemoryFileProviderAppSettingsExtensions.cs

@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+namespace Steeltoe.Common.TestResources;
+
+public static class MemoryFileProviderAppSettingsExtensions
+{
+    public static void IncludeAppSettingsJsonFile(this MemoryFileProvider fileProvider, string contents)
+    {
+        ArgumentNullException.ThrowIfNull(fileProvider);
+
+        fileProvider.IncludeFile(MemoryFileProviderConfigurationBuilderExtensions.AppSettingsJsonFileName, contents);
+    }
+
+    public static void IncludeAppSettingsXmlFile(this MemoryFileProvider fileProvider, string contents)
+    {
+        ArgumentNullException.ThrowIfNull(fileProvider);
+
+        fileProvider.IncludeFile(MemoryFileProviderConfigurationBuilderExtensions.AppSettingsXmlFileName, contents);
+    }
+
+    public static void IncludeAppSettingsIniFile(this MemoryFileProvider fileProvider, string contents)
+    {
+        ArgumentNullException.ThrowIfNull(fileProvider);
+
+        fileProvider.IncludeFile(MemoryFileProviderConfigurationBuilderExtensions.AppSettingsIniFileName, contents);
+    }
+
+    public static void ReplaceAppSettingsJsonFile(this MemoryFileProvider fileProvider, string contents)
+    {
+        ArgumentNullException.ThrowIfNull(fileProvider);
+
+        fileProvider.ReplaceFile(MemoryFileProviderConfigurationBuilderExtensions.AppSettingsJsonFileName, contents);
+    }
+}

src/Common/test/TestResources/MemoryFileProviderConfigurationBuilderExtensions.cs

@@ -0,0 +1,77 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Ini;
+using Microsoft.Extensions.Configuration.Json;
+using Microsoft.Extensions.Configuration.Xml;
+
+namespace Steeltoe.Common.TestResources;
+
+public static class MemoryFileProviderConfigurationBuilderExtensions
+{
+    internal const string AppSettingsJsonFileName = "appsettings.json";
+    internal const string AppSettingsXmlFileName = "appsettings.xml";
+    internal const string AppSettingsIniFileName = "appsettings.ini";
+
+    public static void AddInMemoryAppSettingsJsonFile(this IConfigurationBuilder builder, MemoryFileProvider fileProvider)
+    {
+        AddInMemoryJsonFile(builder, fileProvider, AppSettingsJsonFileName);
+    }
+
+    public static void AddInMemoryJsonFile(this IConfigurationBuilder builder, MemoryFileProvider fileProvider, string path)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(fileProvider);
+        ArgumentException.ThrowIfNullOrEmpty(path);
+
+        var source = new JsonConfigurationSource
+        {
+            FileProvider = fileProvider,
+            Path = path,
+            Optional = false,
+            ReloadOnChange = true,
+            // Turn off debounce, so the change token triggers immediately. Then we don't need to sleep in tests.
+            ReloadDelay = 0
+        };
+
+        builder.Add(source);
+    }
+
+    public static void AddInMemoryAppSettingsXmlFile(this IConfigurationBuilder builder, MemoryFileProvider fileProvider)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(fileProvider);
+
+        var source = new XmlConfigurationSource
+        {
+            FileProvider = fileProvider,
+            Path = AppSettingsXmlFileName,
+            Optional = false,
+            ReloadOnChange = true,
+            // Turn off debounce, so the change token triggers immediately. Then we don't need to sleep in tests.
+            ReloadDelay = 0
+        };
+
+        builder.Add(source);
+    }
+
+    public static void AddInMemoryAppSettingsIniFile(this IConfigurationBuilder builder, MemoryFileProvider fileProvider)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(fileProvider);
+
+        var source = new IniConfigurationSource
+        {
+            FileProvider = fileProvider,
+            Path = AppSettingsIniFileName,
+            Optional = false,
+            ReloadOnChange = true,
+            // Turn off debounce, so the change token triggers immediately. Then we don't need to sleep in tests.
+            ReloadDelay = 0
+        };
+
+        builder.Add(source);
+    }
+}

src/Configuration/src/Abstractions/CompositeConfigurationProvider.cs

@@ -53,10 +53,9 @@ private void Load(bool isReload)
 
     public IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string? parentPath)
     {
+        ArgumentNullException.ThrowIfNull(earlierKeys);
+
         string[] earlierKeysArray = earlierKeys as string[] ?? earlierKeys.ToArray();
-#pragma warning disable S3236 // Caller information arguments should not be provided explicitly
-        ArgumentNullException.ThrowIfNull(earlierKeysArray, nameof(earlierKeys));
-#pragma warning restore S3236 // Caller information arguments should not be provided explicitly
 
         if (_logger.IsEnabled(LogLevel.Trace))
         {

src/Configuration/src/ConfigServer/ConfigServerClientOptions.cs

@@ -17,10 +17,14 @@ public sealed class ConfigServerClientOptions : IValidateCertificatesOptions
     private const char CommaDelimiter = ',';
     internal const string ConfigurationPrefix = "spring:cloud:config";
 
-    internal CertificateOptions ClientCertificate { get; } = new();
     internal TimeSpan HttpTimeout => TimeSpan.FromMilliseconds(Timeout);
     internal bool IsMultiServerConfiguration => Uri != null && Uri.Contains(CommaDelimiter);
 
+    /// <summary>
+    /// Gets or sets the client certificate used for mutual TLS authentication with the Config Server.
+    /// </summary>
+    internal CertificateOptions ClientCertificate { get; set; } = new();
+
     /// <summary>
     /// Gets or sets a value indicating whether the Config Server provider is enabled. Default value: true.
     /// </summary>
@@ -35,7 +39,7 @@ public sealed class ConfigServerClientOptions : IValidateCertificatesOptions
     /// Gets or sets a comma-separated list of environments used when accessing configuration data. Default value: "Production".
     /// </summary>
     [ConfigurationKeyName("Env")]
-    public string? Environment { get; set; } = "Production";
+    public string? Environment { get; set; }
 
     /// <summary>
     /// Gets or sets a comma-separated list of labels to request from the server.
@@ -96,17 +100,17 @@ public bool ValidateCertificatesAlt
     /// <summary>
     /// Gets retry settings.
     /// </summary>
-    public ConfigServerRetryOptions Retry { get; } = new();
+    public ConfigServerRetryOptions Retry { get; private set; } = new();
 
     /// <summary>
     /// Gets service discovery settings.
     /// </summary>
-    public ConfigServerDiscoveryOptions Discovery { get; } = new();
+    public ConfigServerDiscoveryOptions Discovery { get; private set; } = new();
 
     /// <summary>
     /// Gets health check settings.
     /// </summary>
-    public ConfigServerHealthOptions Health { get; } = new();
+    public ConfigServerHealthOptions Health { get; private set; } = new();
 
     /// <summary>
     /// Gets or sets the address used by the provider to obtain a OAuth Access Token.
@@ -129,7 +133,7 @@ public bool ValidateCertificatesAlt
     public int TokenTtl { get; set; } = 300_000;
 
     /// <summary>
-    /// Gets or sets the vault token renew rate (in milliseconds). Default value: 60_000 (1 minute).
+    /// Gets or sets the Vault token renew rate (in milliseconds). Default value: 60_000 (1 minute).
     /// </summary>
     public int TokenRenewRate { get; set; } = 60_000;
 
@@ -141,7 +145,52 @@ public bool ValidateCertificatesAlt
     /// <summary>
     /// Gets headers that will be added to the Config Server request.
     /// </summary>
-    public IDictionary<string, string> Headers { get; } = new Dictionary<string, string>();
+    public IDictionary<string, string> Headers { get; private set; } = new Dictionary<string, string>();
+
+    internal ConfigServerClientOptions Clone()
+    {
+        return new ConfigServerClientOptions
+        {
+            ClientCertificate = ClientCertificate.Clone(),
+            Enabled = Enabled,
+            FailFast = FailFast,
+            Environment = Environment,
+            Label = Label,
+            Name = Name,
+            Uri = Uri,
+            Username = Username,
+            Password = Password,
+            Token = Token,
+            Timeout = Timeout,
+            PollingInterval = PollingInterval,
+            ValidateCertificates = ValidateCertificates,
+            Retry = new ConfigServerRetryOptions
+            {
+                Enabled = Retry.Enabled,
+                InitialInterval = Retry.InitialInterval,
+                MaxInterval = Retry.MaxInterval,
+                Multiplier = Retry.Multiplier,
+                MaxAttempts = Retry.MaxAttempts
+            },
+            Discovery = new ConfigServerDiscoveryOptions
+            {
+                Enabled = Discovery.Enabled,
+                ServiceId = Discovery.ServiceId
+            },
+            Health = new ConfigServerHealthOptions
+            {
+                Enabled = Health.Enabled,
+                TimeToLive = Health.TimeToLive
+            },
+            AccessTokenUri = AccessTokenUri,
+            ClientSecret = ClientSecret,
+            ClientId = ClientId,
+            TokenTtl = TokenTtl,
+            TokenRenewRate = TokenRenewRate,
+            DisableTokenRenewal = DisableTokenRenewal,
+            Headers = new Dictionary<string, string>(Headers)
+        };
+    }
 
     internal List<Uri> GetUris()
     {