Fixing the usage of the GetValueAsync on ParameterResource

aaronpowell · aaronpowell · commit 91cddc3d019c · 2025-07-30T02:55:23.000Z
diff --git a/src/CommunityToolkit.Aspire.Hosting.ActiveMQ/ActiveMQBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.ActiveMQ/ActiveMQBuilderExtensions.cs
@@ -175,9 +175,9 @@ private static IResourceBuilder<T> WithJolokiaHealthCheck<T>(
         string basicAuthentication = string.Empty;
         builder.ApplicationBuilder.Eventing.Subscribe<BeforeResourceStartedEvent>(builder.Resource, async (_, ct) =>
         {
-            Uri baseUri = new Uri(endpoint.Url, UriKind.Absolute);
+            Uri baseUri = new (endpoint.Url, UriKind.Absolute);
             string userName = (await builder.Resource.UserNameReference.GetValueAsync(ct))!;
-            string password = (await ((IValueProvider)builder.Resource.PasswordParameter).GetValueAsync(ct))!;
+            string password = (await builder.Resource.PasswordParameter.GetValueAsync(ct))!;
             basicAuthentication = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{userName}:{password}"));
             uri = new UriBuilder(baseUri)
             {
diff --git a/src/CommunityToolkit.Aspire.Hosting.MySql.Extensions/MySqlBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.MySql.Extensions/MySqlBuilderExtensions.cs
@@ -135,21 +135,21 @@ private static void ConfigureDbGateContainer(EnvironmentCallbackContext context,
         }
     }
 
-    internal static void ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)
+    internal static async Task ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)
     {
         var mysqlInstances = applicationBuilder.Resources.OfType<MySqlServerResource>();
 
         string ADMINER_SERVERS = context.EnvironmentVariables.GetValueOrDefault("ADMINER_SERVERS")?.ToString() ?? string.Empty;
 
         var new_servers = mysqlInstances.ToDictionary(
              mysqlServer => mysqlServer.Name,
-             mysqlServer =>
+             async mysqlServer =>
              {
                  return new AdminerLoginServer
                  {
                      Server = mysqlServer.Name,
                      UserName = "root",
-                     Password = mysqlServer.PasswordParameter.Value,
+                     Password = await mysqlServer.PasswordParameter.GetValueAsync(default),
                      Driver = "server" // driver for MySQL is called 'server'
                  };
              });
@@ -166,7 +166,7 @@ internal static void ConfigureAdminerContainer(EnvironmentCallbackContext contex
             {
                 if (!servers.ContainsKey(server.Key))
                 {
-                    servers!.Add(server.Key, server.Value);
+                    servers!.Add(server.Key, await server.Value);
                 }
             }
             string servers_json = JsonSerializer.Serialize(servers);
diff --git a/src/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions/PostgresBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions/PostgresBuilderExtensions.cs
@@ -44,7 +44,7 @@ public static IResourceBuilder<PostgresServerResource> WithDbGate(this IResource
         var dbGateBuilder = DbGateBuilderExtensions.AddDbGate(builder.ApplicationBuilder, containerName);
 
         dbGateBuilder
-            .WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder));            
+            .WithEnvironment(context => ConfigureDbGateContainer(context, builder.ApplicationBuilder));
 
         configureContainer?.Invoke(dbGateBuilder);
 
@@ -105,9 +105,9 @@ private static void ConfigureDbGateContainer(EnvironmentCallbackContext context,
 
         foreach (var postgresServer in postgresInstances)
         {
-            var userParameter = postgresServer.UserNameParameter is null 
-             ?  ReferenceExpression.Create($"postgres")
-             :  ReferenceExpression.Create($"{postgresServer.UserNameParameter}");
+            var userParameter = postgresServer.UserNameParameter is null
+             ? ReferenceExpression.Create($"postgres")
+             : ReferenceExpression.Create($"{postgresServer.UserNameParameter}");
 
             // DbGate assumes Postgres is being accessed over a default Aspire container network and hardcodes the resource address
             // This will need to be refactored once updated service discovery APIs are available
@@ -141,22 +141,30 @@ private static void ConfigureDbGateContainer(EnvironmentCallbackContext context,
     }
 
 
-    internal static void ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)
+    internal static async Task ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)
     {
         var postgresInstances = applicationBuilder.Resources.OfType<PostgresServerResource>();
 
         string ADMINER_SERVERS = context.EnvironmentVariables.GetValueOrDefault("ADMINER_SERVERS")?.ToString() ?? string.Empty;
 
         var new_servers = postgresInstances.ToDictionary(
              postgresServer => postgresServer.Name,
-             postgresServer =>
+             async postgresServer =>
              {
-                 var user = postgresServer.UserNameParameter?.Value ?? "postgres";
+                 var user = postgresServer.UserNameParameter switch
+                 {
+                     null => "postgres",
+                     _ => await postgresServer.UserNameParameter.GetValueAsync(default)
+                 };
                  return new AdminerLoginServer
                  {
                      Server = postgresServer.Name,
                      UserName = user,
-                     Password = postgresServer.PasswordParameter.Value,
+                     Password = postgresServer.PasswordParameter switch
+                     {
+                         null => string.Empty,
+                         _ => await postgresServer.PasswordParameter.GetValueAsync(default)
+                     },
                      Driver = "pgsql"
                  };
              });
@@ -173,7 +181,7 @@ internal static void ConfigureAdminerContainer(EnvironmentCallbackContext contex
             {
                 if (!servers.ContainsKey(server.Key))
                 {
-                    servers!.Add(server.Key, server.Value);
+                    servers!.Add(server.Key, await server.Value);
                 }
             }
             string servers_json = JsonSerializer.Serialize(servers);
diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions/SqlServerBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions/SqlServerBuilderExtensions.cs
@@ -135,21 +135,21 @@ private static void ConfigureDbGateContainer(EnvironmentCallbackContext context,
         }
     }
 
-    private static void ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)
+    private static async Task ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)
     {
         var sqlServerInstances = applicationBuilder.Resources.OfType<SqlServerServerResource>();
 
         string ADMINER_SERVERS = context.EnvironmentVariables.GetValueOrDefault("ADMINER_SERVERS")?.ToString() ?? string.Empty;
 
         var new_servers = sqlServerInstances.ToDictionary(
              sqlServerServerResource => sqlServerServerResource.Name,
-             sqlServerServerResource =>
+             async sqlServerServerResource =>
              {
                  return new AdminerLoginServer
                  {
                      Server = sqlServerServerResource.Name,
                      UserName = "sa",
-                     Password = sqlServerServerResource.PasswordParameter.Value,
+                     Password = await sqlServerServerResource.PasswordParameter.GetValueAsync(default),
                      Driver = "mssql"
                  };
              });
@@ -166,7 +166,7 @@ private static void ConfigureAdminerContainer(EnvironmentCallbackContext context
             {
                 if (!servers.ContainsKey(server.Key))
                 {
-                    servers!.Add(server.Key, server.Value);
+                    servers!.Add(server.Key, await server.Value);
                 }
             }
             string servers_json = JsonSerializer.Serialize(servers);
diff --git a/src/Shared/Dapr/Core/DaprDistributedApplicationLifecycleHook.cs b/src/Shared/Dapr/Core/DaprDistributedApplicationLifecycleHook.cs
@@ -82,7 +82,7 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
                 {
                     foreach (var secretAnnotation in secretAnnotations)
                     {
-                        secrets[secretAnnotation.Key] = (await ((IValueProvider)secretAnnotation).GetValueAsync(cancellationToken))!;
+                        secrets[secretAnnotation.Key] = (await secretAnnotation.Value.GetValueAsync(cancellationToken))!;
                     }
                     // We need to append the secret store path to the resources path
                     onDemandResourcesPaths.TryGetValue("secretstore", out var secretStorePath);
diff --git a/src/Shared/Dapr/Core/DaprMetadataResourceBuilderExtensions.cs b/src/Shared/Dapr/Core/DaprMetadataResourceBuilderExtensions.cs
@@ -74,7 +74,7 @@ public static IResourceBuilder<IDaprComponentResource> WithMetadata(this IResour
             schema.Spec.Metadata.Add(new DaprComponentSpecMetadataValue
             {
                 Name = name,
-                Value = (await ((IValueProvider)parameterResource).GetValueAsync(default))!
+                Value = (await parameterResource.GetValueAsync(default))!
             });
         }));
     }
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Adminer.Tests/AddAdminerTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Adminer.Tests/AddAdminerTests.cs
@@ -5,6 +5,7 @@
 using Aspire.Hosting.Utils;
 
 namespace CommunityToolkit.Aspire.Hosting.Adminer.Tests;
+
 public class AddAdminerTests
 {
     [Fact]
@@ -189,8 +190,11 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()
                 {
                     Driver = "pgsql",
                     Server = postgresResource1.Name,
-                    Password = postgresResource1.PasswordParameter.Value,
-                    UserName = postgresResource1.UserNameParameter?.Value ?? "postgres"
+                    Password = await postgresResource1.PasswordParameter.GetValueAsync(default),
+                    UserName = postgresResource1.UserNameParameter switch {
+                        null => "postgres",
+                        _ => await postgresResource1.UserNameParameter.GetValueAsync(default)
+                    }
                 }
             },
             {
@@ -199,8 +203,11 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()
                 {
                     Driver = "pgsql",
                     Server = postgresResource2.Name,
-                    Password = postgresResource2.PasswordParameter.Value,
-                    UserName = postgresResource2.UserNameParameter?.Value ?? "postgres"
+                    Password = await postgresResource2.PasswordParameter.GetValueAsync(default),
+                    UserName = postgresResource2.UserNameParameter switch {
+                        null => "postgres",
+                        _ => await postgresResource2.UserNameParameter.GetValueAsync(default)
+                    }
                 }
             },
             {
@@ -209,7 +216,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()
                 {
                     Driver = "mssql",
                     Server = sqlserverResource1.Name,
-                    Password = sqlserverResource1.PasswordParameter.Value,
+                    Password = await sqlserverResource1.PasswordParameter.GetValueAsync(default),
                     UserName = "sa"
                 }
             },
@@ -219,7 +226,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()
                 {
                     Driver = "mssql",
                     Server = sqlserverResource2.Name,
-                    Password = sqlserverResource2.PasswordParameter.Value,
+                    Password = await sqlserverResource2.PasswordParameter.GetValueAsync(default),
                     UserName = "sa"
                 }
             },
