fully move to testcontainer of elasticsearch 6.8.x with http

Author: Alex McCool

src/ElasticLogger.Test/APMTests.cs

@@ -0,0 +1,30 @@
+using ElasticLogger.Test.Factory;
+using ElasticLogger.Test.Fixture;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace ElasticLogger.Test
+{
+    public class APMTests : IClassFixture<ElasticsearchFixture>
+    {
+        private readonly ElasticsearchFixture _fixture;
+        private readonly ITestOutputHelper _output;
+
+        public APMTests(ElasticsearchFixture fixture, ITestOutputHelper outputHelper)
+        {
+            _fixture = fixture;
+            _output = outputHelper;
+        }
+
+        [Fact]
+        public async Task LoggingThing()
+        {
+            var factory = new CustomWebApplicationFactory<Startup>();
+
+            var client = factory.CreateClient();
+
+            await client.GetAsync("/");
+        }
+    }
+}

src/ElasticLogger.Test/ContainerESTests.cs

@@ -15,17 +15,24 @@
 
 namespace ElasticLogger.Test
 {
-    public class ElasticsearchLoggerFilterTests : IClassFixture<ESFixture>
+    public class ElasticsearchLoggerFilterTests : IClassFixture<ElasticsearchFixture>
     {
         private readonly ITestOutputHelper _output;
-        private readonly ESFixture _fixture;
+        private readonly ElasticsearchFixture _fixture;
 
-        public ElasticsearchLoggerFilterTests(ESFixture fixture, ITestOutputHelper output)
+        public ElasticsearchLoggerFilterTests(ElasticsearchFixture fixture, ITestOutputHelper output)
         {
             _fixture = fixture;
             _output = output;
         }
 
+        private ConnectionSettings connectionSettings(Uri endpoint)
+        {
+            var connSettings = new ConnectionSettings(_fixture.Endpoint);
+            connSettings.ServerCertificateValidationCallback((obj, cert, chain, policyerrors) => true);
+            return connSettings;
+        }
+
         [Fact]
         public async Task No_categories_for_es_should_use_default()
         {
@@ -64,7 +71,7 @@ public async Task No_categories_for_es_should_use_default()
             logger.LogTrace("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -125,7 +132,7 @@ public async Task Configured_categories_dont_log_for_config()
             logger.LogTrace("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -181,7 +188,7 @@ public async Task No_elasticsearch_section_should_use_default_log_level()
             logger.LogTrace("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -287,7 +294,7 @@ private async Task LevelTesterPositive(string source, LogLevel logLevel)
             logger.Log(logLevel, new EventId(), circularRefObj, null, (circle, exception) => "");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -337,7 +344,7 @@ private async Task LevelTesterNegative(string source, LogLevel logLevel)
             logger.Log(logLevel, new EventId(), circularRefObj, null, (circle, exception) => "");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -359,7 +366,7 @@ private async Task LevelTesterNegative(string source, LogLevel logLevel)
         public async Task Load_ES_with_explicit_type_write_and_search()
         {
             await _fixture.ReadyAsync();
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
 
             var tweet = new Tweet
@@ -420,7 +427,7 @@ public async Task Missing_ElasticSearch_Section_In_Config_Should_Use_Logging_Def
             logger.LogTrace("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -472,7 +479,8 @@ public async Task Missing_ElasticSearch_Section_In_Config_Should_Use_Logging_Def
             logger.LogError("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -489,6 +497,8 @@ public async Task Missing_ElasticSearch_Section_In_Config_Should_Use_Logging_Def
             Assert.Single(dyndocs.Documents);
         }
 
+
+
         [Fact]
         public async Task Existing_ElasticSearch_Section_In_Config_Should_Be_Used_For_Log_Levels_Positive_Match()
         {
@@ -525,7 +535,7 @@ public async Task Existing_ElasticSearch_Section_In_Config_Should_Be_Used_For_Lo
             logger.LogTrace("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -578,7 +588,7 @@ public async Task Existing_ElasticSearch_Section_In_Config_Should_Be_Used_For_Lo
             logger.LogCritical("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -632,7 +642,7 @@ public async Task Existing_ElasticSearch_Section_With_Category_Should_Match_Top_
             logger.LogInformation("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -686,7 +696,7 @@ public async Task Existing_ElasticSearch_Section_With_Category_Should_Match_Top_
             logger.LogInformation("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -740,7 +750,7 @@ public async Task Existing_ElasticSearch_Section_With_Category_Should_Match_Bott
             logger.LogCritical("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 
@@ -794,7 +804,7 @@ public async Task Existing_ElasticSearch_Section_With_Category_Should_Match_Bott
             logger.LogInformation("bananas taste yucky");
 
             var delayTask = Task.Delay(TimeSpan.FromSeconds(5));
-            var client = new ElasticClient(new ConnectionSettings(_fixture.Endpoint));
+            var client = new ElasticClient(connectionSettings(_fixture.Endpoint));
             await client.PingAsync();
             await delayTask;
 

src/ElasticLogger.Test/ElasticsearchLoggerFilterTests.cs

@@ -3,16 +3,17 @@
 using System.IO;
 using System.Text;
 using AM.Extensions.Logging.ElasticSearch;
+using ElasticLogger.Test.Fixture;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace ElasticLogger.Test
+namespace ElasticLogger.Test.Factory
 {
-    public class CustomWebApplicationFactory<TStartup> : WebApplicationFactory<TStartup> where TStartup: class
+    public class CustomWebApplicationFactory<TStartup> : WebApplicationFactory<TStartup> where TStartup : class
     {
         protected override IWebHostBuilder CreateWebHostBuilder()
         {

src/ElasticLogger.Test/CustomWebApplicationFactory.cs renamed to src/ElasticLogger.Test/Factory/CustomWebApplicationFactory.cs

@@ -8,7 +8,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace ElasticLogger.Test
+namespace ElasticLogger.Test.Factory
 {
     class Startup
     {