Skip to content

Commit 4dfc01c

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #55 from StuartFerguson/nightly/#54_investigatefailures
Fix nightly failures
2 parents ba0d187 + ecb8b90 commit 4dfc01c

File tree

8 files changed

+56
-42
lines changed

8 files changed

+56
-42
lines changed

‎TransactionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
11-
<PackageReference Include="Moq" Version="4.14.1" />
11+
<PackageReference Include="Moq" Version="4.14.5" />
1212
<PackageReference Include="Shouldly" Version="3.0.2" />
1313
<PackageReference Include="xunit" Version="2.4.1" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">

‎TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="MediatR" Version="8.0.1" />
8+
<PackageReference Include="MediatR" Version="8.0.2" />
99
<PackageReference Include="SecurityService.Client" Version="1.0.0" />
10-
<PackageReference Include="Shared" Version="0.0.14" />
11-
<PackageReference Include="TransactionProcessor.Client" Version="1.0.0.1" />
10+
<PackageReference Include="Shared" Version="0.0.15.7" />
11+
<PackageReference Include="TransactionProcessor.Client" Version="1.0.1.1" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
using Ductus.FluentDocker.Services.Extensions;
1818
using EstateManagement.Client;
1919
using EstateReporting.Database;
20-
using EventStore.ClientAPI.Common.Log;
21-
using EventStore.ClientAPI.Projections;
22-
using EventStore.ClientAPI.SystemData;
20+
using EventStore.Client;
2321
using global::Shared.Logger;
2422
using Microsoft.Data.SqlClient;
2523
using SecurityService.Client;
@@ -191,8 +189,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName)
191189

192190
INetworkService testNetwork = DockerHelper.SetupTestNetwork();
193191
this.TestNetworks.Add(testNetwork);
194-
IContainerService eventStoreContainer =
195-
DockerHelper.SetupEventStoreContainer(this.EventStoreContainerName, this.Logger, "eventstore/eventstore:release-5.0.2", testNetwork, traceFolder);
192+
IContainerService eventStoreContainer = DockerHelper.SetupEventStoreContainer(this.EventStoreContainerName, this.Logger, "eventstore/eventstore:20.6.0-buster-slim", testNetwork, traceFolder, usesEventStore2006OrLater: true);
196193

197194
IContainerService estateManagementContainer = DockerHelper.SetupEstateManagementContainer(this.EstateManagementContainerName, this.Logger,
198195
"stuartferguson/estatemanagement", new List<INetworkService>
@@ -332,7 +329,6 @@ private async Task LoadEventStoreProjections()
332329
//Start our Continous Projections - we might decide to do this at a different stage, but now lets try here
333330
String projectionsFolder = "../../../projections/continuous";
334331
IPAddress[] ipAddresses = Dns.GetHostAddresses("127.0.0.1");
335-
IPEndPoint endpoint = new IPEndPoint(ipAddresses.First(), this.EventStoreHttpPort);
336332

337333
if (!String.IsNullOrWhiteSpace(projectionsFolder))
338334
{
@@ -342,8 +338,26 @@ private async Task LoadEventStoreProjections()
342338
{
343339
FileInfo[] files = di.GetFiles();
344340

345-
// TODO: possibly need to change timeout and logger here
346-
ProjectionsManager projectionManager = new ProjectionsManager(new ConsoleLogger(), endpoint, TimeSpan.FromSeconds(30));
341+
EventStoreClientSettings eventStoreClientSettings = new EventStoreClientSettings
342+
{
343+
ConnectivitySettings = new EventStoreClientConnectivitySettings
344+
{
345+
Address = new Uri($"https://{ipAddresses.First().ToString()}:{this.EventStoreHttpPort}")
346+
},
347+
CreateHttpMessageHandler = () => new SocketsHttpHandler
348+
{
349+
SslOptions =
350+
{
351+
RemoteCertificateValidationCallback = (sender,
352+
certificate,
353+
chain,
354+
errors) => true,
355+
}
356+
},
357+
DefaultCredentials = new UserCredentials("admin", "changeit")
358+
359+
};
360+
EventStoreProjectionManagementClient projectionClient = new EventStoreProjectionManagementClient(eventStoreClientSettings);
347361

348362
foreach (FileInfo file in files)
349363
{
@@ -353,7 +367,7 @@ private async Task LoadEventStoreProjections()
353367
try
354368
{
355369
Logger.LogInformation($"Creating projection [{projectionName}]");
356-
await projectionManager.CreateContinuousAsync(projectionName, projection, new UserCredentials("admin", "changeit")).ConfigureAwait(false);
370+
await projectionClient.CreateContinuousAsync(projectionName, projection).ConfigureAwait(false);
357371
}
358372
catch (Exception e)
359373
{

‎TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature.cs‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="0.0.14" />
10+
<PackageReference Include="ClientProxyBase" Version="0.0.15.7" />
1111
<PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
12-
<PackageReference Include="EstateManagement.Client" Version="1.0.0.1" />
12+
<PackageReference Include="EstateManagement.Client" Version="1.0.1.1" />
1313
<PackageReference Include="EstateReporting.Database" Version="0.0.4.5" />
14-
<PackageReference Include="EventStore.Client" Version="5.0.2" />
14+
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="20.6.0" />
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.5" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
1717
<PackageReference Include="SecurityService.Client" Version="1.0.0" />
18-
<PackageReference Include="Shared.IntegrationTesting" Version="0.0.14" />
18+
<PackageReference Include="Shared.IntegrationTesting" Version="0.0.15.7" />
1919
<PackageReference Include="Shouldly" Version="3.0.2" />
20-
<PackageReference Include="SpecFlow" Version="3.1.97" />
21-
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.1.97" />
22-
<PackageReference Include="SpecFlow.xUnit" Version="3.1.97" />
23-
<PackageReference Include="TransactionProcessor.Client" Version="1.0.0.1" />
20+
<PackageReference Include="SpecFlow" Version="3.3.30" />
21+
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.3.30" />
22+
<PackageReference Include="SpecFlow.xUnit" Version="3.3.30" />
23+
<PackageReference Include="TransactionProcessor.Client" Version="1.0.1.1" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
2626
<PrivateAssets>all</PrivateAssets>

‎TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
12-
<PackageReference Include="Moq" Version="4.14.1" />
12+
<PackageReference Include="Moq" Version="4.14.5" />
1313
<PackageReference Include="Shouldly" Version="3.0.2" />
1414
<PackageReference Include="xunit" Version="2.4.1" />
1515
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">

‎TransactionProcessorACL/TransactionProcessorACL.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
<ItemGroup>
99
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
10-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
10+
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
1111
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
1212
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.1.1" />
1313
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
1414
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.5" />
1515
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
1616
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
1717
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.4" />
18-
<PackageReference Include="Shared" Version="0.0.14" />
19-
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
20-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.4.1" />
21-
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="5.1.1" />
22-
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.4.1" />
23-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.4.1" />
24-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.4.1" />
18+
<PackageReference Include="Shared" Version="0.0.15.7" />
19+
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
20+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" />
21+
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="5.1.2" />
22+
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.5.1" />
23+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.5.1" />
24+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.5.1" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

0 commit comments

Comments
 (0)