Skip to content

Commit 72db8ba

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #203 from TransactionProcessing/task/#202_fixhealthchecks
Fix health checks
2 parents e6c4137 + dd9b054 commit 72db8ba

7 files changed

Lines changed: 29 additions & 19 deletions

File tree

‎TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<PackageReference Include="EstateManagement.Client" Version="1.0.17-build86" />
99
<PackageReference Include="MessagingService.Client" Version="1.0.14-build56" />
1010
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
11-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
12-
<PackageReference Include="Shared.EventStore" Version="1.1.0" />
11+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.4" />
12+
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
1313
<PackageReference Include="MediatR" Version="9.0.0" />
1414
<PackageReference Include="System.IO.Abstractions" Version="13.2.9" />
1515
<PackageReference Include="VoucherManagement.Client" Version="1.0.8-build38" />

‎TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="1.1.0" />
10+
<PackageReference Include="ClientProxyBase" Version="1.1.4" />
1111
<PackageReference Include="Ductus.FluentDocker" Version="2.10.7" />
1212
<PackageReference Include="EstateManagement.Client" Version="1.0.17-build86" />
1313
<PackageReference Include="EstateReporting.Database" Version="1.0.19-build87" />
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.12" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
1919
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
20-
<PackageReference Include="Shared.IntegrationTesting" Version="1.1.0" />
20+
<PackageReference Include="Shared.IntegrationTesting" Version="1.1.4" />
2121
<PackageReference Include="Shouldly" Version="4.0.3" />
2222
<PackageReference Include="SpecFlow" Version="3.5.14" />
2323
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />

‎TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Shared.EventStore" Version="1.1.0" />
8+
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Shared.EventStore" Version="1.1.0" />
8+
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Shared.EventStore" Version="1.1.0" />
8+
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎TransactionProcessor/Startup.cs‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,27 @@ private static void ConfigureEventStoreSettings(EventStoreClientSettings setting
282282
Insecure = Startup.Configuration.GetValue<Boolean>("EventStoreSettings:Insecure"),
283283
Address = new Uri(Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString")),
284284
};
285-
285+
286+
settings.DefaultCredentials = new UserCredentials(Startup.Configuration.GetValue<String>("EventStoreSettings:UserName"),
287+
Startup.Configuration.GetValue<String>("EventStoreSettings:Password"));
288+
286289
Startup.EventStoreClientSettings = settings;
287290
}
288291

292+
private HttpClientHandler ApiEndpointHttpHandler(IServiceProvider serviceProvider)
293+
{
294+
return new HttpClientHandler
295+
{
296+
ServerCertificateCustomValidationCallback = (message,
297+
cert,
298+
chain,
299+
errors) =>
300+
{
301+
return true;
302+
}
303+
};
304+
}
305+
289306
/// <summary>
290307
/// Configures the middleware services.
291308
/// </summary>
@@ -298,16 +315,8 @@ private void ConfigureMiddlewareServices(IServiceCollection services)
298315
name: "Eventstore",
299316
failureStatus: HealthStatus.Unhealthy,
300317
tags: new string[] { "db", "eventstore" })
301-
.AddUrlGroup(new Uri($"{ConfigurationReader.GetValue("SecurityConfiguration", "Authority")}/health"),
302-
name: "Security Service",
303-
httpMethod: HttpMethod.Get,
304-
failureStatus: HealthStatus.Unhealthy,
305-
tags: new string[] { "security", "authorisation" })
306-
.AddUrlGroup(new Uri($"{ConfigurationReader.GetValue("AppSettings", "EstateManagementApi")}/health"),
307-
name: "Estate Management Service",
308-
httpMethod: HttpMethod.Get,
309-
failureStatus: HealthStatus.Unhealthy,
310-
tags: new string[] { "application", "estatemanagement" });
318+
.AddSecurityService(this.ApiEndpointHttpHandler)
319+
.AddEstateManagementService();
311320

312321
services.AddSwaggerGen(c =>
313322
{

‎TransactionProcessor/TransactionProcessor.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
3030
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.1" />
3131
<PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
32-
<PackageReference Include="Shared.EventStore" Version="1.1.0" />
32+
<PackageReference Include="Shared" Version="1.1.4" />
33+
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
3334
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.1" />
3435
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.1" />
3536
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.2" />

0 commit comments

Comments
 (0)