Skip to content

Use shared config #89

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
Aug 6, 2021
Merged

Use shared config #89

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 TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="MediatR" Version="9.0.0" />
<PackageReference Include="SecurityService.Client" Version="1.0.5.1" />
<PackageReference Include="Shared" Version="1.0.5" />
<PackageReference Include="Shared" Version="1.0.13" />
<PackageReference Include="TransactionProcessor.Client" Version="1.0.11.2" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="1.0.5" />
<PackageReference Include="ClientProxyBase" Version="1.0.13" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.7" />
<PackageReference Include="EstateManagement.Client" Version="1.0.9.2" />
<PackageReference Include="EstateReporting.Database" Version="1.0.12" />
Expand All @@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="SecurityService.Client" Version="1.0.5.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="1.0.7" />
<PackageReference Include="Shared.IntegrationTesting" Version="1.0.13" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="SpecFlow" Version="3.5.14" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessorACL/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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
Expand Down
11 changes: 10 additions & 1 deletion TransactionProcessorACL/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,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;
Expand Down Expand Up @@ -213,6 +216,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF

Logger.Initialise(logger);

Action<String> loggerAction = message =>
{
Logger.LogInformation(message);
};
Startup.Configuration.LogConfiguration(loggerAction);

app.AddRequestLogging();
app.AddResponseLogging();
app.AddExceptionHandler();
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessorACL/TransactionProcessorACL.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<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.0" />
<PackageReference Include="Shared" Version="1.0.5" />
<PackageReference Include="Shared" Version="1.0.13" />
<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" />
Expand Down
15 changes: 2 additions & 13 deletions TransactionProcessorACL/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"AppSettings": {
"SecurityService": "https://192.168.1.133:5001",
"ClientId": "serviceClient",
"ClientSecret": "d192cbc46d834d0da90e8a9d50ded543",
"TransactionProcessorApi": "http://192.168.1.133:5002",
"MinimumSupportedApplicationVersion": "1.0.5"
},
"SecurityConfiguration": {
"ApiName": "transactionProcessorACL",
"Authority": "https://192.168.1.133:5001"
},
"AllowedHosts": "*"
"ApiName": "transactionProcessorACL"
}
}