[WIP] Migrates Azure storage tests to use Testcontainers

.github/workflows/ci.yml

@@ -257,13 +257,6 @@ jobs:
       matrix:
         framework: ["net8.0", "net10.0"]
         provider: ["AzureStorage"]
-    services:
-      azurite:
-        image: mcr.microsoft.com/azure-storage/azurite:latest
-        ports:
-          - 10000:10000
-          - 10001:10001
-          - 10002:10002
     steps:
     - uses: actions/checkout@v4
     - name: Setup .NET
@@ -278,11 +271,6 @@ jobs:
         --logger "trx;LogFileName=test_results_${{ matrix.provider }}_${{ matrix.framework }}.trx"
         --
         -parallel none -noshadow
-      env:
-# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Not a secret")]
-# [SuppressMessage("Microsoft.Security", "CSCAN0090:ConfigFile", Justification="Not a secret")]
-# [SuppressMessage("Microsoft.Security", "CSCAN0220:DefaultPasswordContexts", Justification="Not a secret")]
-        ORLEANSDATACONNECTIONSTRING: "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
     - name: Archive Test Results
       if: always()
       uses: actions/upload-artifact@v4
@@ -341,8 +329,6 @@ jobs:
 # [SuppressMessage("Microsoft.Security", "CSCAN0090:ConfigFile", Justification="Not a secret")]
 # [SuppressMessage("Microsoft.Security", "CSCAN0220:DefaultPasswordContexts", Justification="Not a secret")]
         ORLEANSEVENTHUBCONNECTIONSTRING: "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
-# [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Not a secret")]
-        ORLEANSDATACONNECTIONSTRING: "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
     - name: Clean up Event Hubs emulator
       if: always()
       run: docker rm -f eventhubs-emulator
@@ -595,7 +581,7 @@ jobs:
     - name: Test
       run: dotnet test
         --framework ${{ matrix.framework }}
-        --filter "Category=${{ matrix.suite }}&Category!=Consul"
+        --filter "Category=${{ matrix.suite }}&Category!=Consul&Category!=AzureStorage"
         --blame-hang-timeout 10m
         --logger "trx;LogFileName=test_results_${{ matrix.suite }}_${{ matrix.framework }}.trx"
         --

Directory.Packages.props

@@ -105,6 +105,7 @@
     <PackageVersion Include="System.Memory.Data" Version="8.0.1" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="Testcontainers" Version="4.8.1" />
+    <PackageVersion Include="Testcontainers.Azurite" Version="4.8.1" />
     <PackageVersion Include="Testcontainers.Consul" Version="4.8.1" />
     <PackageVersion Include="Utf8Json" Version="1.3.7" />
     <PackageVersion Include="Verify.Xunit" Version="29.3.1" />

test/Benchmarks/GrainStorage/GrainStorageBenchmark.cs

@@ -68,7 +68,7 @@ public void Configure(ISiloBuilder hostBuilder)
         {
             hostBuilder.AddAzureTableGrainStorageAsDefault(options =>
             {
-                options.TableServiceClient = new(TestDefaultConfiguration.DataConnectionString);
+                options.TableServiceClient = new(AzuriteContainerManager.ConnectionString);
             });
         }
     }
@@ -79,7 +79,7 @@ public void Configure(ISiloBuilder hostBuilder)
         {
             hostBuilder.AddAzureBlobGrainStorageAsDefault(options =>
             {
-                options.BlobServiceClient = new(TestDefaultConfiguration.DataConnectionString);
+                options.BlobServiceClient = new(AzuriteContainerManager.ConnectionString);
             });
         }
     }
@@ -90,7 +90,7 @@ public void Configure(ISiloBuilder hostBuilder)
         {
             hostBuilder.AddAdoNetGrainStorageAsDefault(options =>
             {
-                options.ConnectionString = TestDefaultConfiguration.DataConnectionString;
+                options.ConnectionString = AzuriteContainerManager.ConnectionString;
             });
         }
     }

test/Benchmarks/Transactions/TransactionBenchmark.cs

