Use Endpoint for connection string

Author: RussKie

Aspire.sln

@@ -661,8 +661,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Azure.Npgsql.EntityF
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Components.Common.Tests", "tests\Aspire.Components.Common.Tests\Aspire.Components.Common.Tests.csproj", "{30950CEB-2232-F9FC-04FF-ADDCB8AC30A7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Hosting.Azure.ContainerRegistry", "src\Aspire.Hosting.Azure.ContainerRegistry\Aspire.Hosting.Azure.ContainerRegistry.csproj", "{6CBA29C8-FF78-4ABC-BEFA-2A53CB4DB2A3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Hosting.Azure.AppService", "src\Aspire.Hosting.Azure.AppService\Aspire.Hosting.Azure.AppService.csproj", "{5DDF8E89-FBBD-4A6F-BF32-7D2140724941}"

src/Aspire.Hosting.Azure.Storage/AzureBlobStorageResource.cs

@@ -16,6 +16,10 @@ public class AzureBlobStorageResource(string name, AzureStorageResource storage)
     IResourceWithParent<AzureStorageResource>,
     IResourceWithAzureFunctionsConfig
 {
+    // NOTE: if ever these contants are changed, the AzureBlobStorageContainerSettings in Aspire.Azure.Storage.Blobs class should be updated as well.
+    private const string Endpoint = nameof(Endpoint);
+    private const string ContainerName = nameof(ContainerName);
+
     /// <summary>
     /// Gets the parent AzureStorageResource of this AzureBlobStorageResource.
     /// </summary>
@@ -34,12 +38,12 @@ internal ReferenceExpression GetConnectionString(string? blobContainerName)
             return ConnectionStringExpression;
         }
 
-        var builder = new ReferenceExpressionBuilder();
-        builder.Append($"{ConnectionStringExpression}");
+        ReferenceExpressionBuilder builder = new();
+        builder.Append($"{Endpoint}=\"{ConnectionStringExpression}\";");
 
         if (!string.IsNullOrEmpty(blobContainerName))
         {
-            builder.Append($"ContainerName={blobContainerName};");
+            builder.Append($"{ContainerName}={blobContainerName};");
         }
 
         return builder.Build();

src/Aspire.Hosting.Azure.Storage/AzureStorageEmulatorConnectionString.cs

@@ -10,11 +10,6 @@ internal static class AzureStorageEmulatorConnectionString
     // Use defaults from https://learn.microsoft.com/azure/storage/common/storage-configure-connection-string#connect-to-the-emulator-account-using-the-shortcut
     private const string ConnectionStringHeader = "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;";
 
-    private static void AppendEndpointExpression(ReferenceExpressionBuilder builder, string key, EndpointReference endpoint)
-    {
-        builder.Append($"{key}=http://{endpoint.Property(EndpointProperty.IPV4Host)}:{endpoint.Property(EndpointProperty.Port)}/devstoreaccount1;");
-    }
-
     public static ReferenceExpression Create(EndpointReference? blobEndpoint = null, EndpointReference? queueEndpoint = null, EndpointReference? tableEndpoint = null)
     {
         var builder = new ReferenceExpressionBuilder();
@@ -34,5 +29,10 @@ public static ReferenceExpression Create(EndpointReference? blobEndpoint = null,
         }
 
         return builder.Build();
+
+        static void AppendEndpointExpression(ReferenceExpressionBuilder builder, string key, EndpointReference endpoint)
+        {
+            builder.Append($"{key}=http://{endpoint.Property(EndpointProperty.IPV4Host)}:{endpoint.Property(EndpointProperty.Port)}/devstoreaccount1;");
+        }
     }
 }

src/Components/Aspire.Azure.Storage.Blobs/AzureBlobStorageContainerSettings.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Data.Common;
 using System.Text.RegularExpressions;
 using Aspire.Azure.Common;
 
@@ -11,9 +12,9 @@ namespace Aspire.Azure.Storage.Blobs;
 /// </summary>
 public sealed partial class AzureBlobStorageContainerSettings : AzureStorageBlobsSettings, IConnectionStringSettings
 {
-    [GeneratedRegex(@"ContainerName=([^;]*);")]
-    private static partial Regex ExtractContainerName();
-
+    /// <summary>
+    ///  Gets or sets the name of the blob container.
+    /// </summary>
     public string? BlobContainerName { get; set; }
 
     void IConnectionStringSettings.ParseConnectionString(string? connectionString)
@@ -23,30 +24,15 @@ void IConnectionStringSettings.ParseConnectionString(string? connectionString)
             return;
         }
 
-        // In the emulator mode, the connection string may look like:
-        //
-        //     DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=...;BlobEndpoint=http://127.0.0.1:5555/devstoreaccount1;ContainerName=<container_name>;
-        //
-        // When run against the real Azure resources, the connection string will look similar to:
-        //
-        //      https://<storage_name>.blob.core.windows.net/ContainerName=<container_name>;
-        //
-        // Retrieve the container name from the connection string, if it is present; and then
-        // remove it as it will upset BlobServiceClient.
-
-        if (ExtractContainerName().Match(connectionString) is var match)
-        {
-            BlobContainerName = match.Groups[1].Value;
-            connectionString = connectionString.Replace(match.Value, string.Empty);
-        }
+        // NOTE: if ever these contants are changed, the AzureBlobStorageResource in Aspire.Hosting.Azure.Storage class should be updated as well.
+        const string Endpoint = nameof(Endpoint);
+        const string ContainerName = nameof(ContainerName);
 
-        if (Uri.TryCreate(connectionString, UriKind.Absolute, out var uri))
-        {
-            ServiceUri = uri;
-        }
-        else
+        DbConnectionStringBuilder builder = new() { ConnectionString = connectionString };
+        if (builder.TryGetValue(Endpoint, out var endpoint) && builder.TryGetValue(ContainerName, out var containerName))
         {
-            ConnectionString = connectionString;
+            ConnectionString = endpoint.ToString();
+            BlobContainerName = containerName.ToString();
         }
     }
 }