@@ -229,7 +236,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()
                 {
                     Driver = "server",
                     Server = mysqlResource1.Name,
-                    Password = mysqlResource1.PasswordParameter.Value,
+                    Password = await mysqlResource1.PasswordParameter.GetValueAsync(default),
                     UserName = "root"
                 }
             },
@@ -239,7 +246,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()
                 {
                     Driver = "server",
                     Server = mysqlResource2.Name,
-                    Password = mysqlResource2.PasswordParameter.Value,
+                    Password = await mysqlResource2.PasswordParameter.GetValueAsync(default),
                     UserName = "root"
                 }
             }
diff --git a/tests/CommunityToolkit.Aspire.Hosting.DbGate.Tests/AddDbGateTests.cs b/tests/CommunityToolkit.Aspire.Hosting.DbGate.Tests/AddDbGateTests.cs
@@ -331,7 +331,7 @@ public async Task WithDbGateShouldAddAnnotationsForMultipleDatabaseTypes()
             async item =>
             {
                 Assert.Equal("PASSWORD_postgres2", item.Key);
-                var expectedPassword = await ((IValueProvider)postgresResource2.PasswordParameter).GetValueAsync(default);
+                var expectedPassword = await postgresResource2.PasswordParameter.GetValueAsync(default);
                 Assert.Equal(expectedPassword, item.Value);
             },
             item =>
