chore: fix mongodb

Author: followynne

samples/WebApp/HostedServices/MongoDbService.cs

@@ -1,19 +1,18 @@
-using Mongo2Go;
+using EphemeralMongo;
 
 namespace WebApp.HostedServices;
 
 public class MongoDbService : IHostedService, IAsyncDisposable
 {
-    private static MongoDbRunner? _runner;
+    private static IMongoRunner? _runner;
 
-    public Task StartAsync(CancellationToken cancellationToken)
+    public async Task StartAsync(CancellationToken cancellationToken)
     {
-        _runner ??= MongoDbRunner.StartForDebugging(
-            singleNodeReplSet: true,
-            additionalMongodArguments: "--quiet",
-            port: 27099);
-
-        return Task.CompletedTask;
+        _runner ??= await MongoRunner.RunAsync(new()
+        {
+            UseSingleNodeReplicaSet = true,
+            MongoPort = 27099
+        }, cancellationToken);
     }
 
     public Task StopAsync(CancellationToken cancellationToken)

samples/WebApp/WebApp.csproj

@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Mongo2Go" Version="4.1.0" />
+        <PackageReference Include="EphemeralMongo" Version="3.0.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="8.0.3"/>
         <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4"/>
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>

src/Serilog.Ui.RavenDbProvider/Serilog.Ui.RavenDbProvider.csproj

@@ -4,7 +4,7 @@
 		<PackageId>Serilog.Ui.RavenDbProvider</PackageId>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
-		<Version>2.2.0</Version>
+		<Version>3.0.0</Version>
 
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>

tests/Serilog.Ui.MongoDbProvider.Tests/Serilog.Ui.MongoDbProvider.Tests.csproj

@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Mongo2Go" Version="4.1.0" />
+		<PackageReference Include="EphemeralMongo" Version="3.0.0" />
 		<PackageReference Include="Serilog.Sinks.MongoDB" Version="7.0.0" />
 	</ItemGroup>
 

tests/Serilog.Ui.MongoDbProvider.Tests/Util/BaseIntegrationTest.cs

@@ -23,11 +23,9 @@ public class BaseIntegrationTest : IIntegrationRunner
 
         public Task DisposeAsync() => Task.CompletedTask;
 
-        public virtual Task InitializeAsync()
+        public virtual async Task InitializeAsync()
         {
-            Builder = MongoDbDataProviderBuilder.Build();
-
-            return Task.CompletedTask;
+            Builder = await MongoDbDataProviderBuilder.Build();
         }
 
         public IDataProvider GetDataProvider() => Guard.Against.Null(Builder?.Sut);
@@ -38,7 +36,7 @@ protected virtual void Dispose(bool disposing)
         {
             if (!_disposedValue)
             {
-                if (disposing && Builder != null)
+                if (disposing && Builder != null && Builder.Runner != null)
                 {
                     Builder.Runner.Dispose();
                 }

tests/Serilog.Ui.MongoDbProvider.Tests/Util/Builders/MongoDbDataProviderBuilder.cs

@@ -1,4 +1,5 @@
-using Mongo2Go;
+using System.Threading.Tasks;
+using EphemeralMongo;
 using MongoDB.Driver;
 using Serilog;
 using Serilog.Ui.Common.Tests.DataSamples;
@@ -11,29 +12,33 @@ public class MongoDbDataProviderBuilder
     {
         private const string DefaultDbName = "IntegrationTests";
 
-        internal readonly MongoDbRunner Runner;
-        internal readonly MongoDbOptions Options;
-        internal readonly IMongoClient Client;
-        internal readonly IMongoDatabase Database;
+        internal IMongoRunner? Runner;
+        internal MongoDbOptions Options;
+        private IMongoClient? Client;
         internal IDataProvider? Sut;
         internal LogModelPropsCollector? Collector;
 
         private MongoDbDataProviderBuilder(MongoDbOptions options)
         {
             Options = options;
-            (Runner, Client) = IntegrationDbGeneration.Generate(options);
-            Database = Client!.GetDatabase(options.DatabaseName);
-
-            Sut = new MongoDbDataProvider(Client, Options);
-            Collector = Seed(Options.ConnectionString);
         }
 
-        public static MongoDbDataProviderBuilder Build()
+        public static Task<MongoDbDataProviderBuilder> Build()
         {
             var options = new MongoDbOptions()
                 .WithCollectionName("LogCollection")
                 .WithDatabaseName(DefaultDbName);
-            return new MongoDbDataProviderBuilder(options);
+            return new MongoDbDataProviderBuilder(options).Init();
+        }
+
+        private async Task<MongoDbDataProviderBuilder> Init()
+        {
+            (Runner, Client) = await IntegrationDbGeneration.Generate(Options);
+
+            Sut = new MongoDbDataProvider(Client, Options);
+            Collector = Seed(Options.ConnectionString);
+
+            return this;
         }
 
         private static LogModelPropsCollector Seed(string? connectionString)

tests/Serilog.Ui.MongoDbProvider.Tests/Util/IntegrationDbGeneration.cs

@@ -1,5 +1,6 @@
 using System;
-using Mongo2Go;
+using System.Threading.Tasks;
+using EphemeralMongo;
 using MongoDB.Driver;
 using Serilog.Ui.Core.Extensions;
 using Serilog.Ui.MongoDbProvider;
@@ -8,9 +9,14 @@ namespace MongoDb.Tests.Util;
 
 public static class IntegrationDbGeneration
 {
-    public static (MongoDbRunner runner, IMongoClient client) Generate(MongoDbOptions options)
+    public static async Task<(IMongoRunner runner, IMongoClient client)> Generate(MongoDbOptions options)
     {
-        var runner = MongoDbRunner.Start(singleNodeReplSet: true);
+        // don't add an using here - runner should be disposed by the Generate invoker!
+        var runner = await MongoRunner.RunAsync(new()
+        {
+            UseSingleNodeReplicaSet = true,
+            MongoPort = 27098
+        });
         var settings = MongoClientSettings.FromConnectionString(runner.ConnectionString);
         settings.ServerSelectionTimeout = TimeSpan.FromSeconds(10);
         var client = new MongoClient(settings);