From dfe9802f230a456ee94cd2c906953bc976ca9f41 Mon Sep 17 00:00:00 2001 From: timparsons Date: Fri, 13 Oct 2023 15:46:41 -0400 Subject: [PATCH 1/2] [BI-1965] upgrading mongo version --- docker-compose.yml | 2 +- .../geno/impl/GigwaGenotypeServiceImplIntegrationTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 12cedd454..6c75b9736 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,7 +144,7 @@ services: source: gigwa_data target: /usr/local/tomcat/config mongo: - image: mongo:4.2.21 + image: mongo:4.2.24 container_name: ${GIGWA_CONTAINER_NAME:-gigwa}_db restart: always command: --profile 0 --slowms 60000 --storageEngine wiredTiger --wiredTigerCollectionBlockCompressor=zstd --directoryperdb --quiet diff --git a/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java b/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java index d16102713..afa593e7c 100644 --- a/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java +++ b/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java @@ -218,7 +218,7 @@ BrAPIEndpointProvider brAPIEndpointProvider() { public GigwaGenotypeServiceImplIntegrationTest() { super(); - mongo = new GenericContainer<>("mongo:4.2.21") + mongo = new GenericContainer<>("mongo:4.2.24") .withNetwork(super.getNetwork()) .withNetworkAliases("gigwa_db") .withImagePullPolicy(PullPolicy.defaultPolicy()) From 8e3d1d0e1303498c91c2595d3dfcce6e015635ac Mon Sep 17 00:00:00 2001 From: timparsons Date: Fri, 13 Oct 2023 15:47:24 -0400 Subject: [PATCH 2/2] Fixing header to match what Gigwa expects --- .../services/geno/impl/GigwaGenotypeServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImpl.java b/src/main/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImpl.java index e0c669e51..97c78cf05 100644 --- a/src/main/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImpl.java +++ b/src/main/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImpl.java @@ -82,7 +82,7 @@ @Slf4j public class GigwaGenotypeServiceImpl implements GenotypeService { private static final String AUTHORIZATION = "Authorization"; - private static final String X_FORWARDED_SERVER = "X-Forwarded-Server"; + private static final String X_FORWARDED_FOR = "X-Forwarded-For"; private static final String BEARER = "Bearer "; private static final String GIGWA_REST_BASE_PATH = "gigwa/rest"; private static final String GIGWA_BRAPI_BASE_PATH = GIGWA_REST_BASE_PATH + BrapiVersion.BRAPI_V2; @@ -613,7 +613,7 @@ private String submitRequestToGigwa(OkHttpClient client, Program program, UUID e .build()) .header(AUTHORIZATION, BEARER + gigwaAuthToken) - .header(X_FORWARDED_SERVER, referenceSource) + .header(X_FORWARDED_FOR, referenceSource) .post(RequestBody.create("", MediaType.parse("text/plain"))) .build();