From 20bccecaf762a9016a01d79eb618eac8f6ea5376 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Fri, 6 Dec 2024 12:14:14 -0600
Subject: [PATCH] Provide optional arguments for password/port when running as
 a container

---
 src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs   | 6 ++++--
 src/Aspire.Hosting.Azure.Sql/PublicAPI.Unshipped.txt | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs b/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs
index 5bd8a24120f..54beddd965d 100644
--- a/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs
+++ b/src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs
@@ -130,6 +130,8 @@ public static IResourceBuilder<AzureSqlDatabaseResource> AddDatabase(this IResou
     /// </summary>
     /// <param name="builder">The builder for the Azure SQL resource.</param>
     /// <param name="configureContainer">Callback that exposes underlying container to allow for customization.</param>
+    /// <param name="password">The parameter used to provide the administrator password for the SQL Server resource. If <see langword="null"/> a random password will be generated.</param>
+    /// <param name="port">The host port for the SQL Server.</param>
     /// <returns>A reference to the <see cref="IResourceBuilder{AzureSqlServerResource}"/> builder.</returns>
     /// <example>
     /// The following example creates an Azure SQL Database (server) resource that runs locally in a
@@ -146,7 +148,7 @@ public static IResourceBuilder<AzureSqlDatabaseResource> AddDatabase(this IResou
     /// builder.Build().Run();
     /// </code>
     /// </example>
-    public static IResourceBuilder<AzureSqlServerResource> RunAsContainer(this IResourceBuilder<AzureSqlServerResource> builder, Action<IResourceBuilder<SqlServerServerResource>>? configureContainer = null)
+    public static IResourceBuilder<AzureSqlServerResource> RunAsContainer(this IResourceBuilder<AzureSqlServerResource> builder, Action<IResourceBuilder<SqlServerServerResource>>? configureContainer = null, IResourceBuilder<ParameterResource>? password = null, int? port = null)
     {
         if (builder.ApplicationBuilder.ExecutionContext.IsPublishMode)
         {
@@ -161,7 +163,7 @@ public static IResourceBuilder<AzureSqlServerResource> RunAsContainer(this IReso
 
         RemoveAzureResources(builder.ApplicationBuilder, azureResource, azureDatabases);
 
-        var sqlContainer = builder.ApplicationBuilder.AddSqlServer(azureResource.Name);
+        var sqlContainer = builder.ApplicationBuilder.AddSqlServer(azureResource.Name, password, port);
 
         azureResource.SetInnerResource(sqlContainer.Resource);
 
diff --git a/src/Aspire.Hosting.Azure.Sql/PublicAPI.Unshipped.txt b/src/Aspire.Hosting.Azure.Sql/PublicAPI.Unshipped.txt
index 98b8747b9e5..66c4bfe8b52 100644
--- a/src/Aspire.Hosting.Azure.Sql/PublicAPI.Unshipped.txt
+++ b/src/Aspire.Hosting.Azure.Sql/PublicAPI.Unshipped.txt
@@ -14,4 +14,4 @@ Aspire.Hosting.Azure.AzureSqlServerResource.Databases.get -> System.Collections.
 override Aspire.Hosting.Azure.AzureSqlDatabaseResource.Annotations.get -> Aspire.Hosting.ApplicationModel.ResourceAnnotationCollection!
 static Aspire.Hosting.AzureSqlExtensions.AddAzureSqlServer(this Aspire.Hosting.IDistributedApplicationBuilder! builder, string! name) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.Azure.AzureSqlServerResource!>!
 static Aspire.Hosting.AzureSqlExtensions.AddDatabase(this Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.Azure.AzureSqlServerResource!>! builder, string! name, string? databaseName = null) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.Azure.AzureSqlDatabaseResource!>!
-static Aspire.Hosting.AzureSqlExtensions.RunAsContainer(this Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.Azure.AzureSqlServerResource!>! builder, System.Action<Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.SqlServerServerResource!>!>? configureContainer = null) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.Azure.AzureSqlServerResource!>!
+static Aspire.Hosting.AzureSqlExtensions.RunAsContainer(this Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.Azure.AzureSqlServerResource!>! builder, System.Action<Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.SqlServerServerResource!>!>? configureContainer = null, Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.ParameterResource!>? password = null, int? port = null) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.Azure.AzureSqlServerResource!>!