@@ -72,7 +72,7 @@ public void Configure(ISiloBuilder hostBuilder)
         {
             hostBuilder.AddAzureTableTransactionalStateStorageAsDefault(options =>
             {
-                options.TableServiceClient = new(TestDefaultConfiguration.DataConnectionString);
+                options.TableServiceClient = new(AzuriteContainerManager.ConnectionString);
             });
         }
     }

test/Extensions/ServiceBus.Tests/EventHubConfigurationExtensions.cs

@@ -1,4 +1,3 @@
-using Azure.Identity;
 using Orleans.Configuration;
 using Tester.AzureUtils;
 using TestExtensions;
@@ -9,14 +8,7 @@ public static class EventHubConfigurationExtensions
     {
         public static EventHubOptions ConfigureTestDefaults(this EventHubOptions options, string eventHubName, string consumerGroup)
         {
-            if (TestDefaultConfiguration.UseAadAuthentication)
-            {
-                options.ConfigureEventHubConnection(TestDefaultConfiguration.EventHubFullyQualifiedNamespace, eventHubName, consumerGroup, TestDefaultConfiguration.TokenCredential);
-            }
-            else
-            {
-                options.ConfigureEventHubConnection(TestDefaultConfiguration.EventHubConnectionString, eventHubName, consumerGroup);
-            }
+            options.ConfigureEventHubConnection(TestDefaultConfiguration.EventHubConnectionString, eventHubName, consumerGroup);
 
             return options;
         }

test/Extensions/Tester.Cosmos/CosmosOptionsExtensions.cs

@@ -1,4 +1,3 @@
-using Azure.Identity;
 using Microsoft.Azure.Cosmos;
 using Orleans.Clustering.Cosmos;
 using Orleans.Persistence.Cosmos;
@@ -11,43 +10,19 @@ public static class CosmosOptionsExtensions
 {
     public static void ConfigureTestDefaults(this CosmosClusteringOptions options)
     {
-        if (TestDefaultConfiguration.UseAadAuthentication)
-        {
-            options.ConfigureCosmosClient(TestDefaultConfiguration.CosmosDBAccountEndpoint, TestDefaultConfiguration.TokenCredential);
-        }
-        else
-        {
-            options.ConfigureCosmosClient(GetCosmosClientUsingAccountKey());
-        }
-
+        options.ConfigureCosmosClient(GetCosmosClientUsingAccountKey());
         options.IsResourceCreationEnabled = true;
     }
 
     public static void ConfigureTestDefaults(this CosmosGrainStorageOptions options)
     {
-        if (TestDefaultConfiguration.UseAadAuthentication)
-        {
-            options.ConfigureCosmosClient(TestDefaultConfiguration.CosmosDBAccountEndpoint, TestDefaultConfiguration.TokenCredential);
-        }
-        else
-        {
-            options.ConfigureCosmosClient(GetCosmosClientUsingAccountKey());
-        }
-
+        options.ConfigureCosmosClient(GetCosmosClientUsingAccountKey());
         options.IsResourceCreationEnabled = true;
     }
 
     public static void ConfigureTestDefaults(this CosmosReminderTableOptions options)
     {
-        if (TestDefaultConfiguration.UseAadAuthentication)
-        {
-            options.ConfigureCosmosClient(TestDefaultConfiguration.CosmosDBAccountEndpoint, TestDefaultConfiguration.TokenCredential);
-        }
-        else
-        {
-            options.ConfigureCosmosClient(GetCosmosClientUsingAccountKey());
-        }
-
+        options.ConfigureCosmosClient(GetCosmosClientUsingAccountKey());
         options.IsResourceCreationEnabled = true;
     }
 
@@ -73,4 +48,4 @@ private static Func<IServiceProvider, ValueTask<CosmosClient>> GetCosmosClientUs
             return new(new CosmosClient(TestDefaultConfiguration.CosmosDBAccountEndpoint, TestDefaultConfiguration.CosmosDBAccountKey, cosmosClientOptions));
         };
     }
-}
+}

test/Extensions/TesterAzureUtils/AzureStorageOperationOptionsExtensions.cs

@@ -1,15 +1,11 @@
-using Azure.Core.Diagnostics;
 using Azure.Data.Tables;
