Update azure integration tests to use AzureServiceBus Administration endpoint for infra creation

Author: TraGicCode

tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/AzureServiceBusEndToEndTestBase.cs

@@ -2,140 +2,29 @@
 
 namespace BuslyCLI.Console.Tests.EndToEnd.AzureServiceBus;
 
-public class AzureServiceBusEndToEndTestBase : EndToEnd.SingletonTestFixtureBase<ServiceBusContainer>
+public class AzureServiceBusEndToEndTestBase : SingletonTestFixtureBase<ServiceBusContainer>
 {
     protected ServiceBusContainer ServiceBusContainer => Container;
 
-    protected IList<Tuple<string, string>> GeneratedTestEndpointNamesAndSubscribedEvent =
-        new List<Tuple<string, string>>();
-
+    // GetConnectionString() uses UriBuilder which appends a trailing slash to the endpoint
+    // (e.g. "sb://localhost:12345/"). NServiceBus's InjectEmulatorAdminPort does a string replace
+    // looking for "Endpoint=sb://localhost:12345;" (no trailing slash), so it never matches and
+    // the admin client ends up using the AMQP port instead of port 5300.
+    // This method builds the connection string without the trailing slash so port injection works correctly.
+    protected string GetNServiceBusConnectionString()
+    {
+        var amqpPort = Container.GetMappedPublicPort(ServiceBusBuilder.ServiceBusPort);
+        return $"Endpoint=sb://{Container.Hostname}:{amqpPort};SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;";
+    }
 
     protected override ServiceBusContainer CreateContainer()
     {
-        var azureEmulatorConfigFile = CreateAzureEmulatorConfigFile();
-        var emulatorConfigFilePath = Path.GetTempFileName();
-        File.WriteAllText(emulatorConfigFilePath, azureEmulatorConfigFile);
         return new ServiceBusBuilder("mcr.microsoft.com/azure-messaging/servicebus-emulator:latest")
             .WithAcceptLicenseAgreement(true)
-            // .WithConfig("./EndToEnd/AzureServiceBus/azure-emulator-config.json")
-            .WithConfig(emulatorConfigFilePath)
+            .WithPortBinding(ServiceBusBuilder.ServiceBusHttpPort, ServiceBusBuilder.ServiceBusHttpPort)
             .Build();
     }
 
-    private string CreateAzureEmulatorConfigFile()
-    {
-        for (var i = 0; i < 20; i++)
-        {
-            GeneratedTestEndpointNamesAndSubscribedEvent.Add(new Tuple<string, string>(
-                $"TestEndpoint-{Guid.NewGuid():N}", $"MessageContracts.Events.OrderCreated-{Guid.NewGuid():N}"));
-        }
-
-        // Build queue entries as JSON strings
-        var queueEntries = GeneratedTestEndpointNamesAndSubscribedEvent.Select(endpoint => $@"{{
-                ""Name"": ""{endpoint.Item1}"",
-                ""Properties"": {{
-                    ""DeadLetteringOnMessageExpiration"": false,
-                    ""DefaultMessageTimeToLive"": ""PT1H"",
-                    ""LockDuration"": ""PT1M"",
-                    ""MaxDeliveryCount"": 10,
-                    ""RequiresDuplicateDetection"": false,
-                    ""RequiresSession"": false
-                }}
-            }}")
-            .ToList();
-
-        // Join all queue entries into the queues array
-        string queuesJson = string.Join(",\n", queueEntries);
-
-        // Create Subscriptions to the event
-        var topicEntries = GeneratedTestEndpointNamesAndSubscribedEvent.Select(endpoint => $@"{{
-                            ""Name"": ""{endpoint.Item2}"",
-                            ""Properties"": {{
-                              ""DefaultMessageTimeToLive"": ""PT1H"",
-                              ""DuplicateDetectionHistoryTimeWindow"": ""PT20S"",
-                              ""RequiresDuplicateDetection"": false
-                            }},
-                            ""Subscriptions"": [
-                                {{
-                                ""Name"": ""{endpoint.Item1}"",
-                                ""Properties"": {{
-                                  ""DeadLetteringOnMessageExpiration"": false,
-                                  ""DefaultMessageTimeToLive"": ""PT1H"",
-                                  ""LockDuration"": ""PT1M"",
-                                  ""MaxDeliveryCount"": 3,
-                                  ""ForwardDeadLetteredMessagesTo"": """",
-                                  ""ForwardTo"": ""{endpoint.Item1}"",
-                                  ""RequiresSession"": false
-                                }},
-                                ""Rules"": [
-                                  {{
-                                    ""Name"": ""$default"",
-                                    ""Properties"": {{
-                                      ""FilterType"": ""Sql"",
-                                      ""SqlFilter"": {{
-                                        ""SqlExpression"": ""1=1""
-                                      }}
-                                    }}
-                                  }}
-                                ]
-                              }}
-                            ]
-                          }}")
-            .ToList();
-
-        string topicsJson = string.Join(",\n", topicEntries);
-
-        // Final config string
-        string emulatorConfig = $@"{{
-            ""UserConfig"": {{
-                ""Namespaces"": [
-                    {{
-                        ""Name"": ""sbemulatorns"",
-                        ""Queues"": [
-                            {queuesJson}
-                        ],
-                        ""Topics"": [
-                         {topicsJson}
-                        ]
-                    }}
-                ],
-                ""Logging"": {{
-                    ""Type"": ""File""
-                }}
-            }}
-        }}";
-        // string emulatorConfig = $@"{{
-        //     ""UserConfig"": {{
-        //         ""Namespaces"": [
-        //             {{
-        //                 ""Name"": ""sbemulatorns"",
-        //                 ""Queues"": [
-        //                     {queuesJson}
-        //                 ],
-        //                 ""Topics"": [
-        //                   {{
-        //                     ""Name"": ""MessageContracts.Events.OrderCreated"",
-        //                     ""Properties"": {{
-        //                       ""DefaultMessageTimeToLive"": ""PT1H"",
-        //                       ""DuplicateDetectionHistoryTimeWindow"": ""PT20S"",
-        //                       ""RequiresDuplicateDetection"": false
-        //                     }},
-        //                     ""Subscriptions"": [
-        //                         {subscriptionsJson}
-        //                     ]
-        //                   }}
-        //                 ]
-        //             }}
-        //         ],
-        //         ""Logging"": {{
-        //             ""Type"": ""File""
-        //         }}
-        //     }}
-        // }}";
-
-        return emulatorConfig;
-    }
-
     protected override async Task StartContainerAsync(ServiceBusContainer container)
     {
         await container.StartAsync();

tests/BuslyCLI.Console.Tests/EndToEnd/AzureServiceBus/SendCommandAzureServiceBusEndToEndTests.cs

@@ -69,25 +69,17 @@ await RunWithTestEndpoint(async testEndpoint =>
     }
 
     [Test]
-    // TODO: Remove endpoint.Subscribe("<<EVENT>>") calls
-    // TODO: in `HostSettings` pass `false` for the setupInfrastructure parameter
-    // TODO: [Option 1 - NOT EASY] Find a way so that i can "pre-determine" the number of test methods
-    //       to pregenerate a list of queues, subscriptions, and topics
-    // TODO: [Option 2 - precreate a list of events and random endpoint names. pull the names from the list during execution so it can't be used by another test]
-    // TODO: [Option 3 - create and destroy a container per test.  This would be slow and possibly a resource hog if done in paralle]
     public async Task ShouldPublishEvent()
     {
         await RunWithTestEndpoint(async testEndpoint =>
         {
             // Arrange
             await testEndpoint.StartEndpoint();
-            // This wont work.  Emulator doesn't allow subscription creation.  It's all pre-setup with emulator config
-            // await testEndpoint.Subscribe("MessageContracts.Events.OrderCreated");
+            var eventType = $"MessageContracts.Events.OrderCreated-{Guid.NewGuid():N}";
+            await testEndpoint.Subscribe(eventType);
             var messageBody = new { OrderNumber = Guid.NewGuid() };
 
             var json = JsonSerializer.Serialize(messageBody, _jsonObjectOptions);
-            var eventType = GeneratedTestEndpointNamesAndSubscribedEvent
-                .Single(x => x.Item1 == testEndpoint.EndpointName).Item2;
 
             var yamlFile = $"""
                             ---
@@ -120,15 +112,14 @@ await RunWithTestEndpoint(async testEndpoint =>
 
     private async Task RunWithTestEndpoint(Func<RawEndpoint, Task> testAction)
     {
-        var random = new Random();
-        var testEndpointName = GeneratedTestEndpointNamesAndSubscribedEvent[random.Next(GeneratedTestEndpointNamesAndSubscribedEvent.Count)];
-        var testEndpoint = await new RawEndpointFactory().CreateRawEndpoint(testEndpointName.Item1, new TransportConfig()
+        var testEndpointName = $"TestEndpoint-{Guid.NewGuid():N}";
+        var testEndpoint = await new RawEndpointFactory().CreateRawEndpoint(testEndpointName, new TransportConfig()
         {
             AzureServiceBusTransportConfig = new AzureServiceBusTransportConfig()
             {
-                ConnectionString = Container.GetConnectionString()
+                ConnectionString = GetNServiceBusConnectionString()
             }
-        }, false);
+        }, true);
 
         await testAction(testEndpoint);
         await testEndpoint.ShutDownAndCleanUp();