Merge pull request #54 from TransactionProcessing/task/#53_usesharedconfig

StuartFerguson · web-flow · commit 1f9bdca1408e · 2021-08-06T20:20:06.000+01:00
Use shared config
diff --git a/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj b/FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
@@ -9,10 +9,10 @@
 		<PackageReference Include="EstateReporting.Database" Version="1.0.14.2" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
 		<PackageReference Include="SecurityService.Client" Version="1.0.6.2" />
-		<PackageReference Include="Shared" Version="1.0.5" />
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.5" />
+		<PackageReference Include="Shared" Version="1.0.13" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
 		<PackageReference Include="MediatR" Version="9.0.0" />
-		<PackageReference Include="Shared.EventStore" Version="1.0.5" />
+		<PackageReference Include="Shared.EventStore" Version="1.0.13" />
 		<PackageReference Include="System.IO.Abstractions" Version="13.2.29" />
 		<PackageReference Include="TransactionProcessor.Client" Version="1.0.12.3" />
 	</ItemGroup>
diff --git a/FileProcessor.Client/FileProcessor.Client.csproj b/FileProcessor.Client/FileProcessor.Client.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClientProxyBase" Version="1.0.8" />
+    <PackageReference Include="ClientProxyBase" Version="1.0.13" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj b/FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.5" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
 	</ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj b/FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.5" />
-		<PackageReference Include="Shared.EventStore" Version="1.0.5" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
+		<PackageReference Include="Shared.EventStore" Version="1.0.13" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj b/FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.5" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.0.13" />
   </ItemGroup>
 
 </Project>
diff --git a/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj b/FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.0.5" />
+    <PackageReference Include="Shared.EventStore" Version="1.0.13" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj b/FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj
@@ -17,7 +17,7 @@
 	  <PackageReference Include="EventStore.Client.Grpc.Streams" Version="20.10.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="SecurityService.Client" Version="1.0.6.2" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="1.0.8" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="1.0.13" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="SpecFlow.xUnit" Version="3.7.38" />
     <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/FileProcessor/Dockerfile b/FileProcessor/Dockerfile
@@ -1,6 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+FROM stuartferguson/txnprocbase:latest AS base
 WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build
diff --git a/FileProcessor/FileProcessor.csproj b/FileProcessor/FileProcessor.csproj
@@ -16,7 +16,7 @@
 	  <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
 	  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
-    <PackageReference Include="Shared" Version="1.0.5" />
+    <PackageReference Include="Shared" Version="1.0.13" />
 	  <PackageReference Include="NLog.Extensions.Logging" Version="1.7.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
diff --git a/FileProcessor/Properties/launchSettings.json b/FileProcessor/Properties/launchSettings.json
@@ -1,11 +1,23 @@
+//{
+//  "profiles": {
+//    "FileProcessor": {
+//      "commandName": "Project",
+//      "environmentVariables": {
+//        "ASPNETCORE_ENVIRONMENT": "Development"
+//      },
+//      "dotnetRunMessages": "true"
+//    }
+//  }
+//}
+
 {
-"profiles": {
-  "FileProcessor": {
-    "commandName": "Project",
-    "environmentVariables": {
-      "ASPNETCORE_ENVIRONMENT": "Development"
-    },
-    "dotnetRunMessages": "true"
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "FileProcessor": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
   }
-}
 }
diff --git a/FileProcessor/Startup.cs b/FileProcessor/Startup.cs
@@ -75,8 +75,11 @@ public class Startup
         public Startup(IWebHostEnvironment webHostEnvironment)
         {
             IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(webHostEnvironment.ContentRootPath)
+                                                                      .AddJsonFile("/home/txnproc/config/appsettings.json", true, true)
+                                                                      .AddJsonFile($"/home/txnproc/config/appsettings.{webHostEnvironment.EnvironmentName}.json", optional: true)
                                                                       .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                                                                      .AddJsonFile($"appsettings.{webHostEnvironment.EnvironmentName}.json", optional: true).AddEnvironmentVariables();
+                                                                      .AddJsonFile($"appsettings.{webHostEnvironment.EnvironmentName}.json", optional: true, reloadOnChange: true)
+                                                                      .AddEnvironmentVariables();
 
             Startup.Configuration = builder.Build();
             Startup.WebHostEnvironment = webHostEnvironment;
@@ -361,6 +364,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 
             Logger.Initialise(logger);
 
+            Action<String> loggerAction = message =>
+                                          {
+                                              Logger.LogInformation(message);
+                                          };
+            Startup.Configuration.LogConfiguration(loggerAction);
+
             ConfigurationReader.Initialise(Startup.Configuration);
 
             app.AddRequestLogging();
diff --git a/FileProcessor/appsettings.json b/FileProcessor/appsettings.json
@@ -1,37 +1,12 @@
 {
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "AllowedHosts": "*",
-  "EventStoreSettings": {
-    "ConnectionString": "https://192.168.1.133:2113",
-    "ConnectionName": "File Processor",
-    "UserName": "admin",
-    "Password": "changeit",
-    "START_PROJECTIONS": false,
-    "ContinuousProjectionsFolder": "",
-    "TcpPort": 1113,
-    "PersistentSubscriptionPollingInSeconds": 30
-  },
   "SecurityConfiguration": {
-    "ApiName": "fileProcessor",
-    "Authority": "https://192.168.1.133:5001"
-  },
-  "ConnectionStrings": {
-    "EstateReportingReadModel": "server=192.168.1.133;user id=sa;password=Sc0tland;database=EstateReportingReadModel",
-    "HealthCheck": "server=192.168.1.133;user id=sa;password=Sc0tland;database=master"
+    "ApiName": "fileProcessor"
   },
   "AppSettings": {
     "FileProfilePollingWindowInSeconds": 20,
     "SubscriptionFilter": "FileProcessor",
     "ClientId": "serviceClient",
     "ClientSecret": "d192cbc46d834d0da90e8a9d50ded543",
-    "EstateManagementApi": "http://192.168.1.133:5000",
-    "TransactionProcessorApi": "http://192.168.1.133:5002",
     "EventHandlerConfiguration": {
       "FileAddedToImportLogEvent": [
         "FileProcessor.BusinessLogic.EventHandling.FileDomainEventHandler,FileProcessor.BusinessLogic"
@@ -40,8 +15,6 @@
         "FileProcessor.BusinessLogic.EventHandling.FileDomainEventHandler,FileProcessor.BusinessLogic"
       ]
     },
-    "UseConnectionStringConfig": false,
-    "SecurityService": "https://192.168.1.133:5001",
     "TemporaryFileLocation": "/home/txnproc/bulkfiles/temporary",
     "FileProfiles": [
       {