@@ -402,7 +402,7 @@ public async Task WithDbGateShouldAddAnnotationsForMultipleDatabaseTypes()
             async item =>
             {
                 Assert.Equal("PASSWORD_sqlserver1", item.Key);
-                var expectedPassword = await ((IValueProvider)sqlserverResource1.PasswordParameter).GetValueAsync(default);
+                var expectedPassword = await sqlserverResource1.PasswordParameter.GetValueAsync(default);
                 Assert.Equal(expectedPassword, item.Value);
             },
             item =>
@@ -433,7 +433,7 @@ public async Task WithDbGateShouldAddAnnotationsForMultipleDatabaseTypes()
             async item =>
             {
                 Assert.Equal("PASSWORD_sqlserver2", item.Key);
-                var expectedPassword = await ((IValueProvider)sqlserverResource2.PasswordParameter).GetValueAsync(default);
+                var expectedPassword = await sqlserverResource2.PasswordParameter.GetValueAsync(default);
                 Assert.Equal(expectedPassword, item.Value);
             },
             item =>
@@ -464,7 +464,7 @@ public async Task WithDbGateShouldAddAnnotationsForMultipleDatabaseTypes()
             async item =>
             {
                 Assert.Equal("PASSWORD_mysql1", item.Key);
-                var expectedPassword = await ((IValueProvider)mysqlResource1.PasswordParameter).GetValueAsync(default);
+                var expectedPassword = await mysqlResource1.PasswordParameter.GetValueAsync(default);
                 Assert.Equal(expectedPassword, item.Value);
             },
             item =>
