Skip to content

tweaks made to compose files and setup tool #34

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 2 commits into from
Apr 1, 2022
Merged

tweaks made to compose files and setup tool #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec50c2f
tweaks made to compose files and setup tool
StuartFerguson Apr 1, 2022
d0db724
Merge branch 'master' into bug/issueswithcomposefiles
StuartFerguson Apr 1, 2022
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 ...actionProcessing.SchedulerService/TransactionProcessing.SchedulerService/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
17 changes: 12 additions & 5 deletions TransactionProcessor.SystemSetupTool/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -32,11 +34,16 @@ class Program
private static EventStorePersistentSubscriptionsClient PersistentSubscriptionsClient;

private static TokenResponse TokenResponse;

static async Task Main(string[] args)
{
Func<String, String> estateResolver = s => { return "http://192.168.0.133:5000"; };
Func<String, String> 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<String, String> estateResolver = s => { return ConfigurationReader.GetValue("EstateManagementUri"); };
Func<String, String> securityResolver = s => { return ConfigurationReader.GetValue("SecurityServiceUri"); };
HttpClientHandler handler = new HttpClientHandler
{
ServerCertificateCustomValidationCallback = (message,
Expand All @@ -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);

Expand All @@ -61,7 +68,7 @@ static async Task Main(string[] args)
await DeployProjections();

// Setup subcriptions
//await SetupSubscriptions();
await SetupSubscriptions();

await Program.SetupEstatesFromConfig();
}
Expand Down
6 changes: 6 additions & 0 deletions TransactionProcessor.SystemSetupTool/TransactionProcessor.SystemSetupTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@
<PackageReference Include="EstateManagement.Client" Version="1.0.15-build77" />
<PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
<PackageReference Include="EventStore.Client.Grpc.ProjectionManagement" Version="21.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
<PackageReference Include="Shared" Version="1.1.8" />
</ItemGroup>

<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="identityserverconfig.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
13 changes: 13 additions & 0 deletions TransactionProcessor.SystemSetupTool/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion TransactionProcessor.SystemSetupTool/setupconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"family_name": "User"
},
"device": {
"device_identifier": "d6b3e40886681417"
"device_identifier": "dea09153b9c4220c"
}
},
{
Expand Down
9 changes: 8 additions & 1 deletion docker-compose-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -103,14 +106,15 @@ 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
ports:
- "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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -233,3 +239,4 @@ services:
- "5010:5010"
environment:
- EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false
- EventStoreSettings:Insecure=true
6 changes: 6 additions & 0 deletions docker-compose-prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -233,3 +239,4 @@ services:
- "5010:5010"
environment:
- EventStoreSettings:ConnectionString=esdb://admin:changeit@eventstore:2113?tls=false&tlsVerifyCert=false
- EventStoreSettings:Insecure=true