Add ProtoDefinition to WireMockContainer (#1250)

* AddProtoDefinitionAsync

* ...

* Body

* "

* .

* .

* .

* [Fact(Skip = "new docker is needed")]

* x

src/WireMock.Net.Testcontainers/WireMockConfiguration.cs

@@ -6,6 +6,7 @@ using Docker.DotNet.Models;
 using DotNet.Testcontainers.Builders;
 using DotNet.Testcontainers.Configurations;
 using JetBrains.Annotations;
+using Stef.Validation;
 
 namespace WireMock.Net.Testcontainers;
 
@@ -28,6 +29,8 @@ public sealed class WireMockConfiguration : ContainerConfiguration
 
     public List<string> AdditionalUrls { get; private set; } = [];
 
+    public Dictionary<string, string[]> ProtoDefinitions { get; set; } = new();
+
     public WireMockConfiguration(string? username = null, string? password = null)
     {
         Username = username;
@@ -74,7 +77,8 @@ public sealed class WireMockConfiguration : ContainerConfiguration
         StaticMappingsPath = BuildConfiguration.Combine(oldValue.StaticMappingsPath, newValue.StaticMappingsPath);
         WatchStaticMappings = BuildConfiguration.Combine(oldValue.WatchStaticMappings, newValue.WatchStaticMappings);
         WatchStaticMappingsInSubdirectories = BuildConfiguration.Combine(oldValue.WatchStaticMappingsInSubdirectories, newValue.WatchStaticMappingsInSubdirectories);
-        AdditionalUrls = BuildConfiguration.Combine(oldValue.AdditionalUrls.AsEnumerable(), newValue.AdditionalUrls.AsEnumerable()).ToList();
+        AdditionalUrls = Combine(oldValue.AdditionalUrls, newValue.AdditionalUrls);
+        ProtoDefinitions = Combine(oldValue.ProtoDefinitions, newValue.ProtoDefinitions);
     }
 
     /// <summary>
@@ -107,7 +111,35 @@ public sealed class WireMockConfiguration : ContainerConfiguration
     /// <returns><see cref="WireMockConfiguration"/></returns>
     public WireMockConfiguration WithAdditionalUrl(string url)
     {
-        AdditionalUrls.Add(url);
+        AdditionalUrls.Add(Guard.NotNullOrWhiteSpace(url));
         return this;
     }
+
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinition">The ProtoDefinition as text.</param>
+    /// <returns><see cref="WireMockConfiguration"/></returns>
+    public WireMockConfiguration AddProtoDefinition(string id, params string[] protoDefinition)
+    {
+        Guard.NotNullOrWhiteSpace(id);
+        Guard.NotNullOrEmpty(protoDefinition);
+
+        ProtoDefinitions[id] = protoDefinition;
+
+        return this;
+    }
+
+    private static List<T> Combine<T>(List<T> oldValue, List<T> newValue)
+    {
+        return oldValue.Concat(newValue).ToList();
+    }
+
+    private static Dictionary<TKey, TValue> Combine<TKey, TValue>(Dictionary<TKey, TValue> oldValue, Dictionary<TKey, TValue> newValue)
+    {
+        return newValue
+            .Concat(oldValue.Where(item => !newValue.Keys.Contains(item.Key)))
+            .ToDictionary(item => item.Key, item => item.Value);
+    }
 }

src/WireMock.Net.Testcontainers/WireMockContainer.cs

@@ -12,6 +12,7 @@ using DotNet.Testcontainers.Containers;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 using RestEase;
+using Stef.Validation;
 using WireMock.Client;
 using WireMock.Client.Extensions;
 using WireMock.Http;
@@ -40,9 +41,9 @@ public sealed class WireMockContainer : DockerContainer
     /// <param name="configuration">The container configuration.</param>
     public WireMockContainer(WireMockConfiguration configuration) : base(configuration)
     {
-        _configuration = Stef.Validation.Guard.NotNull(configuration);
+        _configuration = Guard.NotNull(configuration);
 
-        Started += WireMockContainer_Started;
+        Started += async (sender, eventArgs) => await WireMockContainerStartedAsync(sender, eventArgs);
     }
 
     /// <summary>
@@ -175,8 +176,6 @@ public sealed class WireMockContainer : DockerContainer
             _enhancedFileSystemWatcher = null;
         }
 
-        Started -= WireMockContainer_Started;
-
         return base.DisposeAsyncCore();
     }
 
@@ -195,10 +194,17 @@ public sealed class WireMockContainer : DockerContainer
         }
     }
 
-    private void WireMockContainer_Started(object sender, EventArgs e)
+    private async Task WireMockContainerStartedAsync(object sender, EventArgs e)
     {
         _adminApi = CreateWireMockAdminClient();
 
+        RegisterEnhancedFileSystemWatcher();
+
+        await CallAdditionalActionsAfterStartedAsync();
+    }
+
+    private void RegisterEnhancedFileSystemWatcher()
+    {
         if (!_configuration.WatchStaticMappings || string.IsNullOrEmpty(_configuration.StaticMappingsPath))
         {
             return;
@@ -214,6 +220,25 @@ public sealed class WireMockContainer : DockerContainer
         _enhancedFileSystemWatcher.EnableRaisingEvents = true;
     }
 
+    private async Task CallAdditionalActionsAfterStartedAsync()
+    {
+        foreach (var kvp in _configuration.ProtoDefinitions)
+        {
+            Logger.LogInformation("Adding ProtoDefinition {Id}", kvp.Key);
+            foreach (var protoDefinition in kvp.Value)
+            {
+                try
+                {
+                    await _adminApi!.AddProtoDefinitionAsync(kvp.Key, protoDefinition);
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogWarning(ex, "Error adding ProtoDefinition '{Id}'.", kvp.Key);
+                }
+            }
+        }
+    }
+
     private async void FileCreatedChangedOrDeleted(object sender, FileSystemEventArgs args)
     {
         try

src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs

@@ -164,6 +164,23 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
         return WithPortBinding(port, true);
     }
 
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinition">The ProtoDefinition as text.</param>
+    /// <returns><see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder AddProtoDefinition(string id, params string[] protoDefinition)
+    {
+        Guard.NotNullOrWhiteSpace(id);
+        Guard.NotNullOrEmpty(protoDefinition);
+
+        DockerResourceConfiguration.AddProtoDefinition(id, protoDefinition);
+
+        return this;
+    }
+
     private WireMockContainerBuilder WithCommand(string param, bool value)
     {
         return !value ? this : WithCommand($"{param} true");