@@ -495,7 +495,7 @@ public async Task WithDbGateShouldAddAnnotationsForMultipleDatabaseTypes()
             async item =>
             {
                 Assert.Equal("PASSWORD_mysql2", item.Key);
-                var expectedPassword = await ((IValueProvider)mysqlResource2.PasswordParameter).GetValueAsync(default);
+                var expectedPassword = await mysqlResource2.PasswordParameter.GetValueAsync(default);
                 Assert.Equal(expectedPassword, item.Value);
             },
             item =>
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests/AddMeilisearchTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests/AddMeilisearchTests.cs
@@ -5,6 +5,7 @@
 using Aspire.Hosting;
 
 namespace CommunityToolkit.Aspire.Hosting.Meilisearch.Tests;
+
 public class AddMeilisearchTests
 {
     [Fact]
@@ -51,7 +52,7 @@ public async Task AddMeilisearchContainerAddsAnnotationMetadata()
         var appBuilder = DistributedApplication.CreateBuilder();
         var masterKey = ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(appBuilder, $"masterKey");
 
-        appBuilder.Configuration["Parameters:masterkey"] = masterKey.Value;
+        appBuilder.Configuration["Parameters:masterkey"] = await masterKey.GetValueAsync(default);
         var masterKeyParameter = appBuilder.AddParameter(masterKey.Name);
         var meilisearch = appBuilder.AddMeilisearch("meilisearch", masterKeyParameter);
 
@@ -101,7 +102,7 @@ public async Task MeilisearchCreatesConnectionString()
         var connectionStringResource = Assert.Single(appModel.Resources.OfType<MeilisearchResource>()) as IResourceWithConnectionString;
         var connectionString = await connectionStringResource.GetConnectionStringAsync();
 
-        Assert.Equal($"Endpoint=http://localhost:27020;MasterKey={meilisearch.Resource.MasterKeyParameter.Value}", connectionString);
+        Assert.Equal($"Endpoint=http://localhost:27020;MasterKey={await meilisearch.Resource.MasterKeyParameter.GetValueAsync(default)}", connectionString);
         Assert.Equal("Endpoint=http://{meilisearch.bindings.http.host}:{meilisearch.bindings.http.port};MasterKey={meilisearch-masterKey.value}", connectionStringResource.ConnectionStringExpression.ValueExpression);
     }
 }
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests/MeilisearchFunctionalTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Meilisearch.Tests/MeilisearchFunctionalTests.cs
@@ -69,7 +69,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
             var meilisearch1 = builder1.AddMeilisearch("meilisearch");
 
