PR feedback

dotnet · sebastienros · Jan 17, 2025 · Jan 10, 2025 · Jan 10, 2025 · Jan 11, 2025
commit 9107115090099146d50c7632fe4a0b7d3337cdc9
diff --git a/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Program.cs b/playground/CosmosEndToEnd/CosmosEndToEnd.AppHost/Program.cs
@@ -5,8 +5,7 @@
 
 var db = builder.AddAzureCosmosDB("cosmos")
                 .WithDatabase("db", database => database.Containers.Add(new("entries", "/Id")))
-                .RunAsEmulator()
-                ;
+                .RunAsEmulator();
 
 builder.AddProject<Projects.CosmosEndToEnd_ApiService>("api")
        .WithExternalHttpEndpoints()

diff --git a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBEmulatorHealthCheck.cs b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBEmulatorHealthCheck.cs
@@ -34,16 +34,13 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
 
             var databases = _databasesFactory();
 
-            if (databases.Length != 0)
+            foreach (var database in databases)
             {
-                foreach (var database in databases)
-                {
-                    var db = (await cosmosClient.CreateDatabaseIfNotExistsAsync(database.Name, cancellationToken: cancellationToken).ConfigureAwait(false)).Database;
+                var db = (await cosmosClient.CreateDatabaseIfNotExistsAsync(database.Name, cancellationToken: cancellationToken).ConfigureAwait(false)).Database;
 
-                    foreach (var container in database.Containers)
-                    {
-                        await db.CreateContainerIfNotExistsAsync(container.Name, container.PartitionKeyPath, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    }
+                foreach (var container in database.Containers)
+                {
+                    await db.CreateContainerIfNotExistsAsync(container.Name, container.PartitionKeyPath, cancellationToken: cancellationToken).ConfigureAwait(false);
                 }
             }
 

diff --git a/src/Aspire.Hosting.Azure.CosmosDB/CosmosDBDatabase.cs b/src/Aspire.Hosting.Azure.CosmosDB/CosmosDBDatabase.cs
@@ -20,7 +20,7 @@ public CosmosDBDatabase(string name)
     }
 
     /// <summary>
-    /// The topic name.
+    /// The database name.
     /// </summary>
     public string Name { get; set; }
 

diff --git a/tests/Aspire.Hosting.Azure.Tests/AzureCosmosDBEmulatorFunctionalTests.cs b/tests/Aspire.Hosting.Azure.Tests/AzureCosmosDBEmulatorFunctionalTests.cs
@@ -1,9 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Text;
+using Microsoft.Azure.Cosmos.Diagnostics;
+using Microsoft.Azure.Cosmos.Linq;
+using Microsoft.Azure.Cosmos.Query.Core.Metrics;
+using Microsoft.Azure.Cosmos.Query.Core.QueryAdvisor;
+using Microsoft.Azure.Cosmos.Resource.CosmosExceptions;
+using Microsoft.Azure.Cosmos.Tracing;
+using Microsoft.Azure.Documents;
+
 using Aspire.Components.Common.Tests;
 using Aspire.Hosting.ApplicationModel;
-using Aspire.Hosting.Tests.Utils;
 using Aspire.Hosting.Utils;
 using Microsoft.Azure.Cosmos;
 using Microsoft.EntityFrameworkCore;
@@ -270,8 +282,6 @@
 
         await app.StartAsync(cts.Token);
 
-        await app.WaitForTextAsync("Started").WaitAsync(cts.Token);
-
         var rns = app.Services.GetRequiredService<ResourceNotificationService>();
         await rns.WaitForResourceHealthyAsync(cosmos.Resource.Name, cts.Token);
 
@@ -283,15 +293,21 @@
 
         await host.StartAsync(cts.Token);
 
-        // This needs to be outside the pipeline because when the CosmosClient is disposed,
-        // there is an exception in the pipeline
         using var cosmosClient = host.Services.GetRequiredService<CosmosClient>();
 
         var database = cosmosClient.GetDatabase(databaseName);
+        var result1 = await database.ReadAsync(cancellationToken: cts.Token);
+
         var container = database.GetContainer(containerName);
+        var result2 = await container.ReadContainerAsync(cancellationToken: cts.Token);
+
+        Assert.True(IsSuccess(result1.StatusCode));
+        Assert.True(IsSuccess(result2.StatusCode));
 
-        Assert.NotNull(database);
-        Assert.NotNull(container);
+        static bool IsSuccess(HttpStatusCode httpStatusCode)
+        {
+            return ((int)httpStatusCode >= 200) && ((int)httpStatusCode <= 299);
+        }
     }
 }