Skip to content
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.

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

#240 add papercut smtp hosting #423

Merged
merged 14 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
#240: update Papercut SMTP integration and tests
  • Loading branch information
anoordover committed Jan 30, 2025
commit 5629ba3e774b8ddf3e3f6db59d441b7cf7517e53
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
using CommunityToolkit.Aspire.Hosting.PapercutSmtp.SendMailApi;
using Microsoft.AspNetCore.Mvc;
using System.Data.Common;
using System.Net.Mail;

var builder = WebApplication.CreateBuilder(args);
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);

string? papercutConnectionString = builder.Configuration.GetConnectionString("papercut");
Uri papercutUri = new(papercutConnectionString!);
builder.Services.AddScoped(_ => new SmtpClient(papercutUri.Host, papercutUri.Port));
DbConnectionStringBuilder connectionBuilder = new()
{
ConnectionString = papercutConnectionString
};

Uri endpoint = new(connectionBuilder["Endpoint"].ToString()!, UriKind.Absolute);
builder.Services.AddScoped(_ => new SmtpClient(endpoint.Host, endpoint.Port));
builder.AddServiceDefaults();
WebApplication app = builder.Build();

app.MapPost("/send", ([FromBody]MailData mailData, [FromServices] SmtpClient smtpClient) =>
{
MailAddress from = new(mailData.From, "TestFromName");
MailAddress to = new(mailData.To, "TestToName");
MailMessage myMail = new(from, to);
MailAddress replyTo = new(mailData.From);
myMail.ReplyToList.Add(replyTo);
myMail.Subject = mailData.Subject;
myMail.SubjectEncoding = System.Text.Encoding.UTF8;
myMail.Body = mailData.Body;
myMail.BodyEncoding = System.Text.Encoding.UTF8;
smtpClient.Send(myMail);
})
{
MailMessage myMail = CreateMailMessage(mailData);
smtpClient.Send(myMail);
})
.WithName("SendMail");

app.MapGet("/health", () => "OK");

app.MapDefaultEndpoints();
app.Run();
app.Run();
return;

