...

Author: StefH

src/WireMock.Net.Aspire/DistributedApplicationExtensions.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Globalization;
-using System.Linq;
 using System.Net.Http.Headers;
 using System.Text;
 using Aspire.Hosting.ApplicationModel;

src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>0.0.1-preview-01</Version>
+        <Version>0.0.1-preview-02</Version>
+        <ImplicitUsings>enable</ImplicitUsings>
         <Description>Aspire extension to start a WireMock.Net server to stub an api.</Description>
         <AssemblyTitle>WireMock.Net.Aspire</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>

src/WireMock.Net.Aspire/WireMockServerArguments.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using WireMock.Client.Builders;
 
 // ReSharper disable once CheckNamespace

src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Threading.Tasks;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Lifecycle;
 using Stef.Validation;
@@ -15,7 +13,7 @@ namespace Aspire.Hosting;
 public static class WireMockServerBuilderExtensions
 {
     // Linux only (https://github.com/dotnet/aspire/issues/854)
-    private const string DefaultLinuxImage = "sheyenrath/wiremock.net";
+    private const string DefaultLinuxImage = "sheyenrath/wiremock.net-alpine";
     private const string DefaultLinuxMappingsPath = "/app/__admin/mappings";
 
     /// <summary>
@@ -64,13 +62,6 @@ public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistrib
 
         resourceBuilder = resourceBuilder.WithArgs(ctx =>
         {
-            //var urls = new List<string>
-            //{
-            //    $"http://*:{HttpContainerPort}"
-            //};
-
-            //ctx.Args.Add($"--URLS http://*:{HttpContainerPort}, https://*:{HttpsContainerPort}");
-
             foreach (var arg in arguments.GetArgs())
             {
                 ctx.Args.Add(arg);

src/WireMock.Net.Aspire/WireMockServerMappingBuilderHook.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Lifecycle;
 using RestEase;
@@ -25,9 +21,11 @@ public Task AfterResourcesCreatedAsync(DistributedApplicationModel appModel, Can
 
         foreach (var wireMockInstance in wireMockInstances)
         {
-            if (wireMockInstance.PrimaryEndpoint.IsAllocated)
+            var endpoint = wireMockInstance.GetEndpoint("http");
+            if (endpoint.IsAllocated)
             {
-                var adminApi = RestClient.For<IWireMockAdminApi>(new Uri(wireMockInstance.PrimaryEndpoint.Url, UriKind.Absolute));
+                var adminApi = RestClient.For<IWireMockAdminApi>(endpoint.Url);
+
                 var mappingBuilder = adminApi.GetMappingBuilder();
                 wireMockInstance.Arguments.ApiMappingBuilder?.Invoke(mappingBuilder);
             }

src/WireMock.Net.Aspire/WireMockServerResource.cs

@@ -8,16 +8,8 @@ namespace Aspire.Hosting.ApplicationModel;
 /// </summary>
 public class WireMockServerResource : ContainerResource, IResourceWithServiceDiscovery
 {
-    private const string PrimaryEndpointName = "http";
-    private EndpointReference? _primaryEndpoint;
-
     internal WireMockServerArguments Arguments { get; }
 
-    /// <summary>
-    /// Gets the primary endpoint for the server.
-    /// </summary>
-    public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, PrimaryEndpointName);
-
     /// <summary>
     /// Initializes a new instance of the <see cref="WireMockServerResource"/> class.
     /// </summary>

test/WireMock.Net.Aspire.TestAppHost/Program.cs

@@ -1,10 +1,15 @@
+using WireMock.Net.Aspire.TestAppHost;
+
 var builder = DistributedApplication.CreateBuilder(args);
 
 var mappingsPath = Path.Combine(Directory.GetCurrentDirectory(), "WireMockMappings");
 
 builder
     .AddWireMock("wiremock-service")
     .WithMappingsPath(mappingsPath)
-    .WithWatchStaticMappings();
+    .WithWatchStaticMappings()
+    .WithApiMappingBuilder(WeatherForecastApiMock.BuildAsync);
 
-await builder.Build().RunAsync();
+await builder
+    .Build()
+    .RunAsync();

test/WireMock.Net.Aspire.TestAppHost/WeatherForecastApiMock.cs

@@ -0,0 +1,36 @@
+using WireMock.Client.Builders;
+
+namespace WireMock.Net.Aspire.TestAppHost;
+
+internal class WeatherForecastApiMock
+{
+    public static async Task BuildAsync(AdminApiMappingBuilder builder)
+    {
+        var summaries = new[]
+        {
+            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+        };
+
+        builder.Given(b => b
+            .WithRequest(request => request
+                .UsingGet()
+                .WithPath("/weatherforecast2")
+            )
+            .WithResponse(response => response
+                .WithHeaders(h => h.Add("Content-Type", "application/json"))
+                .WithBodyAsJson(() => Enumerable.Range(1, 5).Select(index =>
+                        new WeatherForecast
+                        (
+                            DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
+                            Random.Shared.Next(-20, 55),
+                            summaries[Random.Shared.Next(summaries.Length)]
+                        ))
+                    .ToArray())
+            )
+        );
+
+        await builder.BuildAndPostAsync();
+    }
+}
+
+internal record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary);

test/WireMock.Net.Aspire.Tests/IntegrationTests.cs

@@ -23,16 +23,23 @@ public async Task StartAppHostWithWireMockAndCreateHttpClientToCallTheMockedWeat
         await using var app = await appHost.BuildAsync();
         await app.StartAsync();
 
-        // Act
         using var httpClient = app.CreateHttpClient("wiremock-service");
-        var weatherForecasts = await httpClient.GetFromJsonAsync<WeatherForecast[]>("/weatherforecast");
 
-        // Assert
-        weatherForecasts.Should().BeEquivalentTo(new[]
+        // Act 1
+        var weatherForecasts1 = await httpClient.GetFromJsonAsync<WeatherForecast[]>("/weatherforecast");
+
+        // Assert 1
+        weatherForecasts1.Should().BeEquivalentTo(new[]
         {
             new WeatherForecast(new DateOnly(2024, 5, 24), -10, "Freezing"),
             new WeatherForecast(new DateOnly(2024, 5, 25), +33, "Hot")
         });
+
+        // Act 2
+        var weatherForecasts2 = await httpClient.GetFromJsonAsync<WeatherForecast[]>("/weatherforecast2");
+
+        // Assert 2
+        weatherForecasts2.Should().HaveCount(5);
     }
 
     [Fact]
@@ -49,11 +56,18 @@ public async Task StartAppHostWithWireMockAndCreateWireMockAdminClientToCallTheA
         await using var app = await appHost.BuildAsync();
         await app.StartAsync();
 
-        // Act
         var adminClient = app.CreateWireMockAdminClient("wiremock-service");
+
+        // Act 1
         var settings = await adminClient.GetSettingsAsync();
 
-        // Assert
+        // Assert 1
         settings.Should().NotBeNull();
+
+        // Act 2
+        var mappings = await adminClient.GetMappingsAsync();
+
+        // Assert 2
+        mappings.Should().HaveCount(2);
     }
 }

test/WireMock.Net.Tests/WireMockServer.Proxy.cs

@@ -929,7 +929,7 @@ public async Task WireMockServer_ProxyAndRecordSettings_SameRequest_ShouldProxyA
         //Arrange
         var wireMockServerSettings = new WireMockServerSettings
         {
-            Urls = new[] { "http://localhost:9091" },
+            Urls = new[] { "http://localhost:19091" },
             ProxyAndRecordSettings = new ProxyAndRecordSettings
             {
                 Url = "http://postman-echo.com",
@@ -947,13 +947,13 @@ public async Task WireMockServer_ProxyAndRecordSettings_SameRequest_ShouldProxyA
         var request = new HttpRequestMessage
         {
             Method = HttpMethod.Post,
-            RequestUri = new Uri("http://localhost:9091/post"),
+            RequestUri = new Uri("http://localhost:19091/post"),
             Content = new StringContent(requestBody)
         };
         var request2 = new HttpRequestMessage
         {
             Method = HttpMethod.Post,
-            RequestUri = new Uri("http://localhost:9091/post"),
+            RequestUri = new Uri("http://localhost:19091/post"),
             Content = new StringContent(requestBody)
         };
         server.ResetMappings();