Skip to content

Use custom queue/topic names in SB emulator heath-checks #8043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2025
Merged

Use custom queue/topic names in SB emulator heath-checks #8043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8488625
Use custom queue/topic names in SB emulator heath-checks
sebastienros Mar 12, 2025
7547f67
Add Event Hubs name tests
sebastienros Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusQueueResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class AzureServiceBusQueueResource(string name, string queueName, AzureSe
: Resource(name), IResourceWithParent<AzureServiceBusResource>, IResourceWithConnectionString, IResourceWithAzureFunctionsConfig
{
private string _queueName = ThrowIfNullOrEmpty(queueName);

/// <summary>
/// The queue name.
/// </summary>
Expand Down
20 changes: 12 additions & 8 deletions tests/Aspire.Hosting.Azure.Tests/AzureEventHubsExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,31 +110,35 @@ public async Task VerifyAzureEventHubsEmulatorResource(bool referenceHub)
}
}

[Fact]
[Theory]
[InlineData(null)]
[InlineData("random")]
[RequiresDocker]
public async Task AzureEventHubsNs_ProducesAndConsumes()
public async Task AzureEventHubsNs_ProducesAndConsumes(string? hubName)
{
var cts = new CancellationTokenSource(TimeSpan.FromMinutes(10));

using var builder = TestDistributedApplicationBuilder.Create().WithTestAndResourceLogging(testOutputHelper);
var eventHubns = builder.AddAzureEventHubs("eventhubns")
var eventHubNs = builder.AddAzureEventHubs("eventhubns")
.RunAsEmulator();
var eventHub = eventHubns.AddHub("hub");

var resourceName = "hub";
var eventHub = eventHubNs.AddHub(resourceName, hubName);

using var app = builder.Build();
await app.StartAsync();

var hb = Host.CreateApplicationBuilder();

hb.Configuration["ConnectionStrings:eventhubns"] = await eventHubns.Resource.ConnectionStringExpression.GetValueAsync(CancellationToken.None);
hb.AddAzureEventHubProducerClient("eventhubns", settings => settings.EventHubName = "hub");
hb.AddAzureEventHubConsumerClient("eventhubns", settings => settings.EventHubName = "hub");
hb.Configuration["ConnectionStrings:eventhubns"] = await eventHubNs.Resource.ConnectionStringExpression.GetValueAsync(CancellationToken.None);
hb.AddAzureEventHubProducerClient("eventhubns", settings => settings.EventHubName = eventHub.Resource.HubName);
hb.AddAzureEventHubConsumerClient("eventhubns", settings => settings.EventHubName = eventHub.Resource.HubName);

using var host = hb.Build();
await host.StartAsync();

var rns = app.Services.GetRequiredService<ResourceNotificationService>();
await rns.WaitForResourceHealthyAsync(eventHubns.Resource.Name, cts.Token);
await rns.WaitForResourceHealthyAsync(eventHubNs.Resource.Name, cts.Token);

var producerClient = host.Services.GetRequiredService<EventHubProducerClient>();
var consumerClient = host.Services.GetRequiredService<EventHubConsumerClient>();
Expand Down
12 changes: 7 additions & 5 deletions tests/Aspire.Hosting.Azure.Tests/AzureServiceBusExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,11 @@ public async Task VerifyWaitForOnServiceBusEmulatorBlocksDependentResources()
await app.StopAsync();
}

[Fact(Skip = "Azure ServiceBus emulator is not reliable in CI - https://github.com/dotnet/aspire/issues/7066")]
[Theory(Skip = "Azure ServiceBus emulator is not reliable in CI - https://github.com/dotnet/aspire/issues/7066")]
[InlineData(null)]
[InlineData("other")]
[RequiresDocker]
public async Task VerifyAzureServiceBusEmulatorResource()
public async Task VerifyAzureServiceBusEmulatorResource(string? queueName)
{
var cts = new CancellationTokenSource(TimeSpan.FromMinutes(10));

Expand All @@ -225,7 +227,7 @@ public async Task VerifyAzureServiceBusEmulatorResource()
var serviceBus = builder.AddAzureServiceBus("servicebusns")
.RunAsEmulator();

serviceBus.AddServiceBusQueue("queue123");
var queueResource = serviceBus.AddServiceBusQueue("queue123", queueName);

using var app = builder.Build();
await app.StartAsync();
Expand All @@ -243,10 +245,10 @@ public async Task VerifyAzureServiceBusEmulatorResource()

var serviceBusClient = host.Services.GetRequiredService<ServiceBusClient>();

await using var sender = serviceBusClient.CreateSender("queue123");
await using var sender = serviceBusClient.CreateSender(queueResource.Resource.QueueName);
await sender.SendMessageAsync(new ServiceBusMessage("Hello, World!"), cts.Token);

await using var receiver = serviceBusClient.CreateReceiver("queue123");
await using var receiver = serviceBusClient.CreateReceiver(queueResource.Resource.QueueName);
var message = await receiver.ReceiveMessageAsync(cancellationToken: cts.Token);

Assert.Equal("Hello, World!", message.Body.ToString());
Expand Down