Minor Adjustments

medizininformatik-initiative · Dec 10, 2024 · 8fa6c76 · 8fa6c76
1 parent 01f2211
commit 8fa6c76
Show file tree

Hide file tree

Showing 18 changed files with 130 additions and 126 deletions.
diff --git a/.github/integration-test/basic-auth/Dockerfile b/.github/integration-test/basic-auth/Dockerfile
@@ -1,4 +1,4 @@
-# Image is uses as base for a dummy container from which curl can request data within the same network as the other containers
+# Image is used as base for a dummy container from which curl can request data within the same network as the other containers
 FROM alpine
 RUN apk add --no-cache curl
-CMD ["sh", "-c", "while true; do sleep 3600; done"]
+ENTRYPOINT ["tail", "-f", "/dev/null"]
diff --git a/.github/integration-test/basic-auth/docker-compose.yml b/.github/integration-test/basic-auth/docker-compose.yml
@@ -22,9 +22,9 @@ services:
       FHIR_SOURCE_SERVER: "http://proxy:8080/fhir"
       FHIR_SOURCE_USER: "test"
       FHIR_SOURCE_PASSWORD: "bar"
-      FHIR_DESTINATION_SERVER: "http://proxy:8080/fhir"
-      FHIR_DESTINATION_USER: "test"
-      FHIR_DESTINATION_PASSWORD: "bar"
+      FHIR_REPORT_SERVER: "http://proxy:8080/fhir"
+      FHIR_REPORT_USER: "test"
+      FHIR_REPORT_PASSWORD: "bar"
       SEND_REPORT_TO_SERVER: ${FDE_SEND_REPORT_TO_SERVER:-false}
       AUTHOR_IDENTIFIER_SYSTEM: ${FDE_AUTHOR_IDENTIFIER_SYSTEM:-}
       AUTHOR_IDENTIFIER_VALUE: ${FDE_AUTHOR_IDENTIFIER_VALUE:-}