-            var masterKey = meilisearch1.Resource.MasterKeyParameter.Value;
+            var masterKey = await meilisearch1.Resource.MasterKeyParameter.GetValueAsync(default);
 
             if (useVolume)
             {
diff --git a/tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests/ResourceCreationTests.cs b/tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests/ResourceCreationTests.cs
@@ -37,7 +37,7 @@ public async Task WithAdminerAddsAnnotations()
                 {
                     Driver = "server",
                     Server = mysqlResource.Name,
-                    Password = mysqlResource.PasswordParameter.Value,
+                    Password = await mysqlResource.PasswordParameter.GetValueAsync(default),
                     UserName = "root"
                 }
             },
@@ -138,7 +138,7 @@ public async Task WithAdminerAddsAnnotationsForMultipleMySqlResource()
                 {
                     Driver = "server",
                     Server = mysqlResource1.Name,
-                    Password = mysqlResource1.PasswordParameter.Value,
+                    Password = await mysqlResource1.PasswordParameter.GetValueAsync(default),
                     UserName = "root"
                 }
             },
@@ -148,7 +148,7 @@ public async Task WithAdminerAddsAnnotationsForMultipleMySqlResource()
                 {
                     Driver = "server",
                     Server = mysqlResource2.Name,
-                    Password = mysqlResource2.PasswordParameter.Value,
+                    Password = await mysqlResource2.PasswordParameter.GetValueAsync(default),
                     UserName = "root"
                 }
             }
@@ -199,10 +199,10 @@ public async Task WithDbGateAddsAnnotations()
                 Assert.Equal("USER_mysql1", item.Key);
                 Assert.Equal("root", item.Value);
             },
-            item =>
+            async item =>
             {
                 Assert.Equal("PASSWORD_mysql1", item.Key);
-                Assert.Equal(mysqlResource.PasswordParameter.Value, item.Value);
+                Assert.Equal(await mysqlResource.PasswordParameter.GetValueAsync(default), item.Value);
             },
             item =>
             {
@@ -317,10 +317,10 @@ public async Task WithDbGateAddsAnnotationsForMultipleMySqlResource()
                 Assert.Equal("USER_mysql1", item.Key);
                 Assert.Equal("root", item.Value);
             },
-            item =>
+            async item =>
             {
                 Assert.Equal("PASSWORD_mysql1", item.Key);
-                Assert.Equal(mysqlResource1.PasswordParameter.Value, item.Value);
+                Assert.Equal(await mysqlResource1.PasswordParameter.GetValueAsync(default), item.Value);
             },
             item =>
             {
@@ -347,10 +347,10 @@ public async Task WithDbGateAddsAnnotationsForMultipleMySqlResource()
                 Assert.Equal("USER_mysql2", item.Key);
                 Assert.Equal("root", item.Value);
             },
