Fix Azure Queue Streaming IConfiguration provider

Directory.Packages.props

@@ -10,6 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- System packages -->
+    <PackageVersion Include="Aspire.Azure.Storage.Queues" Version="9.0.0" />
     <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" NoWarn="NU5104" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />

src/Azure/Orleans.Streaming.AzureStorage/Hosting/AzureQueueStreamProviderBuilder.cs

@@ -63,9 +63,22 @@ private static Action<OptionsBuilder<AzureQueueOptions>> GetQueueOptionBuilder(I
 
                     if (!string.IsNullOrEmpty(connectionString))
                     {
-                        options.QueueServiceClient = Uri.TryCreate(connectionString, UriKind.Absolute, out var uri)
-                            ? new QueueServiceClient(uri)
-                            : new QueueServiceClient(connectionString);
+                        if (Uri.TryCreate(connectionString, UriKind.Absolute, out var uri))
+                        {
+                            if (!string.IsNullOrEmpty(uri.Query))
+                            {
+                                // SAS URI
+                                options.QueueServiceClient = new QueueServiceClient(uri);
+                            }
+                            else
+                            {
+                                options.QueueServiceClient = new QueueServiceClient(uri, credential: new Azure.Identity.DefaultAzureCredential());
+                            }
+                        }
+                        else
+                        {
+                            options.QueueServiceClient = new QueueServiceClient(connectionString);
+                        }
                     }
                 }
             });

src/Azure/Orleans.Streaming.AzureStorage/Orleans.Streaming.AzureStorage.csproj

@@ -23,6 +23,7 @@
   <ItemGroup>
     <ProjectReference Include="$(SourceRoot)src\Orleans.Streaming\Orleans.Streaming.csproj" />
     <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Azure.Storage.Blobs" />
     <PackageReference Include="Azure.Storage.Queues" />
     <PackageReference Include="Azure.Data.Tables" />

src/Orleans.Streaming/Hosting/SiloBuilderStreamingExtensions.cs

@@ -5,7 +5,7 @@
 namespace Orleans.Hosting
 {
     /// <summary>
-    /// Extension methods for confiiguring streaming on silos.
+    /// Extension methods for configuring streaming on silos.
     /// </summary>
     public static class SiloBuilderStreamingExtensions
     {

src/Orleans.TestingHost/InProcTestCluster.cs

@@ -497,8 +497,19 @@ public async Task InitializeClientAsync()
             DisableDefaults = true,
         });
 
+        foreach (var hostDelegate in Options.ClientHostConfigurationDelegates)
+        {
+            hostDelegate(hostBuilder);
+        }
+
         hostBuilder.UseOrleansClient(clientBuilder =>
         {
+            clientBuilder.Configure<ClusterOptions>(o =>
+            {
+                o.ClusterId = Options.ClusterId;
+                o.ServiceId = Options.ServiceId;
+            });
+
             if (Options.UseTestClusterMembership)
             {
                 clientBuilder.Services.AddSingleton<IGatewayListProvider>(_membershipTable);
@@ -509,11 +520,6 @@ public async Task InitializeClientAsync()
 
         TryConfigureFileLogging(Options, hostBuilder.Services, "TestClusterClient");
 
-        foreach (var hostDelegate in Options.ClientHostConfigurationDelegates)
-        {
-            hostDelegate(hostBuilder);
-        }
-
         ClientHost = hostBuilder.Build();
         await ClientHost.StartAsync();
     }
@@ -557,8 +563,19 @@ public async Task<InProcessSiloHandle> CreateSiloAsync(InProcessTestSiloSpecific
                 services.Configure<SiloMessagingOptions>(op => op.ResponseTimeout = TimeSpan.FromMilliseconds(1000000));
             }
 
+            foreach (var hostDelegate in Options.SiloHostConfigurationDelegates)
+            {
+                hostDelegate(siloOptions, appBuilder);
+            }
+
             appBuilder.UseOrleans(siloBuilder =>
             {
+                siloBuilder.Configure<ClusterOptions>(o =>
+                {
+                    o.ClusterId = Options.ClusterId;
+                    o.ServiceId = Options.ServiceId;
+                });
+
                 siloBuilder.Configure<SiloOptions>(o =>
                 {
                     o.SiloName = siloOptions.SiloName;
@@ -590,11 +607,6 @@ public async Task<InProcessSiloHandle> CreateSiloAsync(InProcessTestSiloSpecific
                 }
             });
 
-            foreach (var hostDelegate in Options.SiloHostConfigurationDelegates)
-            {
-                hostDelegate(siloOptions, appBuilder);
-            }
-
             var host = appBuilder.Build();
             InitializeTestHooksSystemTarget(host);
             await host.StartAsync();