[NDR-323] Use data helper for env vars

Author: megan-bower4

lambdas/tests/e2e/api/fhir/conftest.py

@@ -11,7 +11,7 @@
 
 pdm_data_helper = PdmDataHelper()
 
-PDM_SNOMED = 717391000000106
+PDM_SNOMED = pdm_data_helper.snomed_code
 PDM_METADATA_TABLE = pdm_data_helper.dynamo_table
 PDM_S3_BUCKET = pdm_data_helper.s3_bucket
 MTLS_ENDPOINT = pdm_data_helper.mtls_endpoint

lambdas/tests/e2e/apim/test_apim_client.py

@@ -6,9 +6,8 @@
 import requests
 from tests.e2e.helpers.data_helper import PdmDataHelper
 
-from lambdas.tests.e2e.conftest import PDM_SNOMED
-
 pdm_data_helper = PdmDataHelper()
+PDM_SNOMED = pdm_data_helper.snomed_code
 
 
 def test_ping(nhsd_apim_proxy_url):

lambdas/tests/e2e/conftest.py

@@ -8,15 +8,14 @@
 
 data_helper = LloydGeorgeDataHelper()
 
-LLOYD_GEORGE_SNOMED = 16521000000101
+LLOYD_GEORGE_SNOMED = data_helper.snomed_code
 API_ENDPOINT = data_helper.api_endpoint
 API_KEY = os.environ.get("NDR_API_KEY")
 LG_METADATA_TABLE = data_helper.dynamo_table
 LG_UNSTITCHED_TABLE = os.environ.get("LG_UNSTITCHED_TABLE")
 BULK_REPORT_TABLE = os.environ.get("BULK_REPORT_TABLE")
 LLOYD_GEORGE_S3_BUCKET = data_helper.s3_bucket
 APIM_ENDPOINT = data_helper.apim_url
-PDM_SNOMED = 717391000000106
 
 
 @pytest.fixture

lambdas/tests/e2e/helpers/lloyd_george_mockcis2_helper.py

@@ -1,15 +1,15 @@
 import json
 import logging
-import os
 from urllib.parse import parse_qs, quote, urlparse
 
 import requests
 
+from tests.e2e.conftest import API_ENDPOINT, API_KEY
 
 class LloydGeorgeMockcis2Helper:
     def __init__(self, ods, repository_role):
-        self.mock_key = os.environ.get("MOCK_CIS2_KEY") or ""
-        self.api_endpoint = os.environ.get("NDR_API_ENDPOINT")
+        self.mock_key = API_KEY
+        self.api_endpoint = API_ENDPOINT
         self.ods = ods
         self.repository_role = repository_role