[DRAFT] Adding test coverage - validate arguments of public methods

src/Aspire.Hosting.Elasticsearch/ElasticsearchBuilderExtensions.cs

@@ -48,7 +48,7 @@ public static IResourceBuilder<ElasticsearchResource> AddElasticsearch(
         int? port = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         var passwordParameter = password?.Resource ?? ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-password");
 
@@ -146,7 +146,7 @@ public static IResourceBuilder<ElasticsearchResource> WithDataVolume(this IResou
     public static IResourceBuilder<ElasticsearchResource> WithDataBindMount(this IResourceBuilder<ElasticsearchResource> builder, string source)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         return builder.WithBindMount(source, "/usr/share/elasticsearch/data");
     }

src/Aspire.Hosting.Elasticsearch/ElasticsearchResource.cs

@@ -6,7 +6,9 @@ namespace Aspire.Hosting.ApplicationModel;
 /// <summary>
 /// A resource that represents a Elasticsearch
 /// </summary>
-public class ElasticsearchResource : ContainerResource, IResourceWithConnectionString
+/// <param name="name">The name of the resource.</param>
+/// <param name="password">A parameter that contains the Elasticsearch superuser password.</param>
+public class ElasticsearchResource(string name, ParameterResource password) : ContainerResource(name), IResourceWithConnectionString
 {
     /// <summary>
     /// Gets the Elasticsearch container superuser name.
@@ -22,14 +24,6 @@ public class ElasticsearchResource : ContainerResource, IResourceWithConnectionS
     //For things like cluster updates, master elections, nodes joining/leaving, shard allocation
     internal const string InternalEndpointName = "internal";
 
-    /// <param name="name">The name of the resource.</param>
-    /// <param name="password">A parameter that contains the Elasticsearch superuser password.</param>
-    public ElasticsearchResource(string name, ParameterResource password) : base(name)
-    {
-        ArgumentNullException.ThrowIfNull(password);
-        PasswordParameter = password;
-    }
-
     private EndpointReference? _primaryEndpoint;
     private EndpointReference? _internalEndpoint;
 
@@ -46,7 +40,7 @@ public ElasticsearchResource(string name, ParameterResource password) : base(nam
     /// <summary>
     /// Gets the parameter that contains the Elasticsearch superuser password.
     /// </summary>
-    public ParameterResource PasswordParameter { get; }
+    public ParameterResource PasswordParameter { get; } = password ?? throw new ArgumentNullException(nameof(password));
 
     /// <summary>
     /// Gets the connection string expression for the Elasticsearch

src/Aspire.Hosting.Garnet/GarnetBuilderExtensions.cs

@@ -55,7 +55,7 @@ public static IResourceBuilder<GarnetResource> AddGarnet(this IDistributedApplic
         int? port = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         var garnet = new GarnetResource(name);
 
@@ -140,7 +140,7 @@ public static IResourceBuilder<GarnetResource> WithDataBindMount(this IResourceB
         string source, bool isReadOnly = false)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         builder.WithBindMount(source, GarnetContainerDataDirectory, isReadOnly);
         if (!isReadOnly)

src/Aspire.Hosting.Garnet/GarnetResource.cs

@@ -1,16 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
 /// A resource that represents a Garnet resource independent of the hosting model.
 /// </summary>
 /// <param name="name">The name of the resource.</param>
-public class GarnetResource(string name) : ContainerResource(ThrowIfNull(name)), IResourceWithConnectionString
+public class GarnetResource(string name) : ContainerResource(name), IResourceWithConnectionString
 {
     internal const string PrimaryEndpointName = "tcp";
 
@@ -26,7 +23,4 @@ public class GarnetResource(string name) : ContainerResource(ThrowIfNull(name)),
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create($"{PrimaryEndpoint.Property(EndpointProperty.HostAndPort)}");
-
-    private static string ThrowIfNull([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-        => argument ?? throw new ArgumentNullException(paramName);
 }

src/Aspire.Hosting.Kafka/KafkaBuilderExtensions.cs

@@ -32,7 +32,7 @@ public static class KafkaBuilderExtensions
     public static IResourceBuilder<KafkaServerResource> AddKafka(this IDistributedApplicationBuilder builder, [ResourceName] string name, int? port = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         var kafka = new KafkaServerResource(name);
 
@@ -190,7 +190,7 @@ public static IResourceBuilder<KafkaServerResource> WithDataVolume(this IResourc
     public static IResourceBuilder<KafkaServerResource> WithDataBindMount(this IResourceBuilder<KafkaServerResource> builder, string source, bool isReadOnly = false)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         return builder
             .WithEnvironment(ConfigureLogDirs)

src/Aspire.Hosting.Keycloak/KeycloakResource.cs

@@ -1,9 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
@@ -13,7 +10,7 @@ namespace Aspire.Hosting.ApplicationModel;
 /// <param name="adminPassword">A parameter that contains the Keycloak admin password.</param>
 /// </summary>
 public sealed class KeycloakResource(string name, ParameterResource? admin, ParameterResource adminPassword)
-    : ContainerResource(ThrowIfNull(name)), IResourceWithServiceDiscovery
+    : ContainerResource(name), IResourceWithServiceDiscovery
 {
     private const string DefaultAdmin = "admin";
     internal const string PrimaryEndpointName = "tcp";
@@ -31,8 +28,5 @@ AdminUserNameParameter is not null ?
     /// <summary>
     /// Gets the parameter that contains the Keycloak admin password.
     /// </summary>
-    public ParameterResource AdminPasswordParameter { get; } = ThrowIfNull(adminPassword);
-
-    private static T ThrowIfNull<T>([NotNull] T? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-        => argument ?? throw new ArgumentNullException(paramName);
+    public ParameterResource AdminPasswordParameter { get; } = adminPassword ?? throw new ArgumentNullException(nameof(adminPassword));
 }

src/Aspire.Hosting.Keycloak/KeycloakResourceBuilderExtensions.cs

@@ -50,7 +50,7 @@ public static IResourceBuilder<KeycloakResource> AddKeycloak(
         IResourceBuilder<ParameterResource>? adminPassword = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         var passwordParameter = adminPassword?.Resource ?? ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-password");
 
@@ -128,7 +128,7 @@ public static IResourceBuilder<KeycloakResource> WithDataVolume(this IResourceBu
     public static IResourceBuilder<KeycloakResource> WithDataBindMount(this IResourceBuilder<KeycloakResource> builder, string source)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         return builder.WithBindMount(source, "/opt/keycloak/data", false);
     }
@@ -156,7 +156,7 @@ public static IResourceBuilder<KeycloakResource> WithRealmImport(
         bool isReadOnly = false)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(import);
+        ArgumentException.ThrowIfNullOrEmpty(import);
 
         var importFullPath = Path.GetFullPath(import, builder.ApplicationBuilder.AppHostDirectory);
 

src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs

@@ -44,7 +44,8 @@ public static IResourceBuilder<MilvusServerResource> AddMilvus(this IDistributed
         int? grpcPort = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
+
         var apiKeyParameter = apiKey?.Resource ??
             ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-key");
 
@@ -94,7 +95,7 @@ public static IResourceBuilder<MilvusServerResource> AddMilvus(this IDistributed
     public static IResourceBuilder<MilvusDatabaseResource> AddDatabase(this IResourceBuilder<MilvusServerResource> builder, [ResourceName] string name, string? databaseName = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         // Use the resource name as the database name if it's not provided
         databaseName ??= name;
@@ -156,6 +157,7 @@ public static IResourceBuilder<T> WithAttu<T>(this IResourceBuilder<T> builder,
     public static IResourceBuilder<MilvusServerResource> WithDataVolume(this IResourceBuilder<MilvusServerResource> builder, string? name = null, bool isReadOnly = false)
     {
         ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), "/var/lib/milvus", isReadOnly);
     }
 
@@ -169,7 +171,8 @@ public static IResourceBuilder<MilvusServerResource> WithDataVolume(this IResour
     public static IResourceBuilder<MilvusServerResource> WithDataBindMount(this IResourceBuilder<MilvusServerResource> builder, string source, bool isReadOnly = false)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
+
         return builder.WithBindMount(source, "/var/lib/milvus", isReadOnly);
     }
 
@@ -182,7 +185,8 @@ public static IResourceBuilder<MilvusServerResource> WithDataBindMount(this IRes
     public static IResourceBuilder<MilvusServerResource> WithConfigurationBindMount(this IResourceBuilder<MilvusServerResource> builder, string configurationFilePath)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(configurationFilePath);
+        ArgumentException.ThrowIfNullOrEmpty(configurationFilePath);
+
         return builder.WithBindMount(configurationFilePath, "/milvus/configs/milvus.yaml");
     }
 

src/Aspire.Hosting.Milvus/MilvusDatabaseResource.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using Aspire.Hosting.Milvus;
 
 namespace Aspire.Hosting.ApplicationModel;
@@ -16,7 +18,7 @@ public class MilvusDatabaseResource(string name, string databaseName, MilvusServ
     /// <summary>
     /// Gets the parent Milvus container resource.
     /// </summary>
-    public MilvusServerResource Parent { get; } = parent;
+    public MilvusServerResource Parent { get; } = parent ?? throw new ArgumentNullException(nameof(parent));
 
     /// <summary>
     /// Gets the connection string expression for the Milvus database.
@@ -27,5 +29,11 @@ public class MilvusDatabaseResource(string name, string databaseName, MilvusServ
     /// <summary>
     /// Gets the database name.
     /// </summary>
-    public string DatabaseName { get; } = databaseName;
+    public string DatabaseName { get; } = ThrowIfNullOrEmpty(databaseName);
+
+    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
+        return argument;
+    }
 }

src/Aspire.Hosting.MongoDB/MongoDBBuilderExtensions.cs

@@ -51,7 +51,7 @@ public static IResourceBuilder<MongoDBServerResource> AddMongoDB(this IDistribut
         IResourceBuilder<ParameterResource>? password = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         var passwordParameter = password?.Resource ?? ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-password", special: false);
 
@@ -100,7 +100,7 @@ public static IResourceBuilder<MongoDBServerResource> AddMongoDB(this IDistribut
     public static IResourceBuilder<MongoDBDatabaseResource> AddDatabase(this IResourceBuilder<MongoDBServerResource> builder, [ResourceName] string name, string? databaseName = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         // Use the resource name as the database name if it's not provided
         databaseName ??= name;
@@ -144,7 +144,8 @@ public static IResourceBuilder<MongoDBDatabaseResource> AddDatabase(this IResour
     /// <param name="configureContainer">Configuration callback for Mongo Express container resource.</param>
     /// <param name="containerName">The name of the container (Optional).</param>
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
-    public static IResourceBuilder<T> WithMongoExpress<T>(this IResourceBuilder<T> builder, Action<IResourceBuilder<MongoExpressContainerResource>>? configureContainer = null, string? containerName = null) where T : MongoDBServerResource
+    public static IResourceBuilder<T> WithMongoExpress<T>(this IResourceBuilder<T> builder, Action<IResourceBuilder<MongoExpressContainerResource>>? configureContainer = null, string? containerName = null)
+        where T : MongoDBServerResource
     {
         ArgumentNullException.ThrowIfNull(builder);
 
@@ -204,7 +205,7 @@ public static IResourceBuilder<MongoDBServerResource> WithDataVolume(this IResou
     public static IResourceBuilder<MongoDBServerResource> WithDataBindMount(this IResourceBuilder<MongoDBServerResource> builder, string source, bool isReadOnly = false)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         return builder.WithBindMount(source, "/data/db", isReadOnly);
     }
@@ -219,7 +220,7 @@ public static IResourceBuilder<MongoDBServerResource> WithDataBindMount(this IRe
     public static IResourceBuilder<MongoDBServerResource> WithInitBindMount(this IResourceBuilder<MongoDBServerResource> builder, string source, bool isReadOnly = true)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         return builder.WithBindMount(source, "/docker-entrypoint-initdb.d", isReadOnly);
     }

src/Aspire.Hosting.MongoDB/MongoDBDatabaseResource.cs

@@ -1,28 +1,20 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
 /// A resource that represents a MongoDB database. This is a child resource of a <see cref="MongoDBServerResource"/>.
 /// </summary>
-public class MongoDBDatabaseResource : Resource, IResourceWithParent<MongoDBServerResource>, IResourceWithConnectionString
+/// <param name="name">The name of the resource.</param>
+/// <param name="databaseName">The database name.</param>
+/// <param name="parent">The MongoDB server resource associated with this database.</param>
+public class MongoDBDatabaseResource(string name, string databaseName, MongoDBServerResource parent)
+    : Resource(name), IResourceWithParent<MongoDBServerResource>, IResourceWithConnectionString
 {
-    /// <summary>
-    /// A resource that represents a MongoDB database. This is a child resource of a <see cref="MongoDBServerResource"/>.
-    /// </summary>
-    /// <param name="name">The name of the resource.</param>
-    /// <param name="databaseName">The database name.</param>
-    /// <param name="parent">The MongoDB server resource associated with this database.</param>
-    public MongoDBDatabaseResource(string name, string databaseName, MongoDBServerResource parent) : base(name)
-    {
-        ArgumentNullException.ThrowIfNull(databaseName);
-        ArgumentNullException.ThrowIfNull(parent);
-
-        Parent = parent;
-        DatabaseName = databaseName;
-    }
-
     /// <summary>
     /// Gets the connection string expression for the MongoDB database.
     /// </summary>
@@ -31,10 +23,16 @@ public MongoDBDatabaseResource(string name, string databaseName, MongoDBServerRe
     /// <summary>
     /// Gets the parent MongoDB container resource.
     /// </summary>
-    public MongoDBServerResource Parent { get; }
+    public MongoDBServerResource Parent { get; } = parent ?? throw new ArgumentNullException(nameof(parent));
 
     /// <summary>
     /// Gets the database name.
     /// </summary>
-    public string DatabaseName { get; }
+    public string DatabaseName { get; } = ThrowIfNullOrEmpty(databaseName);
+
+    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
+        return argument;
+    }
 }

src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs

@@ -29,7 +29,7 @@ public static class MySqlBuilderExtensions
     public static IResourceBuilder<MySqlServerResource> AddMySql(this IDistributedApplicationBuilder builder, [ResourceName] string name, IResourceBuilder<ParameterResource>? password = null, int? port = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         var passwordParameter = password?.Resource ?? ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-password");
 
@@ -71,7 +71,7 @@ public static IResourceBuilder<MySqlServerResource> AddMySql(this IDistributedAp
     public static IResourceBuilder<MySqlDatabaseResource> AddDatabase(this IResourceBuilder<MySqlServerResource> builder, [ResourceName] string name, string? databaseName = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(name);
+        ArgumentException.ThrowIfNullOrEmpty(name);
 
         // Use the resource name as the database name if it's not provided
         databaseName ??= name;
@@ -216,7 +216,7 @@ public static IResourceBuilder<MySqlServerResource> WithDataVolume(this IResourc
     public static IResourceBuilder<MySqlServerResource> WithDataBindMount(this IResourceBuilder<MySqlServerResource> builder, string source, bool isReadOnly = false)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         return builder.WithBindMount(source, "/var/lib/mysql", isReadOnly);
     }
@@ -231,7 +231,7 @@ public static IResourceBuilder<MySqlServerResource> WithDataBindMount(this IReso
     public static IResourceBuilder<MySqlServerResource> WithInitBindMount(this IResourceBuilder<MySqlServerResource> builder, string source, bool isReadOnly = true)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        ArgumentNullException.ThrowIfNull(source);
+        ArgumentException.ThrowIfNullOrEmpty(source);
 
         return builder.WithBindMount(source, "/docker-entrypoint-initdb.d", isReadOnly);
     }