-            item =>
+            async item =>
             {
                 Assert.Equal("PASSWORD_mysql2", item.Key);
-                Assert.Equal(mysqlResource2.PasswordParameter.Value, item.Value);
+                Assert.Equal(await mysqlResource2.PasswordParameter.GetValueAsync(default), item.Value);
             },
             item =>
             {
diff --git a/tests/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.Tests/ResourceCreationTests.cs b/tests/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.Tests/ResourceCreationTests.cs
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Redis.Extensions.Tests/ResourceCreationTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Redis.Extensions.Tests/ResourceCreationTests.cs
diff --git a/tests/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.Tests/ResourceCreationTests.cs b/tests/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.Tests/ResourceCreationTests.cs

Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,9 @@ private static IResourceBuilder<T> WithJolokiaHealthCheck<T>(`
`175`	`175`	`string basicAuthentication = string.Empty;`
`176`	`176`	`builder.ApplicationBuilder.Eventing.Subscribe<BeforeResourceStartedEvent>(builder.Resource, async (_, ct) =>`
`177`	`177`	`{`
`178`		`- Uri baseUri = new Uri(endpoint.Url, UriKind.Absolute);`
	`178`	`+ Uri baseUri = new (endpoint.Url, UriKind.Absolute);`
`179`	`179`	`string userName = (await builder.Resource.UserNameReference.GetValueAsync(ct))!;`
`180`		`- string password = (await ((IValueProvider)builder.Resource.PasswordParameter).GetValueAsync(ct))!;`
	`180`	`+ string password = (await builder.Resource.PasswordParameter.GetValueAsync(ct))!;`
`181`	`181`	`basicAuthentication = "Basic " + Convert.ToBase64String(Encoding.UTF8.GetBytes($"{userName}:{password}"));`
`182`	`182`	`uri = new UriBuilder(baseUri)`
`183`	`183`	`{`
Original file line number	Diff line number	Diff line change
`@@ -135,21 +135,21 @@ private static void ConfigureDbGateContainer(EnvironmentCallbackContext context,`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`		`- internal static void ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)`
	`138`	`+ internal static async Task ConfigureAdminerContainer(EnvironmentCallbackContext context, IDistributedApplicationBuilder applicationBuilder)`
`139`	`139`	`{`
`140`	`140`	`var mysqlInstances = applicationBuilder.Resources.OfType<MySqlServerResource>();`
`141`	`141`
`142`	`142`	`string ADMINER_SERVERS = context.EnvironmentVariables.GetValueOrDefault("ADMINER_SERVERS")?.ToString() ?? string.Empty;`
`143`	`143`
`144`	`144`	`var new_servers = mysqlInstances.ToDictionary(`
`145`	`145`	`mysqlServer => mysqlServer.Name,`
`146`		`- mysqlServer =>`
	`146`	`+ async mysqlServer =>`
`147`	`147`	`{`
`148`	`148`	`return new AdminerLoginServer`
`149`	`149`	`{`
`150`	`150`	`Server = mysqlServer.Name,`
`151`	`151`	`UserName = "root",`
`152`		`- Password = mysqlServer.PasswordParameter.Value,`
	`152`	`+ Password = await mysqlServer.PasswordParameter.GetValueAsync(default),`
`153`	`153`	`Driver = "server" // driver for MySQL is called 'server'`
`154`	`154`	`};`
`155`	`155`	`});`
`@@ -166,7 +166,7 @@ internal static void ConfigureAdminerContainer(EnvironmentCallbackContext contex`
`166`	`166`	`{`
`167`	`167`	`if (!servers.ContainsKey(server.Key))`
`168`	`168`	`{`
`169`		`- servers!.Add(server.Key, server.Value);`
	`169`	`+ servers!.Add(server.Key, await server.Value);`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`	`string servers_json = JsonSerializer.Serialize(servers);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell`
`82`	`82`	`{`
`83`	`83`	`foreach (var secretAnnotation in secretAnnotations)`
`84`	`84`	`{`
`85`		`- secrets[secretAnnotation.Key] = (await ((IValueProvider)secretAnnotation).GetValueAsync(cancellationToken))!;`
	`85`	`+ secrets[secretAnnotation.Key] = (await secretAnnotation.Value.GetValueAsync(cancellationToken))!;`
`86`	`86`	`}`
`87`	`87`	`// We need to append the secret store path to the resources path`
`88`	`88`	`onDemandResourcesPaths.TryGetValue("secretstore", out var secretStorePath);`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static IResourceBuilder<IDaprComponentResource> WithMetadata(this IResour`
`74`	`74`	`schema.Spec.Metadata.Add(new DaprComponentSpecMetadataValue`
`75`	`75`	`{`
`76`	`76`	`Name = name,`
`77`		`- Value = (await ((IValueProvider)parameterResource).GetValueAsync(default))!`
	`77`	`+ Value = (await parameterResource.GetValueAsync(default))!`
`78`	`78`	`});`
`79`	`79`	`}));`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Aspire.Hosting.Utils;`
`6`	`6`
`7`	`7`	`namespace CommunityToolkit.Aspire.Hosting.Adminer.Tests;`
	`8`	`+`
`8`	`9`	`public class AddAdminerTests`
`9`	`10`	`{`
`10`	`11`	`[Fact]`
`@@ -189,8 +190,11 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()`
`189`	`190`	`{`
`190`	`191`	`Driver = "pgsql",`
`191`	`192`	`Server = postgresResource1.Name,`
`192`		`- Password = postgresResource1.PasswordParameter.Value,`
`193`		`- UserName = postgresResource1.UserNameParameter?.Value ?? "postgres"`
	`193`	`+ Password = await postgresResource1.PasswordParameter.GetValueAsync(default),`
	`194`	`+ UserName = postgresResource1.UserNameParameter switch {`
	`195`	`+ null => "postgres",`
	`196`	`+ _ => await postgresResource1.UserNameParameter.GetValueAsync(default)`
	`197`	`+ }`
`194`	`198`	`}`
`195`	`199`	`},`
`196`	`200`	`{`
`@@ -199,8 +203,11 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()`
`199`	`203`	`{`
`200`	`204`	`Driver = "pgsql",`
`201`	`205`	`Server = postgresResource2.Name,`
`202`		`- Password = postgresResource2.PasswordParameter.Value,`
`203`		`- UserName = postgresResource2.UserNameParameter?.Value ?? "postgres"`
	`206`	`+ Password = await postgresResource2.PasswordParameter.GetValueAsync(default),`
	`207`	`+ UserName = postgresResource2.UserNameParameter switch {`
	`208`	`+ null => "postgres",`
	`209`	`+ _ => await postgresResource2.UserNameParameter.GetValueAsync(default)`
	`210`	`+ }`
`204`	`211`	`}`
`205`	`212`	`},`
`206`	`213`	`{`
`@@ -209,7 +216,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()`
`209`	`216`	`{`
`210`	`217`	`Driver = "mssql",`
`211`	`218`	`Server = sqlserverResource1.Name,`
`212`		`- Password = sqlserverResource1.PasswordParameter.Value,`
	`219`	`+ Password = await sqlserverResource1.PasswordParameter.GetValueAsync(default),`
`213`	`220`	`UserName = "sa"`
`214`	`221`	`}`
`215`	`222`	`},`
`@@ -219,7 +226,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()`
`219`	`226`	`{`
`220`	`227`	`Driver = "mssql",`
`221`	`228`	`Server = sqlserverResource2.Name,`
`222`		`- Password = sqlserverResource2.PasswordParameter.Value,`
	`229`	`+ Password = await sqlserverResource2.PasswordParameter.GetValueAsync(default),`
`223`	`230`	`UserName = "sa"`
`224`	`231`	`}`
`225`	`232`	`},`
`@@ -229,7 +236,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()`
`229`	`236`	`{`
`230`	`237`	`Driver = "server",`
`231`	`238`	`Server = mysqlResource1.Name,`
`232`		`- Password = mysqlResource1.PasswordParameter.Value,`
	`239`	`+ Password = await mysqlResource1.PasswordParameter.GetValueAsync(default),`
`233`	`240`	`UserName = "root"`
`234`	`241`	`}`
`235`	`242`	`},`
`@@ -239,7 +246,7 @@ public async Task WithAdminerShouldAddAnnotationsForMultipleDatabaseTypes()`
`239`	`246`	`{`
`240`	`247`	`Driver = "server",`
`241`	`248`	`Server = mysqlResource2.Name,`
`242`		`- Password = mysqlResource2.PasswordParameter.Value,`
	`249`	`+ Password = await mysqlResource2.PasswordParameter.GetValueAsync(default),`
`243`	`250`	`UserName = "root"`
`244`	`251`	`}`
`245`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)`
`69`	`69`
`70`	`70`	`var meilisearch1 = builder1.AddMeilisearch("meilisearch");`
`71`	`71`
`72`		`- var masterKey = meilisearch1.Resource.MasterKeyParameter.Value;`
	`72`	`+ var masterKey = await meilisearch1.Resource.MasterKeyParameter.GetValueAsync(default);`
`73`	`73`
`74`	`74`	`if (useVolume)`
`75`	`75`	`{`