Bump Elasticsearch.Xunit (#322)

elastic · Jul 10, 2023 · 5fe813d · 5fe813d
1 parent ba49177
commit 5fe813d
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 22 deletions.
diff --git a/examples/Elastic.Extensions.Logging.Example/Elastic.Extensions.Logging.Example.csproj b/examples/Elastic.Extensions.Logging.Example/Elastic.Extensions.Logging.Example.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.6" />
-    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.0" />
+    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.3" />
     <PackageReference Include="NEST" Version="7.8.1" />
   </ItemGroup>
 

diff --git a/examples/Elastic.Serilog.Sinks.Example/Elastic.Serilog.Sinks.Example.csproj b/examples/Elastic.Serilog.Sinks.Example/Elastic.Serilog.Sinks.Example.csproj
@@ -11,7 +11,7 @@
       <PackageReference Include="Elastic.Apm" Version="1.22.0" />
       <PackageReference Include="Serilog" Version="2.10.0" />
       <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
-      <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.0" />
+      <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.3" />
       <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.4" />
       <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
       <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />

diff --git a/examples/aspnetcore-with-extensions-logging/aspnetcore-with-extensions-logging.csproj b/examples/aspnetcore-with-extensions-logging/aspnetcore-with-extensions-logging.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.0" />
+    <PackageReference Include="Elastic.Elasticsearch.Ephemeral" Version="0.4.3" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.4" />
   </ItemGroup>
 

diff --git a/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogCluster.cs b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogCluster.cs
@@ -1,3 +1,5 @@
+using Elastic.Elasticsearch.Ephemeral;
+using Elastic.Elasticsearch.Xunit;
 using Elasticsearch.IntegrationDefaults;
 using Xunit;
 
@@ -8,4 +10,13 @@ namespace Elastic.Serilog.Sinks.IntegrationTests;
 public class SerilogCluster : TestClusterBase
 {
 	public SerilogCluster() : base(9205) { }
+	protected SerilogCluster(int port, ClusterFeatures features) : base(port, features) { }
+}
+
+public class SecurityCluster : SerilogCluster
+{
+	public SecurityCluster() : base(9206, ClusterFeatures.XPack | ClusterFeatures.Security | ClusterFeatures.SSL)
+	{
+
+	}
 }
diff --git a/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogTestBase.cs b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogTestBase.cs
@@ -2,16 +2,22 @@
 using System.Collections.Generic;
 using Elastic.Clients.Elasticsearch;
 using Elastic.Elasticsearch.Xunit.XunitPlumbing;
+using Elasticsearch.IntegrationDefaults;
 using Xunit.Abstractions;
 
-namespace Elastic.Serilog.Sinks.IntegrationTests
+namespace Elastic.Serilog.Sinks.IntegrationTests;
+
+public abstract class SerilogTestBase<TCluster> : IClusterFixture<TCluster>
+	where TCluster : TestClusterBase, new()
 {
-	public abstract class SerilogTestBase : IClusterFixture<SerilogCluster>
-	{
-        protected ElasticsearchClient Client { get; }
+	protected ElasticsearchClient Client { get; }
 
-		protected SerilogTestBase(SerilogCluster cluster, ITestOutputHelper output, Func<ICollection<Uri>, ICollection<Uri>>? alterNodes = null) =>
-			Client = cluster.CreateClient(output, alterNodes);
-	}
+	protected SerilogTestBase(SerilogCluster cluster, ITestOutputHelper output, Func<ICollection<Uri>, ICollection<Uri>>? alterNodes = null) =>
+		Client = cluster.CreateClient(output, alterNodes);
+}
 
+public abstract class SerilogTestBase : SerilogTestBase<SerilogCluster>
+{
+	protected SerilogTestBase(SerilogCluster cluster, ITestOutputHelper output, Func<ICollection<Uri>, ICollection<Uri>>? alterNodes = null)
+		: base(cluster, output, alterNodes) { }
 }
diff --git a/tests-integration/Elasticsearch.IntegrationDefaults/Elasticsearch.IntegrationDefaults.csproj b/tests-integration/Elasticsearch.IntegrationDefaults/Elasticsearch.IntegrationDefaults.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.4" />
-    <PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.4.0" />
+    <PackageReference Include="Elastic.Elasticsearch.Xunit" Version="0.4.3" />
     <PackageReference Include="Elastic.Ingest.Elasticsearch" Version="0.5.3" />
 
   </ItemGroup>

diff --git a/tests-integration/Elasticsearch.IntegrationDefaults/IngestionCluster.cs b/tests-integration/Elasticsearch.IntegrationDefaults/IngestionCluster.cs
@@ -2,11 +2,14 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.Net.Security;
 using Elastic.Clients.Elasticsearch;
+using Elastic.Elasticsearch.Ephemeral;
 using Elastic.Elasticsearch.Xunit;
 using Elastic.Transport;
 using Xunit;
 using Xunit.Abstractions;
+using static Elastic.Elasticsearch.Managed.DetectedProxySoftware;
 
 [assembly: TestFramework("Elastic.Elasticsearch.Xunit.Sdk.ElasticTestFramework", "Elastic.Elasticsearch.Xunit")]
 
@@ -15,24 +18,19 @@ namespace Elasticsearch.IntegrationDefaults
 	/// <summary> Declare our cluster that we want to inject into our test classes </summary>
 	public abstract class TestClusterBase : XunitClusterBase
 	{
-		protected TestClusterBase(int port = 9200) : base(new XunitClusterConfiguration("8.4.0")
-		{
-			StartingPortNumber = port
-		}) { }
+		protected TestClusterBase(int port = 9200, ClusterFeatures features = ClusterFeatures.None)
+			: base(new XunitClusterConfiguration("8.4.0", features) { StartingPortNumber = port, AutoWireKnownProxies = true }) { }
 
 		public ElasticsearchClient CreateClient(ITestOutputHelper output, Func<ICollection<Uri>, ICollection<Uri>>? alterNodes = null) =>
-			this.GetOrAddClient(_ =>
+			this.GetOrAddClient(cluster =>
 			{
-				var hostName = (System.Diagnostics.Process.GetProcessesByName("mitmproxy").Any()
-					? "ipv4.fiddler"
-					: "localhost");
-				var nodes = NodesUris(hostName);
+				var isCi = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CI"));
+				var nodes = NodesUris();
 				if (alterNodes != null) nodes = alterNodes(nodes);
 				var connectionPool = new StaticNodePool(nodes);
-				var isCi = !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CI"));
 				var settings = new ElasticsearchClientSettings(connectionPool)
-					.Proxy(new Uri("http://ipv4.fiddler:8080"), null!, null!)
 					.RequestTimeout(TimeSpan.FromSeconds(5))
+					.ServerCertificateValidationCallback(CertificateValidations.AllowAll)
 					.OnRequestCompleted(d =>
 					{
 						try
@@ -54,6 +52,12 @@ public ElasticsearchClient CreateClient(ITestOutputHelper output, Func<ICollecti
 					.EnableDebugMode()
 					//do not request server stack traces on CI, too noisy
 					.IncludeServerStackTraceOnError(!isCi);
+				if (cluster.DetectedProxy != None)
+				{
+					var proxyUrl = cluster.DetectedProxy == Fiddler ? "ipv4.fiddler" : "localhost";
+					settings = settings.Proxy(new Uri($"http://{proxyUrl}:8080"), null!, null!);
+				}
+
 				return new ElasticsearchClient(settings);
 			});
 	}