Skip to content

Fix nightly failures #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2020
Merged

Fix nightly failures #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...actionProcessorACL.BusinessLogic.Tests/TransactionProcessorACL.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Moq" Version="4.14.1" />
<PackageReference Include="Moq" Version="4.14.5" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
Expand Down
6 changes: 3 additions & 3 deletions TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MediatR" Version="8.0.1" />
<PackageReference Include="MediatR" Version="8.0.2" />
<PackageReference Include="SecurityService.Client" Version="1.0.0" />
<PackageReference Include="Shared" Version="0.0.14" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.0.1" />
<PackageReference Include="Shared" Version="0.0.15.7" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down
32 changes: 23 additions & 9 deletions TransactionProcessorACL.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<INetworkService>
Expand Down Expand Up @@ -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))
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand Down
12 changes: 6 additions & 6 deletions TransactionProcessorACL.IntegrationTests/LogonTransaction/LogonTransaction.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions TransactionProcessorACL.IntegrationTests/SaleTransaction/SalesTransaction.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="0.0.14" />
<PackageReference Include="ClientProxyBase" Version="0.0.15.7" />
<PackageReference Include="Ductus.FluentDocker" Version="2.7.3" />
<PackageReference Include="EstateManagement.Client" Version="1.0.0.1" />
<PackageReference Include="EstateManagement.Client" Version="1.0.1.1" />
<PackageReference Include="EstateReporting.Database" Version="0.0.4.5" />
<PackageReference Include="EventStore.Client" Version="5.0.2" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="20.6.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="SecurityService.Client" Version="1.0.0" />
<PackageReference Include="Shared.IntegrationTesting" Version="0.0.14" />
<PackageReference Include="Shared.IntegrationTesting" Version="0.0.15.7" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="SpecFlow" Version="3.1.97" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.1.97" />
<PackageReference Include="SpecFlow.xUnit" Version="3.1.97" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.0.1" />
<PackageReference Include="SpecFlow" Version="3.3.30" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.3.30" />
<PackageReference Include="SpecFlow.xUnit" Version="3.3.30" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessorACL.Tests/TransactionProcessorACL.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Moq" Version="4.14.1" />
<PackageReference Include="Moq" Version="4.14.5" />
<PackageReference Include="Shouldly" Version="3.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
Expand Down
16 changes: 8 additions & 8 deletions TransactionProcessorACL/TransactionProcessorACL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@

<ItemGroup>
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="4.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.5" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.4" />
<PackageReference Include="Shared" Version="0.0.14" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="5.1.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.4.1" />
<PackageReference Include="Shared" Version="0.0.15.7" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="5.1.2" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.5.1" />
</ItemGroup>

<ItemGroup>
Expand Down