Simplify Configure calls, fix broken tests

Author: bart-vmware

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns/Resolver/DnsResolver.cs

@@ -48,16 +48,12 @@ public DnsResolver(TimeProvider timeProvider, ILogger<DnsResolver> logger, IOpti
         }
     }
 
-    internal DnsResolver(DnsResolverOptions options) : this(TimeProvider.System, NullLogger<DnsResolver>.Instance, new OptionsWrapper<DnsResolverOptions>(options))
-    {
-    }
-
-    internal DnsResolver(IEnumerable<IPEndPoint> servers) : this(new DnsResolverOptions { Servers = servers.ToArray() })
-    {
-    }
-
-    internal DnsResolver(IPEndPoint server) : this(new DnsResolverOptions { Servers = [server] })
+    // This constructor is for unit testing only. Does not auto-add system DNS servers.
+    internal DnsResolver(DnsResolverOptions options)
     {
+        _timeProvider = TimeProvider.System;
+        _logger = NullLogger<DnsResolver>.Instance;
+        _options = options;
     }
 
     public ValueTask<ServiceResult[]> ResolveServiceAsync(string name, CancellationToken cancellationToken = default)

src/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns/ServiceDiscoveryDnsServiceCollectionExtensions.cs

@@ -60,7 +60,7 @@ public static IServiceCollection AddDnsSrvServiceEndpointProvider(this IServiceC
 
         services.AddSingleton<IServiceEndpointProviderFactory, DnsSrvServiceEndpointProviderFactory>();
         var options = services.AddOptions<DnsSrvServiceEndpointProviderOptions>();
-        options.Configure(o => configureOptions.Invoke(o));
+        options.Configure(configureOptions);
 
         return services;
 
@@ -109,7 +109,7 @@ public static IServiceCollection AddDnsServiceEndpointProvider(this IServiceColl
 
         services.AddSingleton<IServiceEndpointProviderFactory, DnsServiceEndpointProviderFactory>();
         var options = services.AddOptions<DnsServiceEndpointProviderOptions>();
-        options.Configure(o => configureOptions.Invoke(o));
+        options.Configure(configureOptions);
 
         return services;
     }

test/Libraries/Microsoft.Extensions.ServiceDiscovery.Dns.Tests/ServiceDiscoveryDnsServiceCollectionExtensionsTests.cs

@@ -21,7 +21,9 @@ public void AddDnsServiceEndpointProviderShouldRegisterDependentServices()
         services.AddDnsServiceEndpointProvider();
 
         using var serviceProvider = services.BuildServiceProvider(true);
-        _ = serviceProvider.GetServices<IServiceEndpointProviderFactory>();
+
+        var exception = Record.Exception(() => serviceProvider.GetServices<IServiceEndpointProviderFactory>());
+        Assert.Null(exception);
     }
 
     [Fact]
@@ -31,7 +33,9 @@ public void AddDnsSrvServiceEndpointProviderShouldRegisterDependentServices()
         services.AddDnsSrvServiceEndpointProvider();
 
         using var serviceProvider = services.BuildServiceProvider(true);
-        _ = serviceProvider.GetServices<IServiceEndpointProviderFactory>();
+
+        var exception = Record.Exception(() => serviceProvider.GetServices<IServiceEndpointProviderFactory>());
+        Assert.Null(exception);
     }
 
     [Fact]

test/Libraries/Microsoft.Extensions.ServiceDiscovery.Yarp.Tests/YarpServiceDiscoveryTests.cs

@@ -1,15 +1,16 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Yarp.ReverseProxy.Configuration;
 using System.Net;
 using System.Net.Sockets;
-using Microsoft.Extensions.ServiceDiscovery.Dns.Resolver;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.ServiceDiscovery.Dns;
+using Microsoft.Extensions.ServiceDiscovery.Dns.Resolver;
+using Yarp.ReverseProxy.Configuration;
 
 namespace Microsoft.Extensions.ServiceDiscovery.Yarp.Tests;
 
@@ -231,7 +232,7 @@ public async Task ServiceDiscoveryDestinationResolverTests_Configuration_Disallo
     [Fact]
     public async Task ServiceDiscoveryDestinationResolverTests_Dns()
     {
-        DnsResolver resolver = new DnsResolver(new DnsResolverOptions());
+        DnsResolver resolver = new DnsResolver(TimeProvider.System, NullLogger<DnsResolver>.Instance, new OptionsWrapper<DnsResolverOptions>(new DnsResolverOptions()));
 
         await using var services = new ServiceCollection()
             .AddSingleton<IDnsResolver>(resolver)