Merge pull request #197 from kids-first/fhir-direct-url

🛠️ Use FHIR Direct URL for tests

.gitignore

@@ -147,3 +147,8 @@ data/
 
 # JS files
 node_modules
+
+# Vim files
+*.swp
+*.swo
+*.swn

env.sample

@@ -1,6 +1,7 @@
 # --- Smile CDR FHIR Server Configuration --- 
 # Needed in properties, setup_dev_env.sh, bin/health-check.sh 
 FHIR_ENDPOINT=http://localhost:8000
+FHIR_DIRECT_ENDPOINT=http://localhost:8000
 # Needed in bin/seed_users.py
 USER_MGMNT_ENDPOINT=http://localhost:9000/user-management
 # Needed in properties file

src/config/__init__.py

@@ -12,6 +12,7 @@
 
 BASE_URL = os.environ.get("FHIR_ENDPOINT")
 FHIR_URL = BASE_URL
+FHIR_DIRECT_URL = os.environ.get("FHIR_DIRECT_ENDPOINT")
 FHIR_APP_ADMIN = os.environ.get("FHIR_APP_ADMIN")
 FHIR_APP_ADMIN_PW = os.environ.get("FHIR_APP_ADMIN_PW")
 FHIR_TEST_USER_PW = os.environ.get("FHIR_TEST_USER_PW")

tests/python/conftest.py

@@ -4,7 +4,7 @@
 from requests.auth import HTTPBasicAuth
 
 from src.config import (
-    FHIR_URL,
+    FHIR_DIRECT_URL,
     USER_MGMNT_ENDPOINT,
     FHIR_APP_ADMIN,
     FHIR_APP_ADMIN_PW,
@@ -83,7 +83,7 @@ def _upsert_fhir_resources(resources):
         for resource in resources:
             id_ = resource["id"]
             resource_type = resource["resourceType"]
-            url = f"{FHIR_URL}/{resource_type}/{id_}"
+            url = f"{FHIR_DIRECT_URL}/{resource_type}/{id_}"
             kwargs.update({"json": resource})
             resp = send_request("put", url, **kwargs)
 
@@ -100,7 +100,7 @@ def _upsert_fhir_resources(resources):
     for resource in upserted:
         id_ = resource["id"]
         resource_type = resource["resourceType"]
-        url = f"{FHIR_URL}/{resource_type}/{id_}"
+        url = f"{FHIR_DIRECT_URL}/{resource_type}/{id_}"
         kwargs.update({"json": resource})
 
         send_request("delete", url, **kwargs)

tests/python/test_auth.py

@@ -4,7 +4,7 @@
 from requests.auth import HTTPBasicAuth
 
 from src.config import (
-    FHIR_URL,
+    FHIR_DIRECT_URL,
     KEYCLOAK_READ_CLIENT_ID,
     KEYCLOAK_READ_CLIENT_SECRET,
 )
@@ -19,7 +19,7 @@ def test_anonymous_valid_actions(action, endpoint):
     """
     Test that anonymous user can GET /metadata and /swagger-ui
     """
-    url = f"{FHIR_URL}/{endpoint}"
+    url = f"{FHIR_DIRECT_URL}/{endpoint}"
     resp = send_request(action, url)
 
 
@@ -40,7 +40,7 @@ def test_anonymous_invalid_actions(action, endpoint):
         }
         kwargs = {"json": patient}
 
-    url = f"{FHIR_URL}/{endpoint}"
+    url = f"{FHIR_DIRECT_URL}/{endpoint}"
 
     with pytest.raises(requests.exceptions.HTTPError) as e:
         resp = send_request(action, url, **kwargs)
@@ -54,7 +54,7 @@ def test_crud_with_basic_auth(fhir_superuser):
     """
     username = fhir_superuser["username"]
     password = fhir_superuser["password"]
-    url = f"{FHIR_URL}/Patient"
+    url = f"{FHIR_DIRECT_URL}/Patient"
     kwargs = {"auth": HTTPBasicAuth(username, password)}
 
     # Post
@@ -95,7 +95,7 @@ def test_crud_with_oidc_auth():
             "Authorization": f"Bearer {access_token}"
         }
     }
-    url = f"{FHIR_URL}/Patient"
+    url = f"{FHIR_DIRECT_URL}/Patient"
 
     # Post
     patient = {
@@ -139,7 +139,7 @@ def test_read_only_oidc_client(patients):
             "Authorization": f"Bearer {access_token}"
         }
     }
-    url = f"{FHIR_URL}/Patient"
+    url = f"{FHIR_DIRECT_URL}/Patient"
 
     # Post - Fail
     patient = {