From ecb8b90b46fcf30e4c4ac88cd448643191c7b4ff Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Sat, 4 Jul 2020 14:23:10 +0100 Subject: [PATCH] Fix nightly failures --- ...ionProcessorACL.BusinessLogic.Tests.csproj | 2 +- ...ansactionProcessorACL.BusinessLogic.csproj | 6 ++-- .../Common/DockerHelper.cs | 32 +++++++++++++------ .../LogonTransaction.feature.cs | 12 +++---- .../SalesTransaction.feature.cs | 12 +++---- ...actionProcessorACL.IntegrationTests.csproj | 16 +++++----- .../TransactionProcessorACL.Tests.csproj | 2 +- .../TransactionProcessorACL.csproj | 16 +++++----- 8 files changed, 56 insertions(+), 42 deletions(-) diff --git a/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj b/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj index 5f818f5..eccd978 100644 --- a/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj +++ b/TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj index 0957a96..a93dbcb 100644 --- a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj +++ b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj @@ -5,10 +5,10 @@ - + - - + + diff --git a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs index 2ca8472..7b80a15 100644 --- a/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs +++ b/TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs @@ -17,9 +17,7 @@ using Ductus.FluentDocker.Services.Extensions; using EstateManagement.Client; using EstateReporting.Database; - using EventStore.ClientAPI.Common.Log; - using EventStore.ClientAPI.Projections; - using EventStore.ClientAPI.SystemData; + using EventStore.Client; using global::Shared.Logger; using Microsoft.Data.SqlClient; using SecurityService.Client; @@ -191,8 +189,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:release-5.0.2", testNetwork, traceFolder); + IContainerService eventStoreContainer = DockerHelper.SetupEventStoreContainer(this.EventStoreContainerName, this.Logger, "eventstore/eventstore:20.6.0-buster-slim", testNetwork, traceFolder, usesEventStore2006OrLater: true); IContainerService estateManagementContainer = DockerHelper.SetupEstateManagementContainer(this.EstateManagementContainerName, this.Logger, "stuartferguson/estatemanagement", new List @@ -332,7 +329,6 @@ private async Task LoadEventStoreProjections() //Start our Continous Projections - we might decide to do this at a different stage, but now lets try here String projectionsFolder = "../../../projections/continuous"; IPAddress[] ipAddresses = Dns.GetHostAddresses("127.0.0.1"); - IPEndPoint endpoint = new IPEndPoint(ipAddresses.First(), this.EventStoreHttpPort); if (!String.IsNullOrWhiteSpace(projectionsFolder)) { @@ -342,8 +338,26 @@ private async Task LoadEventStoreProjections() { FileInfo[] files = di.GetFiles(); - // TODO: possibly need to change timeout and logger here - ProjectionsManager projectionManager = new ProjectionsManager(new ConsoleLogger(), endpoint, TimeSpan.FromSeconds(30)); + EventStoreClientSettings eventStoreClientSettings = new EventStoreClientSettings + { + ConnectivitySettings = new EventStoreClientConnectivitySettings + { + Address = new Uri($"https://{ipAddresses.First().ToString()}:{this.EventStoreHttpPort}") + }, + CreateHttpMessageHandler = () => new SocketsHttpHandler + { + SslOptions = + { + RemoteCertificateValidationCallback = (sender, + certificate, + chain, + errors) => true, + } + }, + DefaultCredentials = new UserCredentials("admin", "changeit") + + }; + EventStoreProjectionManagementClient projectionClient = new EventStoreProjectionManagementClient(eventStoreClientSettings); foreach (FileInfo file in files) { @@ -353,7 +367,7 @@ private async Task LoadEventStoreProjections() try { Logger.LogInformation($"Creating projection [{projectionName}]"); - await projectionManager.CreateContinuousAsync(projectionName, projection, new UserCredentials("admin", "changeit")).ConfigureAwait(false); + await projectionClient.CreateContinuousAsync(projectionName, projection).ConfigureAwait(false); } catch (Exception e) { diff --git a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs index be42c2d..2afadba 100644 --- a/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs +++ b/TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // -// This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:3.1.0.0 +// This code was generated by SpecFlow (https://www.specflow.org/). +// SpecFlow Version:3.3.0.0 // SpecFlow Generator Version:3.1.0.0 // // Changes to this file may cause incorrect behavior and will be lost if @@ -17,7 +17,7 @@ namespace TransactionProcessorACL.IntegrationTests.LogonTransaction using System.Linq; - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.1.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [Xunit.TraitAttribute("Category", "base")] [Xunit.TraitAttribute("Category", "shared")] @@ -287,8 +287,8 @@ public virtual void LogonTransaction() { string[] tagsOfScenario = new string[] { "PRTest"}; - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Logon Transaction", null, new string[] { - "PRTest"}); + System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Logon Transaction", null, tagsOfScenario, argumentsOfScenario); #line 54 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -413,7 +413,7 @@ public virtual void LogonTransaction() this.ScenarioCleanup(); } - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.1.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class FixtureData : System.IDisposable { diff --git a/TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature.cs b/TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature.cs index 3a1a3f0..a6dc75a 100644 --- a/TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature.cs +++ b/TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // -// This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:3.1.0.0 +// This code was generated by SpecFlow (https://www.specflow.org/). +// SpecFlow Version:3.3.0.0 // SpecFlow Generator Version:3.1.0.0 // // Changes to this file may cause incorrect behavior and will be lost if @@ -17,7 +17,7 @@ namespace TransactionProcessorACL.IntegrationTests.SaleTransaction using System.Linq; - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.1.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [Xunit.TraitAttribute("Category", "base")] [Xunit.TraitAttribute("Category", "shared")] @@ -333,8 +333,8 @@ public virtual void SaleTransaction() { string[] tagsOfScenario = new string[] { "PRTest"}; - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Sale Transaction", null, new string[] { - "PRTest"}); + System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Sale Transaction", null, tagsOfScenario, argumentsOfScenario); #line 66 this.ScenarioInitialize(scenarioInfo); #line hidden @@ -501,7 +501,7 @@ public virtual void SaleTransaction() this.ScenarioCleanup(); } - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.1.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class FixtureData : System.IDisposable { diff --git a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj index d350699..cdce886 100644 --- a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj +++ b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj @@ -7,20 +7,20 @@ - + - + - + - + - - - - + + + + all diff --git a/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj b/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj index 3ff8b9e..e813a55 100644 --- a/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj +++ b/TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/TransactionProcessorACL/TransactionProcessorACL.csproj b/TransactionProcessorACL/TransactionProcessorACL.csproj index 78969e5..d7b9887 100644 --- a/TransactionProcessorACL/TransactionProcessorACL.csproj +++ b/TransactionProcessorACL/TransactionProcessorACL.csproj @@ -7,7 +7,7 @@ - + @@ -15,13 +15,13 @@ - - - - - - - + + + + + + +