Make it easier to choose Azure SQL SKU

src/Aspire.Hosting.Azure.Sql/AzureSqlDatabaseResource.cs

@@ -16,6 +16,13 @@ namespace Aspire.Hosting.Azure;
 public class AzureSqlDatabaseResource(string name, string databaseName, AzureSqlServerResource parent)
     : Resource(name), IResourceWithParent<AzureSqlServerResource>, IResourceWithConnectionString
 {
+    /// <summary>
+    /// Free Azure SQL database offer
+    /// </summary>
+    public const string FREE_SKU = "Free";
+
+    private string _skuName = FREE_SKU;
+
     /// <summary>
     /// Gets the parent Azure SQL Database (server) resource.
     /// </summary>
@@ -32,6 +39,15 @@ public class AzureSqlDatabaseResource(string name, string databaseName, AzureSql
     /// </summary>
     public string DatabaseName { get; } = ThrowIfNullOrEmpty(databaseName);
 
+    /// <summary>
+    /// Gets or Sets the database SKU name
+    /// </summary>
+    internal string SkuName
+    {
+        get { return _skuName; }
+        set { ThrowIfNullOrEmpty(value); _skuName = value; }
+    }
+
     /// <summary>
     /// Gets the inner SqlServerDatabaseResource resource.
     /// 

src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs

@@ -14,7 +14,7 @@ namespace Aspire.Hosting;
 /// Provides extension methods for adding the Azure SQL resources to the application model.
 /// </summary>
 public static class AzureSqlExtensions
-{
+{    
     [Obsolete]
     private static IResourceBuilder<SqlServerServerResource> PublishAsAzureSqlDatabase(this IResourceBuilder<SqlServerServerResource> builder, bool useProvisioner)
     {
@@ -97,8 +97,9 @@ public static IResourceBuilder<AzureSqlServerResource> AddAzureSqlServer(this ID
     /// <param name="builder">The builder for the Azure SQL resource.</param>
     /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
     /// <param name="databaseName">The name of the database. If not provided, this defaults to the same value as <paramref name="name"/>.</param>
+    /// <param name="skuName">SKU of the database. If not provided, this defaults to the free database tier.<paramref name="name"/>.</param>
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
-    public static IResourceBuilder<AzureSqlDatabaseResource> AddDatabase(this IResourceBuilder<AzureSqlServerResource> builder, [ResourceName] string name, string? databaseName = null)
+    public static IResourceBuilder<AzureSqlDatabaseResource> AddDatabase(this IResourceBuilder<AzureSqlServerResource> builder, [ResourceName] string name, string? databaseName = null, string skuName = AzureSqlDatabaseResource.FREE_SKU)
     {
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentException.ThrowIfNullOrEmpty(name);
@@ -108,8 +109,9 @@ public static IResourceBuilder<AzureSqlDatabaseResource> AddDatabase(this IResou
 
         var azureResource = builder.Resource;
         var azureSqlDatabase = new AzureSqlDatabaseResource(name, databaseName, azureResource);
+        azureSqlDatabase.SkuName = skuName;
 
-        builder.Resource.AddDatabase(name, databaseName);
+        builder.Resource.AddDatabase(azureSqlDatabase);
 
         if (azureResource.InnerResource is null)
         {
@@ -127,6 +129,18 @@ public static IResourceBuilder<AzureSqlDatabaseResource> AddDatabase(this IResou
         }
     }
 
+    /// <summary>
+    /// Configures the Azure SQL Database to be deployed with the specified SKU
+    /// </summary>
+    /// <param name="builder">The builder for the Azure SQL resource.</param>
+    /// <param name="skuName">SKU of the database. If not provided, this defaults to the free database tier.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
+    public static IResourceBuilder<AzureSqlDatabaseResource> WithSku(this IResourceBuilder<AzureSqlDatabaseResource> builder, string skuName)
+    {
+        builder.Resource.SkuName = skuName;
+        return builder;
+    }
+
     /// <summary>
     /// Configures an Azure SQL Database (server) resource to run locally in a container.
     /// </summary>
@@ -176,7 +190,7 @@ public static IResourceBuilder<AzureSqlServerResource> RunAsContainer(this IReso
                 throw new InvalidOperationException($"Could not find a {nameof(AzureSqlDatabaseResource)} with name {database.Key}.");
             }
 
-            var innerDb = sqlContainer.AddDatabase(database.Key, database.Value);
+            var innerDb = sqlContainer.AddDatabase(database.Key, database.Value.DatabaseName);
             existingDb.SetInnerResource(innerDb.Resource);
         }
 
@@ -195,9 +209,63 @@ private static void RemoveAzureResources(IDistributedApplicationBuilder appBuild
     }
 
     private static void CreateSqlServer(
-        AzureResourceInfrastructure infrastructure,
+           AzureResourceInfrastructure infrastructure,
         IDistributedApplicationBuilder distributedApplicationBuilder,
         IReadOnlyDictionary<string, string> databases)
+    {
+        var sqlServer = CreateSqlServerResourceOnly(infrastructure, distributedApplicationBuilder);
+
+        foreach (var database in databases)
+        {
+            var bicepIdentifier = Infrastructure.NormalizeBicepIdentifier(database.Key);
+            var databaseName = database.Value;
+            var sqlDatabase = new SqlDatabase(bicepIdentifier)
+            {
+                Parent = sqlServer,
+                Name = databaseName,
+            };
+
+            sqlDatabase.Sku = new SqlSku() { Name = "GP_S_Gen5_2" };
+            sqlDatabase.UseFreeLimit = true;
+            sqlDatabase.FreeLimitExhaustionBehavior = FreeLimitExhaustionBehavior.AutoPause;
+
+            infrastructure.Add(sqlDatabase);
+        }
+    }
+
+    private static void CreateSqlServer(
+        AzureResourceInfrastructure infrastructure,
+        IDistributedApplicationBuilder distributedApplicationBuilder,
+        IReadOnlyDictionary<string, AzureSqlDatabaseResource> databases)
+    {
+        var sqlServer = CreateSqlServerResourceOnly(infrastructure, distributedApplicationBuilder);
+
+        foreach (var database in databases)
+        {
+            var bicepIdentifier = Infrastructure.NormalizeBicepIdentifier(database.Key);
+            var databaseName = database.Value.DatabaseName;
+            var sqlDatabase = new SqlDatabase(bicepIdentifier)
+            {
+                Parent = sqlServer,
+                Name = databaseName,
+            };
+
+            if (database.Value.SkuName == AzureSqlDatabaseResource.FREE_SKU)
+            {
+                sqlDatabase.Sku = new SqlSku() { Name = "GP_S_Gen5_2" };
+                sqlDatabase.UseFreeLimit = true;
+                sqlDatabase.FreeLimitExhaustionBehavior = FreeLimitExhaustionBehavior.AutoPause;
+            } else
+            {
+                sqlDatabase.Sku = new SqlSku() { Name = database.Value.SkuName };
+            }
+
+            infrastructure.Add(sqlDatabase);
+        }
+    }
+
+    private static SqlServer CreateSqlServerResourceOnly(AzureResourceInfrastructure infrastructure,
+        IDistributedApplicationBuilder distributedApplicationBuilder)
     {
         var azureResource = (AzureSqlServerResource)infrastructure.AspireResource;
 
@@ -263,22 +331,12 @@ private static void CreateSqlServer(
             });
         }
 
-        foreach (var databaseNames in databases)
-        {
-            var bicepIdentifier = Infrastructure.NormalizeBicepIdentifier(databaseNames.Key);
-            var databaseName = databaseNames.Value;
-            var sqlDatabase = new SqlDatabase(bicepIdentifier)
-            {
-                Parent = sqlServer,
-                Name = databaseName
-            };
-            infrastructure.Add(sqlDatabase);
-        }
-
         infrastructure.Add(new ProvisioningOutput("sqlServerFqdn", typeof(string)) { Value = sqlServer.FullyQualifiedDomainName });
 
         // We need to output name to externalize role assignments.
         infrastructure.Add(new ProvisioningOutput("name", typeof(string)) { Value = sqlServer.Name });
+
+        return sqlServer;
     }
 
     internal static SqlServerAzureADAdministrator AddActiveDirectoryAdministrator(AzureResourceInfrastructure infra, SqlServer sqlServer, BicepValue<Guid> principalId, BicepValue<string> principalName)

src/Aspire.Hosting.Azure.Sql/AzureSqlServerResource.cs

@@ -12,7 +12,7 @@ namespace Aspire.Hosting.Azure;
 /// </summary>
 public class AzureSqlServerResource : AzureProvisioningResource, IResourceWithConnectionString
 {
-    private readonly Dictionary<string, string> _databases = new Dictionary<string, string>(StringComparers.ResourceName);
+    private readonly Dictionary<string, AzureSqlDatabaseResource> _databases = new Dictionary<string, AzureSqlDatabaseResource>(StringComparers.ResourceName);
     private readonly bool _createdWithInnerResource;
 
     /// <summary>
@@ -77,11 +77,11 @@ public ReferenceExpression ConnectionStringExpression
     /// <summary>
     /// A dictionary where the key is the resource name and the value is the database name.
     /// </summary>
-    public IReadOnlyDictionary<string, string> Databases => _databases;
+    public IReadOnlyDictionary<string, AzureSqlDatabaseResource> Databases => _databases;
 
-    internal void AddDatabase(string name, string databaseName)
+    internal void AddDatabase(AzureSqlDatabaseResource db)
     {
-        _databases.TryAdd(name, databaseName);
+        _databases.TryAdd(db.Name, db);
     }
 
     internal void SetInnerResource(SqlServerServerResource innerResource)

src/Aspire.Hosting.Azure.Sql/README.md

@@ -1,6 +1,6 @@
 # Aspire.Hosting.Azure.Sql library
 
-Provides extension methods and resource definitions for a .NET Aspire AppHost to configure Azure SQL Server.
+Provides extension methods and resource definitions for a .NET Aspire AppHost to configure Azure SQL DB.
 
 ## Getting started
 
@@ -54,6 +54,24 @@ The `WithReference` method configures a connection in the `MyService` project na
 builder.AddSqlServerClient("sqldata");
 ```
 
+## Azure SQL DB defaults
+
+Unless otherwise specified, the Azure SQL DB created will be a 2vCores General Purpose Serverless database (GP_S_Gen5_2) with the free offer enabled.
+
+Read more about the free offer here: [Deploy Azure SQL Database for free](https://learn.microsoft.com/en-us/azure/azure-sql/database/free-offer?view=azuresql)
+
+The free offer is configured so that when the maximum usage limit is reached, the database is stopped to avoid incurring in unexpected costs.
+
+If you want don't want to use the free offer and instead deploy the database with the service level of your choice, specify the SKU name when adding the database resource:
+
+```csharp
+var sql = builder.AddAzureSqlServer("sql")
+                 .AddDatabase("db", "my-db-name").WithSku("HS_Gen5_2");
+
+var myService = builder.AddProject<Projects.MyService>()
+                       .WithReference(sql);
+```
+
 ## Additional documentation
 
 * https://learn.microsoft.com/dotnet/framework/data/adonet/sql/