From b2390cbc9daddb97fe080abb8dda0b3de04a7f81 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 12 Mar 2021 10:42:00 +0000 Subject: [PATCH 1/4] Event Size reduced --- MessagingService.Client/MessagingService.Client.csproj | 2 +- .../MessagingService.EmailAggregate.Tests.csproj | 2 +- .../MessagingService.EmailMessage.DomainEvents.csproj | 4 ++-- .../MessagingService.EmailMessageAggregate.csproj | 4 ++-- MessagingService.IntegrationTests/Common/DockerHelper.cs | 2 +- .../MessagingService.IntegrationTests.csproj | 4 ++-- .../MessagingService.SMSMessage.DomainEvents.csproj | 2 +- .../MessagingService.SMSMessageAggregate.csproj | 2 +- MessagingService/MessagingService.csproj | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj index ef9dfe0..ec5b52a 100644 --- a/MessagingService.Client/MessagingService.Client.csproj +++ b/MessagingService.Client/MessagingService.Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index 5a1586c..cb1a8b5 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj index 129dabd..ecd1d31 100644 --- a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj +++ b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj index 32fd8f7..fa6b77d 100644 --- a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj +++ b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/MessagingService.IntegrationTests/Common/DockerHelper.cs b/MessagingService.IntegrationTests/Common/DockerHelper.cs index e72f658..e6075ac 100644 --- a/MessagingService.IntegrationTests/Common/DockerHelper.cs +++ b/MessagingService.IntegrationTests/Common/DockerHelper.cs @@ -134,7 +134,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName) INetworkService testNetwork = DockerHelper.SetupTestNetwork(); this.TestNetworks.Add(testNetwork); IContainerService eventStoreContainer = - DockerHelper.SetupEventStoreContainer(this.EventStoreContainerName, this.Logger, "eventstore/eventstore:20.6.0-buster-slim", testNetwork, traceFolder, usesEventStore2006OrLater:true); + DockerHelper.SetupEventStoreContainer(this.EventStoreContainerName, this.Logger, "eventstore/eventstore:20.10.0-buster-slim", testNetwork, traceFolder, true); IContainerService securityServiceContainer = DockerHelper.SetupSecurityServiceContainer(this.SecurityServiceContainerName, this.Logger, diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index f052d5f..bb60d65 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -7,11 +7,11 @@ - + - + diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj index d85afbc..6196292 100644 --- a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj +++ b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj @@ -5,7 +5,7 @@ - + diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj index 1098d5a..8f346a5 100644 --- a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj +++ b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj @@ -5,7 +5,7 @@ - + diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj index 3be6ae5..2e5d7ef 100644 --- a/MessagingService/MessagingService.csproj +++ b/MessagingService/MessagingService.csproj @@ -11,7 +11,7 @@ - + From 4043ca1bca39afbeb9eca99c754b96ccd9bb0671 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 12 Mar 2021 11:12:00 +0000 Subject: [PATCH 2/4] Fix tests --- MessagingService.IntegrationTests/Common/DockerHelper.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MessagingService.IntegrationTests/Common/DockerHelper.cs b/MessagingService.IntegrationTests/Common/DockerHelper.cs index e6075ac..b7e47e4 100644 --- a/MessagingService.IntegrationTests/Common/DockerHelper.cs +++ b/MessagingService.IntegrationTests/Common/DockerHelper.cs @@ -129,6 +129,8 @@ public override async Task StartContainersForScenarioRun(String scenarioName) this.EventStoreContainerName = $"eventstore{testGuid:N}"; this.MessagingServiceContainerName = $"messagingservice{testGuid:N}"; + String eventStoreAddress = $"http://{this.EventStoreContainerName}"; + (String, String, String) dockerCredentials = ("https://www.docker.com", "stuartferguson", "Sc0tland"); INetworkService testNetwork = DockerHelper.SetupTestNetwork(); @@ -153,7 +155,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName) traceFolder, dockerCredentials, this.SecurityServiceContainerName, - this.EventStoreContainerName, + eventStoreAddress, ("serviceClient", "Secret1")); this.Containers.AddRange(new List From 38bc94f6f588a248ed2fbb89014b4724b9ef9e54 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 12 Mar 2021 11:21:14 +0000 Subject: [PATCH 3/4] Grim issue --- MessagingService.IntegrationTests/Common/DockerHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MessagingService.IntegrationTests/Common/DockerHelper.cs b/MessagingService.IntegrationTests/Common/DockerHelper.cs index b7e47e4..eb04162 100644 --- a/MessagingService.IntegrationTests/Common/DockerHelper.cs +++ b/MessagingService.IntegrationTests/Common/DockerHelper.cs @@ -212,7 +212,7 @@ public static IContainerService SetupMessagingServiceContainer(String containerN String hostFolder, (String URL, String UserName, String Password)? dockerCredentials, String securityServiceContainerName, - String eventStoreContainerName, + String eventStoreAddress, (String clientId, String clientSecret) clientDetails, Boolean forceLatestImage = false, Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort) @@ -220,7 +220,7 @@ public static IContainerService SetupMessagingServiceContainer(String containerN logger.LogInformation("About to Start Messaging Service Container"); List environmentVariables = new List(); - environmentVariables.Add($"EventStoreSettings:ConnectionString=https://{eventStoreContainerName}:{DockerHelper.EventStoreHttpDockerPort}"); + environmentVariables.Add($"EventStoreSettings:ConnectionString=http://{eventStoreAddress}:{DockerHelper.EventStoreHttpDockerPort}"); environmentVariables.Add($"AppSettings:SecurityService=http://{securityServiceContainerName}:{securityServicePort}"); environmentVariables.Add($"SecurityConfiguration:Authority=http://{securityServiceContainerName}:{securityServicePort}"); environmentVariables.Add($"urls=http://*:{DockerHelper.MessagingServiceDockerPort}"); From b32d1019f3173a26d136220aefec8337d0d72b0b Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 12 Mar 2021 11:56:59 +0000 Subject: [PATCH 4/4] Test fixes --- .../MessagingService.Client.csproj | 2 +- ...ssagingService.EmailAggregate.Tests.csproj | 2 +- ...ngService.EmailMessage.DomainEvents.csproj | 4 +- ...sagingService.EmailMessageAggregate.csproj | 4 +- .../Common/DockerHelper.cs | 40 ------------------- .../MessagingService.IntegrationTests.csproj | 4 +- ...gingService.SMSMessage.DomainEvents.csproj | 2 +- ...essagingService.SMSMessageAggregate.csproj | 2 +- MessagingService/MessagingService.csproj | 2 +- 9 files changed, 11 insertions(+), 51 deletions(-) diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj index ec5b52a..406af8c 100644 --- a/MessagingService.Client/MessagingService.Client.csproj +++ b/MessagingService.Client/MessagingService.Client.csproj @@ -6,7 +6,7 @@ - + diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index cb1a8b5..735fcd9 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj index ecd1d31..a7739c1 100644 --- a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj +++ b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj index fa6b77d..42a92ed 100644 --- a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj +++ b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/MessagingService.IntegrationTests/Common/DockerHelper.cs b/MessagingService.IntegrationTests/Common/DockerHelper.cs index eb04162..645485f 100644 --- a/MessagingService.IntegrationTests/Common/DockerHelper.cs +++ b/MessagingService.IntegrationTests/Common/DockerHelper.cs @@ -204,46 +204,6 @@ public override async Task StopContainersForScenarioRun() } } - public const int MessagingServiceDockerPort = 5006; - public static IContainerService SetupMessagingServiceContainer(String containerName, - ILogger logger, - String imageName, - List networkServices, - String hostFolder, - (String URL, String UserName, String Password)? dockerCredentials, - String securityServiceContainerName, - String eventStoreAddress, - (String clientId, String clientSecret) clientDetails, - Boolean forceLatestImage = false, - Int32 securityServicePort = DockerHelper.SecurityServiceDockerPort) - { - logger.LogInformation("About to Start Messaging Service Container"); - - List environmentVariables = new List(); - environmentVariables.Add($"EventStoreSettings:ConnectionString=http://{eventStoreAddress}:{DockerHelper.EventStoreHttpDockerPort}"); - environmentVariables.Add($"AppSettings:SecurityService=http://{securityServiceContainerName}:{securityServicePort}"); - environmentVariables.Add($"SecurityConfiguration:Authority=http://{securityServiceContainerName}:{securityServicePort}"); - environmentVariables.Add($"urls=http://*:{DockerHelper.MessagingServiceDockerPort}"); - environmentVariables.Add("AppSettings:EmailProxy=Integration"); - environmentVariables.Add("AppSettings:SMSProxy=Integration"); - - ContainerBuilder messagingServiceContainer = new Builder().UseContainer().WithName(containerName).WithEnvironment(environmentVariables.ToArray()) - .UseImage(imageName, forceLatestImage).ExposePort(DockerHelper.MessagingServiceDockerPort) - .UseNetwork(networkServices.ToArray()).Mount(hostFolder, "/home", MountType.ReadWrite); - - if (dockerCredentials.HasValue) - { - messagingServiceContainer.WithCredential(dockerCredentials.Value.URL, dockerCredentials.Value.UserName, dockerCredentials.Value.Password); - } - - // Now build and return the container - IContainerService builtContainer = messagingServiceContainer.Build().Start().WaitForPort($"{DockerHelper.MessagingServiceDockerPort}/tcp", 30000); - - logger.LogInformation("Messaging Service Container Started"); - - return builtContainer; - } - #endregion } } \ No newline at end of file diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index bb60d65..e189cbc 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -7,11 +7,11 @@ - + - + diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj index 6196292..d7a3990 100644 --- a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj +++ b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj @@ -5,7 +5,7 @@ - + diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj index 8f346a5..176dd32 100644 --- a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj +++ b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj @@ -5,7 +5,7 @@ - + diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj index 2e5d7ef..47a8de1 100644 --- a/MessagingService/MessagingService.csproj +++ b/MessagingService/MessagingService.csproj @@ -11,7 +11,7 @@ - +