From 5c8bf8b3e6d57625c248f3958db3c0d4a7274497 Mon Sep 17 00:00:00 2001 From: Liudvikas Taluntis <43747286+Duslerke@users.noreply.github.com> Date: Thu, 26 Feb 2026 14:54:46 +0000 Subject: [PATCH 1/6] Remove unused JWT package so it doesn't confuse the repo maintainers in terms of what needs to be bumped or checked for compatibility. --- ReferenceDataApi/ReferenceDataApi.csproj | 1 - ReferenceDataApi/Startup.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/ReferenceDataApi/ReferenceDataApi.csproj b/ReferenceDataApi/ReferenceDataApi.csproj index d8b321c..5746d17 100644 --- a/ReferenceDataApi/ReferenceDataApi.csproj +++ b/ReferenceDataApi/ReferenceDataApi.csproj @@ -20,7 +20,6 @@ - diff --git a/ReferenceDataApi/Startup.cs b/ReferenceDataApi/Startup.cs index 4593684..978bd18 100644 --- a/ReferenceDataApi/Startup.cs +++ b/ReferenceDataApi/Startup.cs @@ -138,7 +138,6 @@ public void ConfigureServices(IServiceCollection services) services.AddLogCallAspect(); services.ConfigureElasticSearch(Configuration); services.AddElasticSearchHealthCheck(); - services.AddTokenFactory(); RegisterGateways(services); RegisterUseCases(services); From 77e36b33bda26a7780a00ee35d207216fc952d85 Mon Sep 17 00:00:00 2001 From: Liudvikas Taluntis <43747286+Duslerke@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:11:34 +0000 Subject: [PATCH 2/6] Add back in. --- ReferenceDataApi/ReferenceDataApi.csproj | 1 + ReferenceDataApi/Startup.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ReferenceDataApi/ReferenceDataApi.csproj b/ReferenceDataApi/ReferenceDataApi.csproj index 5746d17..e8c6c93 100644 --- a/ReferenceDataApi/ReferenceDataApi.csproj +++ b/ReferenceDataApi/ReferenceDataApi.csproj @@ -19,6 +19,7 @@ + diff --git a/ReferenceDataApi/Startup.cs b/ReferenceDataApi/Startup.cs index 978bd18..eac575c 100644 --- a/ReferenceDataApi/Startup.cs +++ b/ReferenceDataApi/Startup.cs @@ -138,7 +138,7 @@ public void ConfigureServices(IServiceCollection services) services.AddLogCallAspect(); services.ConfigureElasticSearch(Configuration); services.AddElasticSearchHealthCheck(); - + services.AddTokenFactory(); RegisterGateways(services); RegisterUseCases(services); } From aeafe7616f037e2066a3b51005e11f099b679752 Mon Sep 17 00:00:00 2001 From: Liudvikas Taluntis <43747286+Duslerke@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:36:26 +0000 Subject: [PATCH 3/6] Remove unused package again. I think I know what's going on. --- ReferenceDataApi/ReferenceDataApi.csproj | 1 - ReferenceDataApi/Startup.cs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ReferenceDataApi/ReferenceDataApi.csproj b/ReferenceDataApi/ReferenceDataApi.csproj index e8c6c93..5746d17 100644 --- a/ReferenceDataApi/ReferenceDataApi.csproj +++ b/ReferenceDataApi/ReferenceDataApi.csproj @@ -19,7 +19,6 @@ - diff --git a/ReferenceDataApi/Startup.cs b/ReferenceDataApi/Startup.cs index eac575c..61919af 100644 --- a/ReferenceDataApi/Startup.cs +++ b/ReferenceDataApi/Startup.cs @@ -3,7 +3,6 @@ using Amazon.XRay.Recorder.Handlers.AwsSdk; using FluentValidation.AspNetCore; using Hackney.Core.HealthCheck; -using Hackney.Core.JWT; using Hackney.Core.Logging; using Hackney.Core.Middleware.CorrelationId; using Hackney.Core.Middleware.Exception; @@ -138,7 +137,7 @@ public void ConfigureServices(IServiceCollection services) services.AddLogCallAspect(); services.ConfigureElasticSearch(Configuration); services.AddElasticSearchHealthCheck(); - services.AddTokenFactory(); + RegisterGateways(services); RegisterUseCases(services); } From 99786e9c2b3f01d496c0309e44f3d496aa8034f6 Mon Sep 17 00:00:00 2001 From: Liudvikas Taluntis <43747286+Duslerke@users.noreply.github.com> Date: Thu, 26 Feb 2026 15:41:13 +0000 Subject: [PATCH 4/6] Rresolve docker compose race condition. --- docker-compose.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e4a4555..7a89844 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: context: . dockerfile: ReferenceDataApi/Dockerfile args: - - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} + - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} environment: - ElasticSearchDomainUrl=http://reference-data-elasticsearch:9200 networks: @@ -23,16 +23,16 @@ services: context: . dockerfile: ReferenceDataApi.Tests/Dockerfile args: - - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} - - SONAR_TOKEN=${SONAR_TOKEN} + - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} + - SONAR_TOKEN=${SONAR_TOKEN} environment: - ElasticSearchDomainUrl=http://reference-data-elasticsearch:9200 networks: - elastic depends_on: - #- kibana - - reference-data-elasticsearch - + reference-data-elasticsearch: + condition: service_healthy + reference-data-elasticsearch: image: reference-data-elasticsearch container_name: reference-data-elasticsearch @@ -51,7 +51,12 @@ services: - reference-data-esdata-test:/usr/share/elasticsearch/data networks: - elastic - + healthcheck: + test: [ "CMD-SHELL", "curl -s http://localhost:9200/_cluster/health | grep -q '\"status\":\"green\"\\|\"status\":\"yellow\"'" ] + interval: 10s + timeout: 5s + retries: 5 + start_period: 20s #kibana: # image: docker.elastic.co/kibana/kibana:7.9.3 # ports: @@ -60,10 +65,10 @@ services: # - elastic # depends_on: # - reference-data-elasticsearch - + volumes: - reference-data-esdata-test: - driver: local + reference-data-esdata-test: + driver: local networks: elastic: From 1b5e41d05942ca60fe1c9ce5aa7d6b5efa48759d Mon Sep 17 00:00:00 2001 From: Liudvikas Taluntis <43747286+Duslerke@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:10:43 +0000 Subject: [PATCH 5/6] Bump JWT to ensure Cognito Token support. --- ReferenceDataApi/ReferenceDataApi.csproj | 1 + ReferenceDataApi/Startup.cs | 5 +++++ docker-compose.yml | 25 ++++++++++-------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ReferenceDataApi/ReferenceDataApi.csproj b/ReferenceDataApi/ReferenceDataApi.csproj index 5746d17..0ba7035 100644 --- a/ReferenceDataApi/ReferenceDataApi.csproj +++ b/ReferenceDataApi/ReferenceDataApi.csproj @@ -20,6 +20,7 @@ + diff --git a/ReferenceDataApi/Startup.cs b/ReferenceDataApi/Startup.cs index 61919af..9e1cca2 100644 --- a/ReferenceDataApi/Startup.cs +++ b/ReferenceDataApi/Startup.cs @@ -3,6 +3,7 @@ using Amazon.XRay.Recorder.Handlers.AwsSdk; using FluentValidation.AspNetCore; using Hackney.Core.HealthCheck; +using Hackney.Core.JWT; using Hackney.Core.Logging; using Hackney.Core.Middleware.CorrelationId; using Hackney.Core.Middleware.Exception; @@ -137,6 +138,10 @@ public void ConfigureServices(IServiceCollection services) services.AddLogCallAspect(); services.ConfigureElasticSearch(Configuration); services.AddElasticSearchHealthCheck(); + // This is actually insane design, but you have to inject this + // so that the logging core could log a user email! Unguessable! + // Also quite hard to diagnose. + services.AddTokenFactory(); RegisterGateways(services); RegisterUseCases(services); diff --git a/docker-compose.yml b/docker-compose.yml index 7a89844..e4a4555 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: context: . dockerfile: ReferenceDataApi/Dockerfile args: - - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} + - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} environment: - ElasticSearchDomainUrl=http://reference-data-elasticsearch:9200 networks: @@ -23,16 +23,16 @@ services: context: . dockerfile: ReferenceDataApi.Tests/Dockerfile args: - - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} - - SONAR_TOKEN=${SONAR_TOKEN} + - LBHPACKAGESTOKEN=${LBHPACKAGESTOKEN} + - SONAR_TOKEN=${SONAR_TOKEN} environment: - ElasticSearchDomainUrl=http://reference-data-elasticsearch:9200 networks: - elastic depends_on: - reference-data-elasticsearch: - condition: service_healthy - + #- kibana + - reference-data-elasticsearch + reference-data-elasticsearch: image: reference-data-elasticsearch container_name: reference-data-elasticsearch @@ -51,12 +51,7 @@ services: - reference-data-esdata-test:/usr/share/elasticsearch/data networks: - elastic - healthcheck: - test: [ "CMD-SHELL", "curl -s http://localhost:9200/_cluster/health | grep -q '\"status\":\"green\"\\|\"status\":\"yellow\"'" ] - interval: 10s - timeout: 5s - retries: 5 - start_period: 20s + #kibana: # image: docker.elastic.co/kibana/kibana:7.9.3 # ports: @@ -65,10 +60,10 @@ services: # - elastic # depends_on: # - reference-data-elasticsearch - + volumes: - reference-data-esdata-test: - driver: local + reference-data-esdata-test: + driver: local networks: elastic: From e5be5d4e3cc83355cd864b24f68f542ae7d93f0c Mon Sep 17 00:00:00 2001 From: Liudvikas Taluntis <43747286+Duslerke@users.noreply.github.com> Date: Fri, 27 Feb 2026 09:14:20 +0000 Subject: [PATCH 6/6] Update comment explaining to dependencies. --- ReferenceDataApi/Startup.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ReferenceDataApi/Startup.cs b/ReferenceDataApi/Startup.cs index 9e1cca2..52dab05 100644 --- a/ReferenceDataApi/Startup.cs +++ b/ReferenceDataApi/Startup.cs @@ -138,9 +138,8 @@ public void ConfigureServices(IServiceCollection services) services.AddLogCallAspect(); services.ConfigureElasticSearch(Configuration); services.AddElasticSearchHealthCheck(); - // This is actually insane design, but you have to inject this - // so that the logging core could log a user email! Unguessable! - // Also quite hard to diagnose. + // Token factory used by the logging middleware core package + // to print user email. Hidden, indirect, implicit dependency services.AddTokenFactory(); RegisterGateways(services);