umm-module

dhki/modules/dkfz-compose.yml

@@ -9,13 +9,13 @@ configs:
             "id": "UMM-TRANSFAIR",
             "name": "UMM TransFAIR",
             "virtualhost": "umm-transfair",
-            "beamconnect": "transfair.umm.${BROKER_ID}"
+            "beamconnect": "transfair-connect.umm.${BROKER_ID}"
           },
           {
             "id": "UMM-BLAZE",
             "name": "UMM MDAT Blaze",
             "virtualhost": "umm-blaze",
-            "beamconnect": "blaze.umm.${BROKER_ID}"
+            "beamconnect": "transfair-connect.umm.${BROKER_ID}"
           }
         ]
       }

dhki/modules/umm-compose.yml

@@ -0,0 +1,48 @@
+version: "3.7"
+
+configs:
+  umm-beam-connect-central-targets:
+    content: |
+      {
+        "sites": []
+      }
+  umm-beam-connect-local-targets:
+    content: |
+      [
+        {
+          "external": "umm-transfair",
+          "internal": "transfair:8080",
+          "allowed": ["transfair-connect.dkfz.${BROKER_ID}"]
+        },
+        {
+          "external": "umm-blaze",
+          "internal": "blaze:8080",
+          "allowed": ["transfair-connect.dkfz.${BROKER_ID}"]
+        }
+      ]
+
+services:
+  umm-beam-connect:
+    image: docker.verbis.dkfz.de/cache/samply/beam-connect:${BEAM_TAG}
+    container_name: bridgehead-umm-beam-connect
+    environment:
+      PROXY_URL: http://beam-proxy:8081
+      APP_ID: transfair-connect.${PROXY_ID}
+      PROXY_APIKEY: ${UMM_TRANSFAIR_BEAM_SECRET}
+      DISCOVERY_URL: ./conf/central-targets.json
+      LOCAL_TARGETS_FILE: ./conf/local-targets.json
+      RUST_LOG: ${RUST_LOG:-info}
+      NO_PROXY: beam-proxy,transfair,blaze
+    configs:
+      - source: umm-beam-connect-central-targets
+        target: /conf/central-targets.json
+      - source: umm-beam-connect-local-targets
+        target: /conf/local-targets.json
+    depends_on:
+      - beam-proxy
+      - transfair
+      - blaze
+
+  beam-proxy:
+    environment:
+      APP_transfair-connect_KEY: ${UMM_TRANSFAIR_BEAM_SECRET}

dhki/modules/umm-setup.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+function ummSetup() {
+  if [ "${ENABLE_UMM:-}" == "true" ]; then
+    assertVarsNotEmpty TTP_URL TTP_ML_API_KEY PROJECT_ID_SYSTEM || \
+      fail_and_report 1 "The UMM module requires TTP_URL, TTP_ML_API_KEY and PROJECT_ID_SYSTEM."
+
+    log INFO "UMM TransFAIR setup detected -- will start TransFAIR, two dedicated Blaze stores and one Beam.Connect receiver."
+
+    UMM_TRANSFAIR_BEAM_SECRET="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
+
+    FHIR_REQUEST_URL="http://transfair-request-blaze:8080"
+    FHIR_INPUT_URL="http://transfair-input-blaze:8080"
+
+    OVERRIDE+=" -f ./dhki/modules/umm-compose.yml --profile transfair-request-blaze --profile transfair-input-blaze"
+  fi
+}

dhki/vars

@@ -1,6 +1,7 @@
 # This sets beam broker config depending on ENVIRONMENT
 source dhki/modules/dhki-setup.sh
 source dhki/modules/dkfz-setup.sh
+source dhki/modules/umm-setup.sh
 
 # BROKER_ID is exported by previous script
 BROKER_URL=https://${BROKER_ID}
@@ -10,6 +11,7 @@ FOCUS_RETRY_COUNT=${FOCUS_RETRY_COUNT:-64}
 SUPPORT_EMAIL=support-ccp@dkfz-heidelberg.de
 PRIVATEKEYFILENAME=/etc/bridgehead/pki/${SITE_ID}.priv.pem
 BEAM_FILE_SEND_SECRET="$(echo \"beam-file-send-salt\" | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
+TRANSFAIR_TAG=${TRANSFAIR_TAG:-main}
 
 BROKER_URL_FOR_PREREQ=$BROKER_URL
 
@@ -28,6 +30,7 @@ do
     source $module
 done
 
+ummSetup
 transfairSetup
 dkfzSetup
 scoutSetup

modules/transfair-setup.sh

@@ -27,7 +27,7 @@ function transfairSetup() {
         else
 		    log INFO "TransFAIR configured without ttp"
 	    fi
-        TRANSFAIR_NO_PROXIES="transfair-input-blaze,blaze,transfair-requests-blaze"
+        TRANSFAIR_NO_PROXIES="transfair-input-blaze,blaze,transfair-request-blaze"
         if [ -n "${TRANSFAIR_NO_PROXY}" ]; then
             TRANSFAIR_NO_PROXIES+=",${TRANSFAIR_NO_PROXY}"
         fi