Skip to content

BI-1965 - Upgrade Gigwa to v2.6.2 #301

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
mlm483 merged 3 commits into from
Dec 7, 2023
Merged

BI-1965 - Upgrade Gigwa to v2.6.2 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfe9802
[BI-1965] upgrading mongo version
timparsons Oct 13, 2023
8e3d1d0
Fixing header to match what Gigwa expects
timparsons Oct 13, 2023
101350b
Merge branch 'develop' into feature/BI-1965
mlm483 Dec 7, 2023
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 docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion .../java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down