diff --git a/.github/integration-test/evaluate-and-post-different-doc-ref.sh b/.github/integration-test/evaluate-and-post-different-doc-ref.sh
@@ -38,12 +38,12 @@ get_response() {
                       -d 'grant_type=client_credentials' \
                       -d 'client_id=account' \
                       -d 'client_secret=test'")
-    FHIR_DESTINATION_BEARER_TOKEN=$(echo "$oauth_response" | jq -r '.access_token')
+    FHIR_REPORT_BEARER_TOKEN=$(echo "$oauth_response" | jq -r '.access_token')
 
     response=$(docker exec "$CURL_TESTER_ID" sh -c "
                   curl -s 'https://secure-fhir-server:8443/fhir/$URL' \
                            -H 'Content-Type: application/fhir+json' \
-                           -H 'Authorization: Bearer $FHIR_DESTINATION_BEARER_TOKEN'")
+                           -H 'Authorization: Bearer $FHIR_REPORT_BEARER_TOKEN'")
 
     echo "$response"
   fi

diff --git a/.github/integration-test/evaluate-and-post-report.sh b/.github/integration-test/evaluate-and-post-report.sh
@@ -39,12 +39,12 @@ get_response() {
                       -d 'grant_type=client_credentials' \
                       -d 'client_id=account' \
                       -d 'client_secret=test'")
-    FHIR_DESTINATION_BEARER_TOKEN=$(echo "$oauth_response" | jq -r '.access_token')
+    FHIR_REPORT_BEARER_TOKEN=$(echo "$oauth_response" | jq -r '.access_token')
 
     response=$(docker exec "$CURL_TESTER_ID" sh -c "
                   curl -s 'https://secure-fhir-server:8443/fhir/$URL' \
                            -H 'Content-Type: application/fhir+json' \
-                           -H 'Authorization: Bearer $FHIR_DESTINATION_BEARER_TOKEN'")
+                           -H 'Authorization: Bearer $FHIR_REPORT_BEARER_TOKEN'")
 
     echo "$response"
   fi

diff --git a/.github/integration-test/evaluate-and-post-update.sh b/.github/integration-test/evaluate-and-post-update.sh
@@ -36,12 +36,12 @@ get_response() {
                       -d 'grant_type=client_credentials' \
                       -d 'client_id=account' \
                       -d 'client_secret=test'")
-    FHIR_DESTINATION_BEARER_TOKEN=$(echo "$oauth_response" | jq -r '.access_token')
+    FHIR_REPORT_BEARER_TOKEN=$(echo "$oauth_response" | jq -r '.access_token')
 
     response=$(docker exec "$CURL_TESTER_ID" sh -c "
                   curl -s 'https://secure-fhir-server:8443/fhir/$URL' \
                            -H 'Content-Type: application/fhir+json' \
-                           -H 'Authorization: Bearer $FHIR_DESTINATION_BEARER_TOKEN'")
+                           -H 'Authorization: Bearer $FHIR_REPORT_BEARER_TOKEN'")
 
     echo "$response"
   fi

diff --git a/.github/integration-test/no-auth/Dockerfile b/.github/integration-test/no-auth/Dockerfile
@@ -1,4 +1,4 @@
-# Image is uses as base for a dummy container from which curl can request data within the same network as the other containers
+# Image is used as base for a dummy container from which curl can request data within the same network as the other containers
 FROM alpine
 RUN apk add --no-cache curl
-CMD ["sh", "-c", "while true; do sleep 3600; done"]
+ENTRYPOINT ["tail", "-f", "/dev/null"]
diff --git a/.github/integration-test/no-auth/docker-compose.yml b/.github/integration-test/no-auth/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     environment:
       CONVERT_TO_CSV: ${FDE_CONVERT_TO_CSV:-true}
       FHIR_SOURCE_SERVER: "http://fhir-server:8080/fhir"
-      FHIR_DESTINATION_SERVER: "http://fhir-server:8080/fhir"
+      FHIR_REPORT_SERVER: "http://fhir-server:8080/fhir"
       SEND_REPORT_TO_SERVER: ${FDE_SEND_REPORT_TO_SERVER:-false}
       AUTHOR_IDENTIFIER_SYSTEM: ${FDE_AUTHOR_IDENTIFIER_SYSTEM:-}
       AUTHOR_IDENTIFIER_VALUE: ${FDE_AUTHOR_IDENTIFIER_VALUE:-}

diff --git a/.github/integration-test/oauth/Dockerfile b/.github/integration-test/oauth/Dockerfile
@@ -1,4 +1,4 @@
-# Image is uses as base for a dummy container from which curl can request data within the same network as the other containers
+# Image is used as base for a dummy container from which curl can request data within the same network as the other containers
 FROM alpine
 RUN apk add --no-cache curl
-CMD ["sh", "-c", "while true; do sleep 3600; done"]
+ENTRYPOINT ["tail", "-f", "/dev/null"]
diff --git a/.github/integration-test/oauth/docker-compose.yml b/.github/integration-test/oauth/docker-compose.yml
@@ -111,10 +111,10 @@ services:
       FHIR_SOURCE_OAUTH_ISSUER_URI: "https://secure-keycloak:8443/realms/test"
       FHIR_SOURCE_OAUTH_CLIENT_ID: "account"
       FHIR_SOURCE_OAUTH_CLIENT_SECRET: "test"
-      FHIR_DESTINATION_SERVER: "https://secure-fhir-server:8443/fhir"
-      FHIR_DESTINATION_OAUTH_ISSUER_URI: "https://secure-keycloak:8443/realms/test"
-      FHIR_DESTINATION_OAUTH_CLIENT_ID: "account"
-      FHIR_DESTINATION_OAUTH_CLIENT_SECRET: "test"
+      FHIR_REPORT_SERVER: "https://secure-fhir-server:8443/fhir"
+      FHIR_REPORT_OAUTH_ISSUER_URI: "https://secure-keycloak:8443/realms/test"
+      FHIR_REPORT_OAUTH_CLIENT_ID: "account"
+      FHIR_REPORT_OAUTH_CLIENT_SECRET: "test"
       SEND_REPORT_TO_SERVER: ${FDE_SEND_REPORT_TO_SERVER:-false}
       AUTHOR_IDENTIFIER_SYSTEM: ${FDE_AUTHOR_IDENTIFIER_SYSTEM:-}
       AUTHOR_IDENTIFIER_VALUE: ${FDE_AUTHOR_IDENTIFIER_VALUE:-}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -155,13 +155,13 @@ jobs:
       - name: Run Integration Test to check if it correctly exits when there are insufficient writing permissions
         run: .github/integration-test/missing-permissions-test.sh
 
-      - name: Run Integration Test for Posting the MeasureReport to the FHIR server
+      - name: Run Integration Test for Posting the MeasureReport to the Report FHIR server
         run: .github/integration-test/evaluate-and-post-report.sh ${{ matrix.test }} Test_PROJECT_Evaluation_1
 
-      - name: Run Integration Test for Posting the MeasureReport to the FHIR server with the Same Project Identifier
+      - name: Run Integration Test for Posting the MeasureReport to the Report FHIR server with the Same Project Identifier
         run: .github/integration-test/evaluate-and-post-update.sh ${{ matrix.test }} Test_PROJECT_Evaluation_1
 
-      - name: Run Integration Test for Posting the MeasureReport to the FHIR server with a Different Project Identifier
+      - name: Run Integration Test for Posting the MeasureReport to the Report FHIR server with a Different Project Identifier
         run: .github/integration-test/evaluate-and-post-different-doc-ref.sh ${{ matrix.test }} Test_PROJECT_Evaluation_2
 
       - name: Remove Blaze volumes