Merge pull request #203 from TransactionProcessing/task/#202_fixhealthchecks

Fix health checks

Author: StuartFerguson

TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj

@@ -8,8 +8,8 @@
     <PackageReference Include="EstateManagement.Client" Version="1.0.17-build86" />
     <PackageReference Include="MessagingService.Client" Version="1.0.14-build56" />
     <PackageReference Include="SecurityService.Client" Version="1.0.8" />
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
-    <PackageReference Include="Shared.EventStore" Version="1.1.0" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.4" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="13.2.9" />
     <PackageReference Include="VoucherManagement.Client" Version="1.0.8-build38" />

TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="1.1.0" />
+    <PackageReference Include="ClientProxyBase" Version="1.1.4" />
     <PackageReference Include="Ductus.FluentDocker" Version="2.10.7" />
     <PackageReference Include="EstateManagement.Client" Version="1.0.17-build86" />
     <PackageReference Include="EstateReporting.Database" Version="1.0.19-build87" />
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="SecurityService.Client" Version="1.0.8" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="1.1.0" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="1.1.4" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="SpecFlow" Version="3.5.14" />
     <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />

TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.1.0" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
   </ItemGroup>
 
   <ItemGroup>

TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.1.0" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
   </ItemGroup>
 
   <ItemGroup>

TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.1.0" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
   </ItemGroup>
 
   <ItemGroup>

TransactionProcessor/Startup.cs

@@ -282,10 +282,27 @@ private static void ConfigureEventStoreSettings(EventStoreClientSettings setting
                 Insecure = Startup.Configuration.GetValue<Boolean>("EventStoreSettings:Insecure"),
                 Address = new Uri(Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString")),
             };
-            
+
+            settings.DefaultCredentials = new UserCredentials(Startup.Configuration.GetValue<String>("EventStoreSettings:UserName"),
+                                                              Startup.Configuration.GetValue<String>("EventStoreSettings:Password"));
+
             Startup.EventStoreClientSettings = settings;
         }
 
+        private HttpClientHandler ApiEndpointHttpHandler(IServiceProvider serviceProvider)
+        {
+            return new HttpClientHandler
+                   {
+                       ServerCertificateCustomValidationCallback = (message,
+                                                                    cert,
+                                                                    chain,
+                                                                    errors) =>
+                                                                   {
+                                                                       return true;
+                                                                   }
+                   };
+        }
+
         /// <summary>
         /// Configures the middleware services.
         /// </summary>
@@ -298,16 +315,8 @@ private void ConfigureMiddlewareServices(IServiceCollection services)
                                    name: "Eventstore",
                                    failureStatus: HealthStatus.Unhealthy,
                                    tags: new string[] { "db", "eventstore" })
-                    .AddUrlGroup(new Uri($"{ConfigurationReader.GetValue("SecurityConfiguration", "Authority")}/health"),
-                                 name: "Security Service",
-                                 httpMethod: HttpMethod.Get,
-                                 failureStatus: HealthStatus.Unhealthy,
-                                 tags: new string[] { "security", "authorisation" })
-                    .AddUrlGroup(new Uri($"{ConfigurationReader.GetValue("AppSettings", "EstateManagementApi")}/health"),
-                                 name: "Estate Management Service",
-                                 httpMethod: HttpMethod.Get,
-                                 failureStatus: HealthStatus.Unhealthy,
-                                 tags: new string[] { "application", "estatemanagement" });
+                    .AddSecurityService(this.ApiEndpointHttpHandler)
+                    .AddEstateManagementService();
 
             services.AddSwaggerGen(c =>
             {

TransactionProcessor/TransactionProcessor.csproj

@@ -29,7 +29,8 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.1" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
-    <PackageReference Include="Shared.EventStore" Version="1.1.0" />
+    <PackageReference Include="Shared" Version="1.1.4" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.2" />