From ec50c2f1f46c306ebf4018ff62e0988d438615cb Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 1 Apr 2022 09:14:46 +0100 Subject: [PATCH] tweaks made to compose files and setup tool --- .../appsettings.json | 2 +- TransactionProcessor.SystemSetupTool/Program.cs | 17 ++++++++++++----- .../TransactionProcessor.SystemSetupTool.csproj | 6 ++++++ .../appsettings.json | 13 +++++++++++++ .../setupconfig.json | 2 +- docker-compose-master.yml | 9 ++++++++- docker-compose-prerelease.yml | 6 ++++++ docker-compose.yml | 7 +++++++ 8 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 TransactionProcessor.SystemSetupTool/appsettings.json diff --git a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/appsettings.json b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/appsettings.json index 1a22697..270a6ab 100644 --- a/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/appsettings.json +++ b/TransactionProcessing.SchedulerService/TransactionProcessing.SchedulerService/appsettings.json @@ -7,6 +7,6 @@ } }, "ConnectionStrings": { - "SchedulerReadModel": "server=127.0.0.1;user id=sa;password=Scotland;database=Scheduler" + "SchedulerReadModel": "server=127.0.0.1;user id=sa;password=sp1ttal;database=Scheduler" } } diff --git a/TransactionProcessor.SystemSetupTool/Program.cs b/TransactionProcessor.SystemSetupTool/Program.cs index 40de7d6..805407c 100644 --- a/TransactionProcessor.SystemSetupTool/Program.cs +++ b/TransactionProcessor.SystemSetupTool/Program.cs @@ -20,6 +20,8 @@ namespace TransactionProcessor.SystemSetupTool using SecurityService.DataTransferObjects.Requests; using SecurityService.DataTransferObjects.Responses; using EventStore.Client; + using Microsoft.Extensions.Configuration; + using Shared.General; class Program { @@ -32,11 +34,16 @@ class Program private static EventStorePersistentSubscriptionsClient PersistentSubscriptionsClient; private static TokenResponse TokenResponse; - + static async Task Main(string[] args) { - Func estateResolver = s => { return "http://192.168.0.133:5000"; }; - Func securityResolver = s => { return "https://192.168.0.133:5001"; }; + + IConfigurationBuilder builder = new ConfigurationBuilder().AddJsonFile("appsettings.json", optional: true, reloadOnChange: true); + IConfigurationRoot configurationRoot = builder.Build(); + ConfigurationReader.Initialise(configurationRoot); + + Func estateResolver = s => { return ConfigurationReader.GetValue("EstateManagementUri"); }; + Func securityResolver = s => { return ConfigurationReader.GetValue("SecurityServiceUri"); }; HttpClientHandler handler = new HttpClientHandler { ServerCertificateCustomValidationCallback = (message, @@ -51,7 +58,7 @@ static async Task Main(string[] args) Program.EstateClient = new EstateClient(estateResolver, client); Program.SecurityServiceClient = new SecurityServiceClient(securityResolver, client); - EventStoreClientSettings settings = EventStoreClientSettings.Create("esdb://admin:changeit@192.168.0.133:2113?tls=true&tlsVerifyCert=false"); + EventStoreClientSettings settings = EventStoreClientSettings.Create(ConfigurationReader.GetValue("EventStoreAddress")); Program.ProjectionClient = new EventStoreProjectionManagementClient(settings); Program.PersistentSubscriptionsClient = new EventStorePersistentSubscriptionsClient(settings); @@ -61,7 +68,7 @@ static async Task Main(string[] args) await DeployProjections(); // Setup subcriptions - //await SetupSubscriptions(); + await SetupSubscriptions(); await Program.SetupEstatesFromConfig(); } diff --git a/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj b/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj index 20bfa8b..427e6f6 100644 --- a/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj +++ b/TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj @@ -19,11 +19,17 @@ + + + + + Always + Always diff --git a/TransactionProcessor.SystemSetupTool/appsettings.json b/TransactionProcessor.SystemSetupTool/appsettings.json new file mode 100644 index 0000000..3da65fa --- /dev/null +++ b/TransactionProcessor.SystemSetupTool/appsettings.json @@ -0,0 +1,13 @@ +{ + "AppSettings": { + // Local (Docker) + //"EstateManagementUri": "http://127.0.0.1:5000", + //"SecurityServiceUri": "https://127.0.0.1:5001", + //"EventStoreAddress": "esdb://admin:changeit@127.0.0.1:4113?tls=false&tlsVerifyCert=false" + + // Staging + "EstateManagementUri": "http://192.168.0.133:5000", + "SecurityServiceUri": "https://192.168.0.133:5001", + "EventStoreAddress": "esdb://admin:changeit@192.168.0.133:2113?tls=true&tlsVerifyCert=false" + } +} diff --git a/TransactionProcessor.SystemSetupTool/setupconfig.json b/TransactionProcessor.SystemSetupTool/setupconfig.json index 7cfb573..5060dc7 100644 --- a/TransactionProcessor.SystemSetupTool/setupconfig.json +++ b/TransactionProcessor.SystemSetupTool/setupconfig.json @@ -117,7 +117,7 @@ "family_name": "User" }, "device": { - "device_identifier": "d6b3e40886681417" + "device_identifier": "dea09153b9c4220c" } }, { diff --git a/docker-compose-master.yml b/docker-compose-master.yml index 539b9fa..ec52d0f 100644 --- a/docker-compose-master.yml +++ b/docker-compose-master.yml @@ -55,6 +55,7 @@ services: - "5000:5000" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5000 @@ -74,6 +75,7 @@ services: - "5005:5005" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5005 @@ -93,6 +95,7 @@ services: - "5006:5006" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5006 @@ -103,7 +106,7 @@ services: - securityservice_master transactionprocessor: - image: stuartferguson/transactionprocesso:master + image: stuartferguson/transactionprocessor:master container_name: transactionprocessor_master volumes: - F:\home\txnproc\docker\master\trace:/home/txnproc/trace @@ -111,6 +114,7 @@ services: - "5002:5002" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5002 @@ -153,6 +157,7 @@ services: - "5007:5007" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5007 @@ -208,6 +213,7 @@ services: - "5009:5009" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5009 @@ -233,3 +239,4 @@ services: - "5010:5010" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true diff --git a/docker-compose-prerelease.yml b/docker-compose-prerelease.yml index 3b2ad5e..6730282 100644 --- a/docker-compose-prerelease.yml +++ b/docker-compose-prerelease.yml @@ -55,6 +55,7 @@ services: - "5000:5000" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5000 @@ -74,6 +75,7 @@ services: - "5005:5005" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5005 @@ -93,6 +95,7 @@ services: - "5006:5006" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5006 @@ -111,6 +114,7 @@ services: - "5002:5002" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5002 @@ -153,6 +157,7 @@ services: - "5007:5007" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5007 @@ -208,6 +213,7 @@ services: - "5009:5009" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5009 diff --git a/docker-compose.yml b/docker-compose.yml index dcabc6a..4f15349 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,7 @@ services: - "5000:5000" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5000 @@ -74,6 +75,7 @@ services: - "5005:5005" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5005 @@ -93,6 +95,7 @@ services: - "5006:5006" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5006 @@ -111,6 +114,7 @@ services: - "5002:5002" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5002 @@ -153,6 +157,7 @@ services: - "5007:5007" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5007 @@ -208,6 +213,7 @@ services: - "5009:5009" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true - AppSettings:SecurityService=https://securityservice:5001 - SecurityConfiguration:Authority=https://securityservice:5001 - urls=http://*:5009 @@ -233,3 +239,4 @@ services: - "5010:5010" environment: - EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false + - EventStoreSettings:Insecure=true