-using Azure.Identity;
 using Azure.Storage.Blobs;
 using TestExtensions;
 
 namespace Tester.AzureUtils
 {
     public static class AzureStorageOperationOptionsExtensions
     {
-        public static DefaultAzureCredential Credential = new DefaultAzureCredential();
-
         public static Orleans.Clustering.AzureStorage.AzureStorageOperationOptions ConfigureTestDefaults(this Orleans.Clustering.AzureStorage.AzureStorageOperationOptions options)
         {
             options.TableServiceClient = GetTableServiceClient();
@@ -19,9 +15,7 @@ public static Orleans.Clustering.AzureStorage.AzureStorageOperationOptions Confi
 
         public static TableServiceClient GetTableServiceClient()
         {
-            return TestDefaultConfiguration.UseAadAuthentication
-                ? new(TestDefaultConfiguration.TableEndpoint, TestDefaultConfiguration.TokenCredential)
-                : new(TestDefaultConfiguration.DataConnectionString);
+            return new(AzuriteContainerManager.ConnectionString);
         }
 
         public static Orleans.GrainDirectory.AzureStorage.AzureStorageOperationOptions ConfigureTestDefaults(this Orleans.GrainDirectory.AzureStorage.AzureStorageOperationOptions options)
@@ -47,56 +41,28 @@ public static Orleans.Reminders.AzureStorage.AzureStorageOperationOptions Config
 
         public static Orleans.Configuration.AzureBlobStorageOptions ConfigureTestDefaults(this Orleans.Configuration.AzureBlobStorageOptions options)
         {
-            if (TestDefaultConfiguration.UseAadAuthentication)
-            {
-                options.BlobServiceClient = new(TestDefaultConfiguration.DataBlobUri, TestDefaultConfiguration.TokenCredential);
-            }
-            else
-            {
-                options.BlobServiceClient = new(TestDefaultConfiguration.DataConnectionString);
-            }
+            options.BlobServiceClient = new(AzuriteContainerManager.ConnectionString);
 
             return options;
         }
 
         public static AzureStorageJobShardOptions ConfigureTestDefaults(this AzureStorageJobShardOptions options)
         {
-            if (TestDefaultConfiguration.UseAadAuthentication)
-            {
-                options.BlobServiceClient = new(TestDefaultConfiguration.DataBlobUri, TestDefaultConfiguration.TokenCredential);
-            }
-            else
-            {
-                options.BlobServiceClient = new(TestDefaultConfiguration.DataConnectionString);
-            }
+            options.BlobServiceClient = new(AzuriteContainerManager.ConnectionString);
 
             return options;
         }
 
         public static Orleans.Configuration.AzureQueueOptions ConfigureTestDefaults(this Orleans.Configuration.AzureQueueOptions options)
         {
-            if (TestDefaultConfiguration.UseAadAuthentication)
-            {
-                options.QueueServiceClient = new(TestDefaultConfiguration.DataQueueUri, TestDefaultConfiguration.TokenCredential);
-            }
-            else
-            {
-                options.QueueServiceClient = new(TestDefaultConfiguration.DataConnectionString);
-            }
+            options.QueueServiceClient = new(AzuriteContainerManager.ConnectionString);
 
             return options;
         }
 
         public static Orleans.Configuration.AzureBlobLeaseProviderOptions ConfigureTestDefaults(this Orleans.Configuration.AzureBlobLeaseProviderOptions options)
         {
-            if (TestDefaultConfiguration.UseAadAuthentication)
-            {
-                options.BlobServiceClient = new(TestDefaultConfiguration.DataBlobUri, TestDefaultConfiguration.TokenCredential);
-            }
-            else
-            {
-                options.BlobServiceClient = new(TestDefaultConfiguration.DataConnectionString);
-            }
+            options.BlobServiceClient = new(AzuriteContainerManager.ConnectionString);
 
             return options;
         }

test/Extensions/TesterAzureUtils/StorageEmulatorUtilities.cs

@@ -7,7 +7,7 @@ public static class StorageEmulatorUtilities
     {
         public static void EnsureEmulatorIsNotUsed()
         {
-            if (TestDefaultConfiguration.DataConnectionString is { Length: > 0 } connectionString
+            if (AzuriteContainerManager.ConnectionString is { Length: > 0 } connectionString
                 && (connectionString.Contains("UseDevelopmentStorage", StringComparison.OrdinalIgnoreCase)
                 || connectionString.Contains("devstoreaccount", StringComparison.OrdinalIgnoreCase)))
             {

test/Extensions/TesterAzureUtils/Streaming/AQStreamingTests.cs

@@ -49,19 +49,7 @@ void ConfigureStreaming(string option, string value)
                     }
 
                     ConfigureStreaming("ProviderType", "AzureQueueStorage");
-                    if (TestDefaultConfiguration.UseAadAuthentication)
-                    {
-                        cb.AddKeyedAzureQueueServiceClient(AzureQueueStreamProviderName, settings =>
-                        {
-                            settings.ServiceUri = TestDefaultConfiguration.DataQueueUri;
-                            settings.Credential = TestDefaultConfiguration.TokenCredential;
-                        });
-                        ConfigureStreaming("ServiceKey", AzureQueueStreamProviderName);
-                    }
-                    else
-                    {
-                        ConfigureStreaming("ConnectionString", TestDefaultConfiguration.DataConnectionString);
-                    }
+                    ConfigureStreaming("ConnectionString", AzuriteContainerManager.ConnectionString);
 
                     var names = AzureQueueUtilities.GenerateQueueNames(builder.Options.ClusterId, queueCount);
                     for (var i = 0; i < names.Count; i++)

test/Extensions/TesterAzureUtils/Streaming/TestAzureTableStorageStreamFailureHandler.cs

@@ -1,5 +1,4 @@
 using Azure.Data.Tables;
-using Azure.Identity;
 using Microsoft.Extensions.Logging.Abstractions;
 using Orleans.Persistence.AzureStorage;
 using Orleans.Providers.Streams.PersistentStreams;
@@ -32,14 +31,7 @@ public static async Task DeleteAll()
         private static AzureTableDataManager<TableEntity> GetDataManager()
         {
             var options = new AzureStorageOperationOptions { TableName = TableName };
-            if (TestDefaultConfiguration.UseAadAuthentication)
-            {
-                options.TableServiceClient = new(TestDefaultConfiguration.TableEndpoint, TestDefaultConfiguration.TokenCredential);
-            }
-            else
-            {
-                options.TableServiceClient = new(TestDefaultConfiguration.DataConnectionString);
-            }
+            options.TableServiceClient = new(AzuriteContainerManager.ConnectionString);
             return new AzureTableDataManager<TableEntity>(options, NullLogger.Instance);
         }
     }

test/Orleans.Journaling.Tests/JournalingAzureStorageTestConfiguration.cs

@@ -7,26 +7,12 @@ internal static class JournalingAzureStorageTestConfiguration
 {
     public static void CheckPreconditionsOrThrow()
     {
-        if (TestDefaultConfiguration.UseAadAuthentication)
-        {
-            Skip.If(string.IsNullOrEmpty(TestDefaultConfiguration.DataBlobUri.ToString()), "DataBlobUri is not set. Skipping test.");
-        }
-        else
-        {
-            Skip.If(string.IsNullOrEmpty(TestDefaultConfiguration.DataConnectionString), "DataConnectionString is not set. Skipping test.");
-        }
+        Skip.If(string.IsNullOrEmpty(AzuriteContainerManager.ConnectionString), "DataConnectionString is not set. Skipping test.");
     }
 
     public static AzureAppendBlobStateMachineStorageOptions ConfigureTestDefaults(this AzureAppendBlobStateMachineStorageOptions options)
     {
-        if (TestDefaultConfiguration.UseAadAuthentication)
-        {
-            options.ConfigureBlobServiceClient(TestDefaultConfiguration.DataBlobUri, TestDefaultConfiguration.TokenCredential);
-        }
-        else
-        {
-            options.ConfigureBlobServiceClient(TestDefaultConfiguration.DataConnectionString);
-        }
+        options.ConfigureBlobServiceClient(AzuriteContainerManager.ConnectionString);
 
         return options;
     }