Skip to content

Commit d0d4fde

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #96 from TransactionProcessing/bug/#94_fix_es_registrations
upgrade event store registrations
2 parents 942cd8b + 344a402 commit d0d4fde

5 files changed

Lines changed: 18 additions & 45 deletions

File tree

‎CallbackHandler.BusinessLogic.Tests/Mediator/MediatorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private IConfigurationRoot SetupMemoryConfiguration()
7272

7373
configuration.Add("ConnectionStrings:HealthCheck", "HeathCheckConnString");
7474
configuration.Add("SecurityConfiguration:Authority", "https://127.0.0.1");
75-
configuration.Add("EventStoreSettings:ConnectionString", "https://127.0.0.1:2113");
75+
configuration.Add("EventStoreSettings:ConnectionString", "esdb://127.0.0.1:2113");
7676
configuration.Add("EventStoreSettings:ConnectionName", "UnitTestConnection");
7777
configuration.Add("EventStoreSettings:UserName", "admin");
7878
configuration.Add("EventStoreSettings:Password", "changeit");

‎CallbackHandler.Tests/BootstrapperTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private IConfigurationRoot SetupMemoryConfiguration()
4040

4141
configuration.Add("ConnectionStrings:HealthCheck", "HeathCheckConnString");
4242
configuration.Add("SecurityConfiguration:Authority", "https://127.0.0.1");
43-
configuration.Add("EventStoreSettings:ConnectionString", "https://127.0.0.1:2113");
43+
configuration.Add("EventStoreSettings:ConnectionString", "esdb://127.0.0.1:2113");
4444
configuration.Add("EventStoreSettings:ConnectionName", "UnitTestConnection");
4545
configuration.Add("EventStoreSettings:UserName", "admin");
4646
configuration.Add("EventStoreSettings:Password", "changeit");

‎CallbackHandler/Bootstrapper/MiddlewareRegistry.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
using System.IO;
66
using System.Reflection;
77
using Common;
8+
using EventStore.Client;
89
using Lamar;
10+
using Microsoft.Extensions.Configuration;
911
using Microsoft.Extensions.DependencyInjection;
1012
using Microsoft.Extensions.Diagnostics.HealthChecks;
1113
using Microsoft.OpenApi.Models;
@@ -19,11 +21,14 @@ public class MiddlewareRegistry :ServiceRegistry
1921
{
2022
public MiddlewareRegistry()
2123
{
22-
this.AddHealthChecks().AddEventStore(Startup.EventStoreClientSettings,
23-
userCredentials: Startup.EventStoreClientSettings.DefaultCredentials,
24-
name: "Eventstore",
25-
failureStatus: HealthStatus.Unhealthy,
26-
tags: new string[] { "db", "eventstore" });
24+
String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
25+
EventStoreClientSettings eventStoreSettings = EventStoreClientSettings.Create(connectionString);
26+
27+
this.AddHealthChecks().AddEventStore(eventStoreSettings,
28+
userCredentials: eventStoreSettings.DefaultCredentials,
29+
name: "Eventstore",
30+
failureStatus: HealthStatus.Unhealthy,
31+
tags: new string[] { "db", "eventstore" });
2732

2833
this.AddSwaggerGen(c =>
2934
{
@@ -43,8 +48,8 @@ public MiddlewareRegistry()
4348
c.ExampleFilters();
4449

4550
//Locate the XML files being generated by ASP.NET...
46-
var directory = new DirectoryInfo(AppContext.BaseDirectory);
47-
var xmlFiles = directory.GetFiles("*.xml");
51+
DirectoryInfo directory = new DirectoryInfo(AppContext.BaseDirectory);
52+
FileInfo[] xmlFiles = directory.GetFiles("*.xml");
4853

4954
//... and tell Swagger to use those XML comments.
5055
foreach (FileInfo fileInfo in xmlFiles)

‎CallbackHandler/Bootstrapper/RepositoryRegistry.cs‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,12 @@ public RepositoryRegistry()
2121
{
2222
this.AddTransient<IEventStoreContext, EventStoreContext>();
2323
this.AddSingleton<IAggregateRepository<CallbackMessageAggregate, DomainEvent>, AggregateRepository<CallbackMessageAggregate, DomainEvent>>();
24-
25-
Boolean insecureES = Startup.Configuration.GetValue<Boolean>("EventStoreSettings:Insecure");
2624

27-
Func<SocketsHttpHandler> CreateHttpMessageHandler = () => new SocketsHttpHandler
28-
{
29-
SslOptions = new SslClientAuthenticationOptions
30-
{
31-
RemoteCertificateValidationCallback = (sender,
32-
certificate,
33-
chain,
34-
errors) => {
35-
return true;
36-
}
37-
}
38-
};
25+
String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
3926

40-
this.AddEventStoreProjectionManagementClient(Startup.ConfigureEventStoreSettings);
27+
this.AddEventStoreProjectionManagementClient(connectionString);
28+
this.AddEventStorePersistentSubscriptionsClient(connectionString);
4129

42-
if (insecureES)
43-
{
44-
this.AddInSecureEventStoreClient(Startup.EventStoreClientSettings.ConnectivitySettings.Address, CreateHttpMessageHandler);
45-
}
46-
else
47-
{
48-
this.AddEventStoreClient(Startup.EventStoreClientSettings.ConnectivitySettings.Address, CreateHttpMessageHandler);
49-
}
30+
this.AddEventStoreClient(connectionString);
5031
}
5132
}

‎CallbackHandler/Startup.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,6 @@ public Startup(IWebHostEnvironment webHostEnvironment)
7272
/// </value>
7373
public static IWebHostEnvironment WebHostEnvironment { get; set; }
7474

75-
internal static EventStoreClientSettings EventStoreClientSettings;
76-
77-
internal static void ConfigureEventStoreSettings(EventStoreClientSettings settings)
78-
{
79-
settings.ConnectivitySettings = EventStoreClientConnectivitySettings.Default;
80-
settings.ConnectivitySettings.Address = new Uri(Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString"));
81-
settings.ConnectivitySettings.Insecure = Startup.Configuration.GetValue<Boolean>("EventStoreSettings:Insecure");
82-
83-
settings.DefaultCredentials = new UserCredentials(Startup.Configuration.GetValue<String>("EventStoreSettings:UserName"),
84-
Startup.Configuration.GetValue<String>("EventStoreSettings:Password"));
85-
Startup.EventStoreClientSettings = settings;
86-
}
87-
8875
public static Container Container;
8976
// This method gets called by the runtime. Use this method to add services to the container.
9077
public void ConfigureContainer(ServiceRegistry services)

0 commit comments

Comments
 (0)