fix: MongoCollectionProvider.Check had a condition wrong

aneoconsulting · Jan 24, 2025 · 945730f · 945730f
1 parent ca23f07
commit 945730f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Adaptors/MongoDB/src/Common/MongoCollectionProvider.cs b/Adaptors/MongoDB/src/Common/MongoCollectionProvider.cs
@@ -16,6 +16,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -68,10 +69,10 @@ public Task<HealthCheckResult> Check(HealthCheckTag tag)
          HealthCheckTag.Startup or HealthCheckTag.Readiness => Task.FromResult(isInitialized_
                                                                                  ? HealthCheckResult.Healthy()
                                                                                  : HealthCheckResult
-                                                                                   .Unhealthy($"Mongo Collection<{nameof(TData)}> not initialized yet.")),
-         HealthCheckTag.Liveness => Task.FromResult(isInitialized_ && mongoCollection_ is null
+                                                                                   .Unhealthy($"Mongo Collection<{typeof(TData)}> not initialized yet.")),
+         HealthCheckTag.Liveness => Task.FromResult(isInitialized_ && mongoCollection_ is not null
                                                       ? HealthCheckResult.Healthy()
-                                                      : HealthCheckResult.Unhealthy($"Mongo Collection<{nameof(TData)}> not initialized yet.")),
+                                                      : HealthCheckResult.Unhealthy($"Mongo Collection<{typeof(TData)}> not initialized yet.")),
          _ => throw new ArgumentOutOfRangeException(nameof(tag),
                                                     tag,
                                                     null),

diff --git a/Common/tests/Pollster/PollsterTest.cs b/Common/tests/Pollster/PollsterTest.cs
@@ -356,9 +356,8 @@ await testServiceProvider.Pollster.Init(CancellationToken.None)
 
     Console.WriteLine(res.Description);
 
-    Assert.AreEqual(new StringBuilder().AppendLine(desc)
-                                       .ToString(),
-                    healthResult.Description);
+    Assert.AreEqual(desc,
+                    healthResult.Description?.Trim());
     Assert.AreEqual(new AggregateException(ex).Message,
                     healthResult.Exception?.Message);
     Assert.AreEqual(HealthStatus.Unhealthy,

diff --git a/Utils/src/HealthCheckResultCombiner.cs b/Utils/src/HealthCheckResultCombiner.cs
@@ -49,8 +49,9 @@ public static async Task<HealthCheckResult> Combine(HealthCheckTag
   {
     var exceptions  = new List<Exception>();
     var data        = new Dictionary<string, object>();
-    var description = new StringBuilder(desc);
+    var description = new StringBuilder();
     var worstStatus = HealthStatus.Healthy;
+    description.AppendLine(desc);
 
     foreach (var healthCheckResult in await providers.Select(p => p.Check(tag))
                                                      .WhenAll()