diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd7ed4..5b7570f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] + +## [1.2.1] - 2023-06-07 ### Changed - Updated Authorisation Server git clone command in readme +- Rebuilt to include v1.0.1 of the [Authorisation Server](https://github.com/ConsumerDataRight/authorisation-server) ## [1.2.0] - 2023-03-21 ### Added diff --git a/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj b/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj index afeff4a..4bf2d04 100644 --- a/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj +++ b/Source/CDR.DataHolder.API.Gateway.mTLS/CDR.DataHolder.API.Gateway.mTLS.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.API.Gateway.mTLS/appsettings.Container.json b/Source/CDR.DataHolder.API.Gateway.mTLS/appsettings.Container.json deleted file mode 100644 index 1df4f78..0000000 --- a/Source/CDR.DataHolder.API.Gateway.mTLS/appsettings.Container.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "ConnectionStrings": { - "DataHolder_Bank_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True", - "DataHolder_Bank_Logging_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True" - }, - "Serilog": { - "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.MSSqlServer" ], - "MinimumLevel": "Debug", - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "{Timestamp:HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "/tmp/cdr-mdh-gateway-mtls.log", - "outputTemplate": "{Timestamp:dd/MM/yyyy HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "MSSqlServer", - "Args": { - "connectionString": "DataHolder_Bank_Logging_DB", - "sinkOptionsSection": { - "tableName": "LogEvents-Gateway-mTLS", - "autoCreateSqlTable": true - }, - "restrictedToMinimumLevel": "Verbose", - "batchPostingLimit": 1000, - "period": "0.00:00:10", - "columnOptionsSection": { - "disableTriggers": true, - "clusteredColumnstoreIndex": false, - "primaryKeyColumnName": "Id", - "removeStandardColumns": [ "MessageTemplate", "Properties" ], - "additionalColumns": [ - { - "ColumnName": "Environment", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ThreadId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "MethodName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "SourceContext", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 100 - } - ] - } - } - } - ] - } -} \ No newline at end of file diff --git a/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj b/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj index 257628b..7475c21 100644 --- a/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj +++ b/Source/CDR.DataHolder.API.Infrastructure.UnitTests/CDR.DataHolder.API.Infrastructure.UnitTests.csproj @@ -3,9 +3,9 @@ net6.0 false - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj b/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj index f3917c9..2a6125a 100644 --- a/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj +++ b/Source/CDR.DataHolder.API.Infrastructure/CDR.DataHolder.API.Infrastructure.csproj @@ -2,9 +2,9 @@ net6.0 - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.API.Logger/CDR.DataHolder.API.Logger.csproj b/Source/CDR.DataHolder.API.Logger/CDR.DataHolder.API.Logger.csproj index d059ee3..320c7a0 100644 --- a/Source/CDR.DataHolder.API.Logger/CDR.DataHolder.API.Logger.csproj +++ b/Source/CDR.DataHolder.API.Logger/CDR.DataHolder.API.Logger.csproj @@ -4,9 +4,9 @@ net6.0 enable enable - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj b/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj index dea1a34..175e946 100644 --- a/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj +++ b/Source/CDR.DataHolder.Admin.API/CDR.DataHolder.Admin.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.Admin.API/appsettings.Container.json b/Source/CDR.DataHolder.Admin.API/appsettings.Container.json deleted file mode 100644 index 316fa31..0000000 --- a/Source/CDR.DataHolder.Admin.API/appsettings.Container.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "ConnectionStrings": { - "DataHolder_Bank_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True", - "DataHolder_Bank_Logging_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True" - }, - "AdminBaseUri": "https://mock-data-holder:8002", - "DataHolderJwksUri": "https://mock-data-holder:8001/.well-known/openid-configuration/jwks", - "DataHolderIssuer": "https://mock-data-holder:8001", - "RegisterJwksUri": "https://mock-register:7000/cdr-register/v1/jwks", - "Serilog": { - "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.MSSqlServer" ], - "MinimumLevel": "Debug", - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "{Timestamp:HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "/tmp/cdr-mdh-admin-api.log", - "outputTemplate": "{Timestamp:dd/MM/yyyy HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "MSSqlServer", - "Args": { - "connectionString": "DataHolder_Bank_Logging_DB", - "sinkOptionsSection": { - "tableName": "LogEvents-Admin-API", - "autoCreateSqlTable": true - }, - "restrictedToMinimumLevel": "Verbose", - "batchPostingLimit": 1000, - "period": "0.00:00:10", - "columnOptionsSection": { - "disableTriggers": true, - "clusteredColumnstoreIndex": false, - "primaryKeyColumnName": "Id", - "removeStandardColumns": [ "MessageTemplate", "Properties" ], - "additionalColumns": [ - { - "ColumnName": "Environment", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ThreadId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "MethodName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "SourceContext", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 100 - } - ] - } - } - } - ] - } -} \ No newline at end of file diff --git a/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj b/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj index 6b029a9..89a51f3 100644 --- a/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj +++ b/Source/CDR.DataHolder.Domain/CDR.DataHolder.Domain.csproj @@ -2,9 +2,9 @@ net6.0 - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj b/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj index ab438b5..555173f 100644 --- a/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj +++ b/Source/CDR.DataHolder.IntegrationTests/CDR.DataHolder.IntegrationTests.csproj @@ -2,9 +2,9 @@ net6.0 false - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj b/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj index becc9c7..1e724f9 100644 --- a/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj +++ b/Source/CDR.DataHolder.Manage.API/CDR.DataHolder.Manage.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.Manage.API/Controllers/ManageController.cs b/Source/CDR.DataHolder.Manage.API/Controllers/ManageController.cs index 939c281..ba29ce8 100644 --- a/Source/CDR.DataHolder.Manage.API/Controllers/ManageController.cs +++ b/Source/CDR.DataHolder.Manage.API/Controllers/ManageController.cs @@ -2,9 +2,7 @@ using CDR.DataHolder.Repository.Infrastructure; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Serilog.Context; using System.IO; -using System.Net.Http; using System.Threading.Tasks; namespace CDR.DataHolder.Manage.API.Controllers @@ -42,34 +40,6 @@ public async Task LoadData() } return Ok(); - } - - private async Task GetData(string endpoint, int version) - { - using (LogContext.PushProperty("MethodName", ControllerContext.RouteData.Values["action"].ToString())) - { - _logger.LogInformation("Retrieving data from {endpoint} (x-v: {version})...", endpoint, version); - } - - var httpClient = GetHttpClient(); - httpClient.DefaultRequestHeaders.Add("x-v", version.ToString()); - var response = await httpClient.GetAsync(endpoint); - - _logger.LogInformation("Status code: {statusCode}", response.StatusCode); - - if (response.IsSuccessStatusCode) - { - return await response.Content.ReadAsStringAsync(); - } - - return null; - } - - private static HttpClient GetHttpClient() - { - var clientHandler = new HttpClientHandler(); - clientHandler.ServerCertificateCustomValidationCallback += (sender, cert, chain, sslPolicyErrors) => true; - return new HttpClient(clientHandler); - } + } } } \ No newline at end of file diff --git a/Source/CDR.DataHolder.Manage.API/appsettings.Container.json b/Source/CDR.DataHolder.Manage.API/appsettings.Container.json deleted file mode 100644 index 3538145..0000000 --- a/Source/CDR.DataHolder.Manage.API/appsettings.Container.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "ConnectionStrings": { - "DataHolder_Bank_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True", - "DataHolder_Bank_Logging_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True", - "DataHolder_Bank_Migrations_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True" - }, - "SeedData": { - "FilePath": "Data/seed-data.json", - "OverwriteExistingData": true, - "OffsetDates": false, - "TimeSpan": 3 - }, - "Serilog": { - "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.MSSqlServer" ], - "MinimumLevel": "Debug", - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "{Timestamp:HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "/tmp/cdr-mdh-manage-api.log", - "outputTemplate": "{Timestamp:dd/MM/yyyy HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "MSSqlServer", - "Args": { - "connectionString": "DataHolder_Bank_Logging_DB", - "sinkOptionsSection": { - "tableName": "LogEventsManageAPI", - "autoCreateSqlTable": false - }, - "restrictedToMinimumLevel": "Verbose", - "batchPostingLimit": 1000, - "period": "0.00:00:10", - "columnOptionsSection": { - "disableTriggers": true, - "clusteredColumnstoreIndex": false, - "primaryKeyColumnName": "Id", - "removeStandardColumns": [ "MessageTemplate", "Properties" ], - "additionalColumns": [ - { - "ColumnName": "Environment", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ThreadId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "MethodName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "SourceContext", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 100 - } - ] - } - } - } - ] - }, - "Register": { - "GetDataRecipientsEndpoint": "https://host.docker.internal:7000/cdr-register/v1/banking/data-recipients", - "GetDataRecipientStatusEndpoint": "https://host.docker.internal:7000/cdr-register/v1/banking/data-recipients/status", - "GetSoftwareProductsStatusEndpoint": "https://host.docker.internal:7000/cdr-register/v1/banking/data-recipients/brands/software-products/status" - } -} \ No newline at end of file diff --git a/Source/CDR.DataHolder.Manage.API/appsettings.Development.json b/Source/CDR.DataHolder.Manage.API/appsettings.Development.json index 223b466..39005f3 100644 --- a/Source/CDR.DataHolder.Manage.API/appsettings.Development.json +++ b/Source/CDR.DataHolder.Manage.API/appsettings.Development.json @@ -85,10 +85,5 @@ } } ] - }, - "Register": { - "GetDataRecipientsEndpoint": "https://localhost:7000/cdr-register/v1/banking/data-recipients", - "GetDataRecipientStatusEndpoint": "https://localhost:7000/cdr-register/v1/banking/data-recipients/status", - "GetSoftwareProductsStatusEndpoint": "https://localhost:7000/cdr-register/v1/banking/data-recipients/brands/software-products/status" } } \ No newline at end of file diff --git a/Source/CDR.DataHolder.Manage.API/appsettings.Release.json b/Source/CDR.DataHolder.Manage.API/appsettings.Release.json index cedf6ca..58b8b7f 100644 --- a/Source/CDR.DataHolder.Manage.API/appsettings.Release.json +++ b/Source/CDR.DataHolder.Manage.API/appsettings.Release.json @@ -85,10 +85,5 @@ } } ] - }, - "Register": { - "GetDataRecipientsEndpoint": "https://mock-register:7000/cdr-register/v1/banking/data-recipients", - "GetDataRecipientStatusEndpoint": "https://mock-register:7000/cdr-register/v1/banking/data-recipients/status", - "GetSoftwareProductsStatusEndpoint": "https://mock-register:7000/cdr-register/v1/banking/data-recipients/brands/software-products/status" } } diff --git a/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj b/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj index dea1a34..175e946 100644 --- a/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj +++ b/Source/CDR.DataHolder.Public.API/CDR.DataHolder.Public.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.Public.API/appsettings.Container.json b/Source/CDR.DataHolder.Public.API/appsettings.Container.json deleted file mode 100644 index 58c07ca..0000000 --- a/Source/CDR.DataHolder.Public.API/appsettings.Container.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "ConnectionStrings": { - "DataHolder_Bank_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True", - "DataHolder_Bank_Logging_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True" - }, - "Domain": "host.docker.internal:8000", - "Serilog": { - "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.MSSqlServer" ], - "MinimumLevel": "Debug", - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "{Timestamp:HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "/tmp/cdr-mdh-public-api.log", - "outputTemplate": "{Timestamp:dd/MM/yyyy HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "MSSqlServer", - "Args": { - "connectionString": "DataHolder_Bank_Logging_DB", - "sinkOptionsSection": { - "tableName": "LogEvents-Public-API", - "autoCreateSqlTable": true - }, - "restrictedToMinimumLevel": "Verbose", - "batchPostingLimit": 1000, - "period": "0.00:00:10", - "columnOptionsSection": { - "disableTriggers": true, - "clusteredColumnstoreIndex": false, - "primaryKeyColumnName": "Id", - "removeStandardColumns": [ "MessageTemplate", "Properties" ], - "additionalColumns": [ - { - "ColumnName": "Environment", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ThreadId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "MethodName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "SourceContext", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 100 - } - ] - } - } - } - ] - } -} \ No newline at end of file diff --git a/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj b/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj index 692d167..1d0e79b 100644 --- a/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj +++ b/Source/CDR.DataHolder.Repository/CDR.DataHolder.Repository.csproj @@ -2,9 +2,9 @@ net6.0 - 1.2.0 - 1.2.0 - 1.2.0 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj b/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj index ec2d8f1..0339df0 100644 --- a/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj +++ b/Source/CDR.DataHolder.Resource.API.UnitTests/CDR.DataHolder.Resource.API.UnitTests.csproj @@ -5,15 +5,14 @@ false - 1.2.0 + 1.2.1 - 1.2.0 + 1.2.1 - 1.2.0 + 1.2.1 - @@ -21,11 +20,6 @@ - - PreserveNewest - true - PreserveNewest - PreserveNewest true diff --git a/Source/CDR.DataHolder.Resource.API.UnitTests/appsettings.Container.json b/Source/CDR.DataHolder.Resource.API.UnitTests/appsettings.Container.json deleted file mode 100644 index 329f4e2..0000000 --- a/Source/CDR.DataHolder.Resource.API.UnitTests/appsettings.Container.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "ConnectionStrings": { - "DataHolder_Bank_DB": "Server=mssql;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True" - }, - "SeedData": { - "FilePath": "Data/seed-data.json", - "OverwriteExistingData": true - }, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "ResourceBaseUri": "https://host.docker.internal:8003" -} diff --git a/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj b/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj index 4b447f0..f6bfcf1 100644 --- a/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj +++ b/Source/CDR.DataHolder.Resource.API/CDR.DataHolder.Resource.API.csproj @@ -3,9 +3,9 @@ net6.0 win-x64;linux-x64 - 1.1.1 - 1.1.1 - 1.1.1 + 1.2.1 + 1.2.1 + 1.2.1 diff --git a/Source/CDR.DataHolder.Resource.API/appsettings.Container.json b/Source/CDR.DataHolder.Resource.API/appsettings.Container.json deleted file mode 100644 index 6fa46b3..0000000 --- a/Source/CDR.DataHolder.Resource.API/appsettings.Container.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "ConnectionStrings": { - "DataHolder_Bank_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True", - "DataHolder_Bank_Logging_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True", - "DataHolder_Bank_RequestResponse_Logging_DB": "Server=host.docker.internal;Database=cdr-mdh;User Id='SA';Password='Pa{}w0rd2019';MultipleActiveResultSets=True" - }, - "Serilog": { - "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File", "Serilog.Sinks.MSSqlServer" ], - "MinimumLevel": "Debug", - "WriteTo": [ - { - "Name": "Console", - "Args": { - "outputTemplate": "{Timestamp:HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "File", - "Args": { - "path": "/tmp/cdr-mdh-resource-api.log", - "outputTemplate": "{Timestamp:dd/MM/yyyy HH:mm:ss.fff zzz} {Level} [{SourceContext}] {Message}{NewLine}{Exception}" - } - }, - { - "Name": "MSSqlServer", - "Args": { - "connectionString": "DataHolder_Bank_Logging_DB", - "sinkOptionsSection": { - "tableName": "LogEvents-Resource-API", - "autoCreateSqlTable": true - }, - "restrictedToMinimumLevel": "Verbose", - "batchPostingLimit": 1000, - "period": "0.00:00:10", - "columnOptionsSection": { - "disableTriggers": true, - "clusteredColumnstoreIndex": false, - "primaryKeyColumnName": "Id", - "removeStandardColumns": [ "MessageTemplate", "Properties" ], - "additionalColumns": [ - { - "ColumnName": "Environment", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ProcessName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ThreadId", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "MethodName", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "SourceContext", - "DataType": "nvarchar", - "AllowNull": true, - "DataLength": 100 - } - ] - } - } - } - ] - }, - "SerilogRequestResponseLogger": { - "Using": [ "Serilog.Sinks.MSSqlServer" ], - "MinimumLevel": "Debug", - "IPAddressHeaderKey": "X-Forwarded-For", - "HostNameHeaderKey": "X-Forwarded-Host", - "WriteTo": [ - { - "Name": "MSSqlServer", - "Args": { - "connectionString": "DataHolder_Bank_RequestResponse_Logging_DB", - "sinkOptionsSection": { - "tableName": "LogEvents-RequestResponse", - "autoCreateSqlTable": true - }, - "restrictedToMinimumLevel": "Debug", - "batchPostingLimit": 1000, - "period": "0.00:00:10", - "columnOptionsSection": { - "disableTriggers": true, - "clusteredColumnstoreIndex": false, - "primaryKeyColumnName": "Id", - "removeStandardColumns": [ "MessageTemplate", "Properties" ], - "additionalColumns": [ - { - "ColumnName": "SourceContext", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 100 - }, - { - "ColumnName": "ClientId", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 50, - "NonClusteredIndex": true - }, - { - "ColumnName": "SoftwareId", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "FapiInteractionId", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "RequestMethod", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 20 - }, - { - "ColumnName": "RequestBody", - "DataType": "varchar", - "AllowNull": true, - "DataLength": -1 - }, - { - "ColumnName": "RequestHeaders", - "DataType": "varchar", - "AllowNull": true, - "DataLength": -1 - }, - { - "ColumnName": "RequestPath", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 2000 - }, - { - "ColumnName": "RequestQueryString", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 4000 - }, - { - "ColumnName": "StatusCode", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 20 - }, - { - "ColumnName": "ElapsedTime", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 20 - }, - { - "ColumnName": "RequestHost", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 4000 - }, - { - "ColumnName": "RequestIpAddress", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 50 - }, - { - "ColumnName": "ResponseHeaders", - "DataType": "varchar", - "AllowNull": true, - "DataLength": 4000 - }, - { - "ColumnName": "ResponseBody", - "DataType": "varchar", - "AllowNull": true, - "DataLength": -1 - } - ] - } - } - } - ] - }, - "AccessTokenIntrospectionEndpoint": "https://host.docker.internal:8001/connect/introspect-internal", - "IdentityServerIssuerUri": "https://host.docker.internal:8001", - "IdentityServerUrl": "https://host.docker.internal:8001", - "ResourceBaseUri": "https://host.docker.internal:8002" -} \ No newline at end of file diff --git a/Source/DockerCompose/docker-compose.yml b/Source/DockerCompose/docker-compose.yml index dc2b6a0..74e9d27 100644 --- a/Source/DockerCompose/docker-compose.yml +++ b/Source/DockerCompose/docker-compose.yml @@ -103,4 +103,4 @@ services: test: /opt/mssql-tools/bin/sqlcmd -S . -U sa -P "Pa{}w0rd2019" -Q "SELECT 1" || exit 1 timeout: 10s interval: 10s - retries: 10 + retries: 10 \ No newline at end of file diff --git a/Source/Dockerfile.container b/Source/Dockerfile.container deleted file mode 100644 index e67f1ce..0000000 --- a/Source/Dockerfile.container +++ /dev/null @@ -1,70 +0,0 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base -WORKDIR /app -EXPOSE 80 -EXPOSE 8001 -EXPOSE 8002 - -# Default ASPNETCORE_ENVIRONMENT to Container -ENV ASPNETCORE_ENVIRONMENT=Container - -FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build -WORKDIR /src - -COPY . ./ - -FROM build AS publish - -COPY ./CDR.DataHolder.API.Infrastructure/. /app/CDR.DataHolder.API.Infrastructure -COPY ./CDR.DataHolder.Repository/. /app/CDR.DataHolder.Repository -COPY ./CDR.DataHolder.Domain/. /app/CDR.DataHolder.Domain -COPY ./CDR.DataHolder.Admin.API/. /app/CDR.DataHolder.Admin.API -COPY ./CDR.DataHolder.Manage.API/. /app/CDR.DataHolder.Manage.API -COPY ./CDR.DataHolder.Public.API/. /app/CDR.DataHolder.Public.API -COPY ./CDR.DataHolder.Resource.API/. /app/CDR.DataHolder.Resource.API -COPY ./CDR.DataHolder.IdentityServer/. /app/CDR.DataHolder.IdentityServer -COPY ./CDR.DataHolder.API.Gateway.mTLS/. /app/CDR.DataHolder.API.Gateway.mTLS - -WORKDIR /app/CDR.DataHolder.Admin.API -RUN dotnet publish -c Container -o /app/publish/admin -WORKDIR /app/CDR.DataHolder.Manage.API -RUN dotnet publish -c Container -o /app/publish/manage -WORKDIR /app/CDR.DataHolder.Public.API -RUN dotnet publish -c Container -o /app/publish/public -WORKDIR /app/CDR.DataHolder.Resource.API -RUN dotnet publish -c Container -o /app/publish/resource -WORKDIR /app/CDR.DataHolder.IdentityServer -RUN dotnet publish -c Container -o /app/publish/idsvr -WORKDIR /app/CDR.DataHolder.API.Gateway.mTLS -RUN dotnet publish -c Container -o /app/publish/gateway-mtls - -COPY supervisord.conf /app/publish/supervisord.conf - -COPY wait-until-manage-healthy-then-start.sh /app/publish/wait-until-manage-healthy-then-start.sh - -FROM base AS final -WORKDIR /app - -COPY --from=publish /app/publish/supervisord.conf . -COPY --from=publish /app/publish/wait-until-manage-healthy-then-start.sh . -COPY --from=publish /app/publish/resource ./resource -COPY --from=publish /app/publish/admin ./admin -COPY --from=publish /app/publish/manage ./manage -COPY --from=publish /app/publish/idsvr ./idsvr -COPY --from=publish /app/publish/gateway-mtls ./gateway-mtls -COPY --from=publish /app/publish/public ./public - -RUN apt-get update && apt-get install -y supervisor - -RUN apt-get update && apt-get install -y sudo - -# Install wget for use in health checks -RUN apt-get update && apt-get install -y wget && rm -rf /var/lib/apt/lists/* - -RUN sudo cp ./gateway-mtls/Certificates/ca.crt /usr/local/share/ca-certificates/ca.crt - -RUN sudo update-ca-certificates - -# ENV ASPNETCORE_URLS=https://+:7000;https://+:7001 -ENV ASPNETCORE_URLS=https://+:8001;https://+:8002 - -ENTRYPOINT ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]