MailMessage CreateMailMessage(MailData mailData)
{
MailAddress from = new(mailData.From, "TestFromName");
MailAddress to = new(mailData.To, "TestToName");
MailMessage mailMessage = new(from, to);
MailAddress replyTo = new(mailData.From);
mailMessage.ReplyToList.Add(replyTo);
mailMessage.Subject = mailData.Subject;
mailMessage.SubjectEncoding = System.Text.Encoding.UTF8;
mailMessage.Body = mailData.Body;
mailMessage.BodyEncoding = System.Text.Encoding.UTF8;
return mailMessage;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"ConnectionStrings": {
"papercut": "smpt://xyz:12345"
},
"Logging": {
"LogLevel": {
"Default": "Information",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@
<PackageReference Include="Aspire.Hosting" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace CommunityToolkit.Aspire.Hosting.Ollama;
namespace CommunityToolkit.Aspire.Hosting.PapercutSmtp;

internal static class PapercutSmtpContainerImageTags
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ public class PapercutSmtpContainerResource(string name) : ContainerResource(name
internal const string HttpEndpointName = "http";
internal const string SmtpEndpointName = "smtp";
private EndpointReference? _smtpEndpoint;
private EndpointReference SmtpEndpoint => _smtpEndpoint ??= new EndpointReference(this, SmtpEndpointName);

/// <summary>
/// ConnectionString for the Papercut SMTP server in the form of smtp://host:port.
/// </summary>
public ReferenceExpression ConnectionStringExpression => ReferenceExpression.Create(
$"smtp://{SmtpEndpoint.Property(EndpointProperty.Host)}:{SmtpEndpoint.Property(EndpointProperty.Port)}");

private EndpointReference SmtpEndpoint => _smtpEndpoint ??= new EndpointReference(this, SmtpEndpointName);
$"Endpoint={SmtpEndpoint.Scheme}://{SmtpEndpoint.Property(EndpointProperty.Host)}:{SmtpEndpoint.Property(EndpointProperty.Port)}");
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Aspire.Hosting.ApplicationModel;
using CommunityToolkit.Aspire.Hosting.Ollama;
using CommunityToolkit.Aspire.Hosting.PapercutSmtp;

namespace Aspire.Hosting;

Expand All @@ -8,20 +8,6 @@ namespace Aspire.Hosting;
/// </summary>
public static class PapercutSmtpHostingExtension
{
/// <summary>
/// Adds Papercut SMTP to the application model.
/// </summary>
/// <param name="builder">The <see cref="IDistributedApplicationBuilder"/> to add the resource to.</param>
/// <param name="name">The name of the resource.</param>
/// <remarks>
/// </remarks>
/// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
public static IResourceBuilder<PapercutSmtpContainerResource> AddPapercutSmtp(this IDistributedApplicationBuilder builder,
[ResourceName] string name)
{
return builder.AddPapercutSmtp(name, null);
}

/// <summary>
/// Adds Papercut SMTP to the application model.
/// </summary>
Expand Down Expand Up @@ -49,7 +35,7 @@ public static IResourceBuilder<PapercutSmtpContainerResource> AddPapercutSmtp(th
.WithHttpEndpoint(targetPort: PapercutSmtpContainerResource.HttpEndpointPort,
port: httpPort,
name: PapercutSmtpContainerResource.HttpEndpointName)
.WithHttpHealthCheck("", httpPort, PapercutSmtpContainerResource.HttpEndpointName);
.WithHttpHealthCheck("/health", httpPort, PapercutSmtpContainerResource.HttpEndpointName);

return rb;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ Aspire.Hosting.ApplicationModel.PapercutSmtpContainerResource
Aspire.Hosting.ApplicationModel.PapercutSmtpContainerResource.ConnectionStringExpression.get -> Aspire.Hosting.ApplicationModel.ReferenceExpression!
Aspire.Hosting.ApplicationModel.PapercutSmtpContainerResource.PapercutSmtpContainerResource(string! name) -> void
Aspire.Hosting.PapercutSmtpHostingExtension
static Aspire.Hosting.PapercutSmtpHostingExtension.AddPapercutSmtp(this Aspire.Hosting.IDistributedApplicationBuilder! builder, string! name) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.PapercutSmtpContainerResource!>!
static Aspire.Hosting.PapercutSmtpHostingExtension.AddPapercutSmtp(this Aspire.Hosting.IDistributedApplicationBuilder! builder, string! name, int? httpPort = null, int? smtpPort = null) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.PapercutSmtpContainerResource!>!
Original file line number Diff line number Diff line change
@@ -1,20 +1,45 @@
using Aspire.Components.Common.Tests;
using CommunityToolkit.Aspire.Testing;
using System.Data.Common;
using System.Net.Http.Json;
using System.Net.Mail;
using System.Text.Json;

namespace CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests;

[RequiresDocker]
public class AppHostTests(AspireIntegrationTestFixture<Projects.CommunityToolkit_Aspire_Hosting_PapercutSmtp_AppHost> fixture) : IClassFixture<AspireIntegrationTestFixture<Projects.CommunityToolkit_Aspire_Hosting_PapercutSmtp_AppHost>>
{
private const string ResourceName = "papercut";

[Fact]
public async Task ResourceStartsAndSendingMailNoException()
public async Task ResourceStartsAndMailShouldBeReceived()
{
await fixture.ResourceNotificationService.WaitForResourceHealthyAsync(ResourceName).WaitAsync(TimeSpan.FromMinutes(2));
SmtpClient smtpClient = await CreateSmtpClient();
MailMessage myMail = CreateMailMessage();
HttpClient httpClient = CreateHttpClientForPapercut();

Exception? exception = Record.Exception(() => smtpClient.Send(myMail));

Assert.Null(exception);
HttpResponseMessage response = await httpClient.GetAsync("/api/Messages");
response.EnsureSuccessStatusCode();

JsonDocument? responseDocument = await response.Content.ReadFromJsonAsync<JsonDocument>();
Assert.NotNull(responseDocument);
int totalMessageCount = responseDocument.RootElement.GetProperty("totalMessageCount").GetInt32();
Assert.Equal(1, totalMessageCount);
}

private HttpClient CreateHttpClientForPapercut()
{
var httpEndpoint = fixture.GetEndpoint(ResourceName, "http");
return new HttpClient { BaseAddress = httpEndpoint };
}

private static MailMessage CreateMailMessage()
{
const string resourceName = "papercut";
await fixture.ResourceNotificationService.WaitForResourceHealthyAsync(resourceName).WaitAsync(TimeSpan.FromMinutes(2));
string? connectionString = await fixture.GetConnectionString("papercut");
Uri connectionUri = new(connectionString!);
SmtpClient smtpClient = new SmtpClient(connectionUri.Host, connectionUri.Port);
MailAddress from = new("test@test.com", "TestFromName");
MailAddress to = new("to@test.com", "TestToName");
MailMessage myMail = new(from, to);
Expand All @@ -24,7 +49,18 @@ public async Task ResourceStartsAndSendingMailNoException()
myMail.SubjectEncoding = System.Text.Encoding.UTF8;
myMail.Body = "Hello world!";
myMail.BodyEncoding = System.Text.Encoding.UTF8;
Exception? exception = Record.Exception(() => smtpClient.Send(myMail));
Assert.Null(exception);
return myMail;
}

private async Task<SmtpClient> CreateSmtpClient()
{
string? connectionString = await fixture.GetConnectionString(ResourceName);
DbConnectionStringBuilder connectionBuilder = new()
{
ConnectionString = connectionString
};
Uri connectionUri = new(connectionBuilder["Endpoint"].ToString()!, UriKind.Absolute);
SmtpClient smtpClient = new(connectionUri.Host, connectionUri.Port);
return smtpClient;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Aspire.Hosting;

namespace CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests;
namespace CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests;

public class ContainerResourceCreationTests
{
Expand Down Expand Up @@ -35,8 +35,8 @@ public void AddPapercutSmtpBuilderContainerDetailsSetOnResource()
Assert.Equal("papercut", resource.Name);

Assert.True(resource.TryGetLastAnnotation(out ContainerImageAnnotation? imageAnnotations));
Assert.Equal("7.0.0-rc1", imageAnnotations.Tag);
Assert.Equal("changemakerstudiosus/papercut-smtp", imageAnnotations.Image);
Assert.Equal("docker.io", imageAnnotations.Registry);
Assert.Equal(PapercutSmtpContainerImageTags.Tag, imageAnnotations.Tag);
Assert.Equal(PapercutSmtpContainerImageTags.Image, imageAnnotations.Image);
Assert.Equal(PapercutSmtpContainerImageTags.Registry, imageAnnotations.Registry);
}
}
Loading