Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public static IResourceBuilder<AdminerContainerResource> AddAdminer(this IDistri
.WithImage(AdminerContainerImageTags.Image, AdminerContainerImageTags.Tag)
.WithImageRegistry(AdminerContainerImageTags.Registry)
.WithHttpEndpoint(targetPort: 8080, port: port, name: AdminerContainerResource.PrimaryEndpointName)
.WithUrlForEndpoint(AdminerContainerResource.PrimaryEndpointName, e => e.DisplayText = "Adminer Dashboard")
.ExcludeFromManifest();

var assembly = Assembly.GetExecutingAssembly();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public static IResourceBuilder<DbGateContainerResource> AddDbGate(this IDistribu
.WithImage(DbGateContainerImageTags.Image, DbGateContainerImageTags.Tag)
.WithImageRegistry(DbGateContainerImageTags.Registry)
.WithHttpEndpoint(targetPort: 3000, port: port, name: DbGateContainerResource.PrimaryEndpointName)
.WithUrlForEndpoint(DbGateContainerResource.PrimaryEndpointName, e => e.DisplayText = "DbGate Dashboard")
.ExcludeFromManifest();

return dbGateContainerBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System.Net.Sockets;
using System.Text.Json;
using Aspire.Components.Common.Tests;
using Aspire.Hosting;
using Aspire.Hosting.Utils;

namespace CommunityToolkit.Aspire.Hosting.Adminer.Tests;
public class AddAdminerTests
Expand Down Expand Up @@ -208,4 +210,29 @@ public void WithAdminerShouldShouldAddOneAdminerResourceForMultipleDatabaseTypes
var containerResource = Assert.Single(appModel.Resources.OfType<AdminerContainerResource>());
Assert.Equal("postgres1-adminer", containerResource.Name);
}

[Fact]
[RequiresDocker]
public async Task AddAdminerWithDefaultsAddsUrlAnnotations()
{
using var builder = TestDistributedApplicationBuilder.Create();

var adminer = builder.AddAdminer("adminer");

var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
builder.Eventing.Subscribe<AfterEndpointsAllocatedEvent>((e, ct) =>
{
tcs.SetResult();
return Task.CompletedTask;
});

var app = await builder.BuildAsync();
await app.StartAsync();
await tcs.Task;

var urls = adminer.Resource.Annotations.OfType<ResourceUrlAnnotation>();
Assert.Single(urls, u => u.DisplayText == "Adminer Dashboard");

await app.StopAsync();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Net.Sockets;
using Aspire.Components.Common.Tests;
using Aspire.Hosting;
using Aspire.Hosting.Utils;

namespace CommunityToolkit.Aspire.Hosting.DbGate.Tests;
public class AddDbGateTests
Expand Down Expand Up @@ -462,4 +464,29 @@ public void WithDbGateShouldShouldAddOneDbGateResourceForMultipleDatabaseTypes()
var containerResource = Assert.Single(appModel.Resources.OfType<DbGateContainerResource>());
Assert.Equal("mongodb1-dbgate", containerResource.Name);
}

[Fact]
[RequiresDocker]
public async Task AddDbGateWithDefaultsAddsUrlAnnotations()
{
using var builder = TestDistributedApplicationBuilder.Create();

var dbgate = builder.AddDbGate("dbgate");

var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
builder.Eventing.Subscribe<AfterEndpointsAllocatedEvent>((e, ct) =>
{
tcs.SetResult();
return Task.CompletedTask;
});

var app = await builder.BuildAsync();
await app.StartAsync();
await tcs.Task;

var urls = dbgate.Resource.Annotations.OfType<ResourceUrlAnnotation>();
Assert.Single(urls, u => u.DisplayText == "DbGate Dashboard");

await app.StopAsync();
}
}
Loading