From 139fcecabe2825ad3c253b4565baae92f4d01459 Mon Sep 17 00:00:00 2001 From: janskiba Date: Thu, 23 Jan 2025 12:42:59 +0000 Subject: [PATCH] redo transfair setup --- dhki/vars | 2 +- modules/transfair-compose.yml | 36 ++++++++++++++++++++-- modules/transfair-output-blaze-compose.yml | 17 ---------- modules/transfair-setup.sh | 23 ++++++++++---- 4 files changed, 52 insertions(+), 26 deletions(-) delete mode 100644 modules/transfair-output-blaze-compose.yml diff --git a/dhki/vars b/dhki/vars index f7f7ecd..d043dd2 100644 --- a/dhki/vars +++ b/dhki/vars @@ -25,4 +25,4 @@ do source $module done -routineConnectorSetup \ No newline at end of file +transfairSetup \ No newline at end of file diff --git a/modules/transfair-compose.yml b/modules/transfair-compose.yml index 2fa980f..3927fd9 100644 --- a/modules/transfair-compose.yml +++ b/modules/transfair-compose.yml @@ -9,11 +9,43 @@ services: PROJECT_ID_SYSTEM: "${PROJECT_ID_SYSTEM}" FHIR_REQUEST_URL: "${FHIR_REQUEST_URL}" FHIR_INPUT_URL: "${FHIR_INPUT_URL}" - FHIR_OUTPUT_URL: "${FHIR_OUTPUT_URL}" + FHIR_OUTPUT_URL: "${FHIR_OUTPUT_URL:-http://blaze:8080}" FHIR_REQUEST_CREDENTIALS: "${FHIR_REQUEST_CREDENTIALS}" FHIR_INPUT_CREDENTIALS: "${FHIR_INPUT_CREDENTIALS}" FHIR_OUTPUT_CREDENTIALS: "${FHIR_OUTPUT_CREDENTIALS}" - EXCHANGE_ID_SYSTEM: "SESSION_ID" + EXCHANGE_ID_SYSTEM: "${EXCHANGE_ID_SYSTEM:-SESSION_ID}" DATABASE_URL: "sqlite://transfair/data_requests.sql?mode=rwc" volumes: - /var/cache/bridgehead/${PROJECT}/transfair:/transfair + + transfair-input-blaze: + image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + container_name: bridgehead-transfair-input-blaze + environment: + BASE_URL: "http://bridgehead-transfair-input-blaze:8080" + JAVA_TOOL_OPTIONS: "-Xmx${BLAZE_MEMORY_CAP:-4096}m" + DB_RESOURCE_CACHE_SIZE: ${BLAZE_RESOURCE_CACHE_CAP:-2500000} + DB_BLOCK_CACHE_SIZE: ${BLAZE_MEMORY_CAP} + CQL_EXPR_CACHE_SIZE: ${BLAZE_CQL_CACHE_CAP:-32} + ENFORCE_REFERENTIAL_INTEGRITY: "false" + volumes: + - "transfair-input-blaze-data:/app/data" + profiles: ["transfair-input-blaze"] + + transfair-request-blaze: + image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 + container_name: bridgehead-transfair-requests-blaze + environment: + BASE_URL: "http://bridgehead-transfair-requests-blaze:8080" + JAVA_TOOL_OPTIONS: "-Xmx${BLAZE_MEMORY_CAP:-4096}m" + DB_RESOURCE_CACHE_SIZE: ${BLAZE_RESOURCE_CACHE_CAP:-2500000} + DB_BLOCK_CACHE_SIZE: ${BLAZE_MEMORY_CAP} + CQL_EXPR_CACHE_SIZE: ${BLAZE_CQL_CACHE_CAP:-32} + ENFORCE_REFERENTIAL_INTEGRITY: "false" + volumes: + - "transfair-request-blaze-data:/app/data" + profiles: ["transfair-request-blaze"] + +volumes: + transfair-input-blaze-data: + transfair-request-blaze-data: \ No newline at end of file diff --git a/modules/transfair-output-blaze-compose.yml b/modules/transfair-output-blaze-compose.yml deleted file mode 100644 index 9f8583b..0000000 --- a/modules/transfair-output-blaze-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ - -services: - transfair-blaze: - image: docker.verbis.dkfz.de/cache/samply/blaze:0.28 - container_name: bridgehead-transfair-blaze - environment: - BASE_URL: "http://bridgehead-ccp-blaze:8080" - JAVA_TOOL_OPTIONS: "-Xmx${BLAZE_MEMORY_CAP:-4096}m" - DB_RESOURCE_CACHE_SIZE: ${BLAZE_RESOURCE_CACHE_CAP:-2500000} - DB_BLOCK_CACHE_SIZE: ${BLAZE_MEMORY_CAP} - CQL_EXPR_CACHE_SIZE: ${BLAZE_CQL_CACHE_CAP:-32} - ENFORCE_REFERENTIAL_INTEGRITY: "false" - volumes: - - "transfair-blaze-data:/app/data" - -volumes: - transfair-balze-data: \ No newline at end of file diff --git a/modules/transfair-setup.sh b/modules/transfair-setup.sh index 6dff9c2..720bb25 100755 --- a/modules/transfair-setup.sh +++ b/modules/transfair-setup.sh @@ -1,13 +1,24 @@ #!/bin/bash -e function transfairSetup() { - assertVarsNotEmpty INSTITUTE_TTP_URL INSTITUTE_TTP_API_KEY PROJECT_ID_SYSTEM FHIR_REQUEST_URL FHIR_INPUT_URL + if [[ -n "$INSTITUTE_TTP_URL" || -n "$EXCHANGE_ID_SYSTEM" ]]; then + echo "Starting transfair." + else + return + fi OVERRIDE+=" -f ./modules/transfair-compose.yml" - if [ -n "$FHIR_OUTPUT_URL" ]; then - log INFO "TransFAIR output fhir store set to external $FHIR_OUTPUT_URL" + if [ -n "$FHIR_INPUT_URL" ]; then + log INFO "TransFAIR input fhir store set to external $FHIR_INPUT_URL" else - log INFO "TransFAIR output fhir store not set writing to internal blaze" - FHIR_OUTPUT_URL="http://transfair-blaze:8080" - OVERRIDE+=" -f ./modules/transfair-compose.yml" + log INFO "TransFAIR input fhir store not set writing to internal blaze" + FHIR_INPUT_URL="http://bridgehead-transfair-input-blaze:8080" + OVERRIDE+=" --profile transfair-input-blaze" + fi + if [ -n "$FHIR_REQUEST_URL" ]; then + log INFO "TransFAIR request fhir store set to external $FHIR_REQUEST_URL" + else + log INFO "TransFAIR request fhir store not set writing to internal blaze" + FHIR_REQUEST_URL="http://bridgehead-transfair-requests-blaze:8080" + OVERRIDE+=" --profile transfair-request-blaze" fi }