CMSNAV-798: Add example .env file

Author: tomhosker-bjss

Makefile

@@ -1,5 +1,8 @@
 SHELL=/bin/bash -euo pipefail
 
+include .env
+export
+
 #Installs dependencies using poetry.
 install-python:
 	poetry install
@@ -58,7 +61,7 @@ TEST_CMD := @APIGEE_ACCESS_TOKEN=$(APIGEE_ACCESS_TOKEN) \
 		poetry run pytest -v \
 		--color=yes \
 		--api-name=nhs-website-content-api \
-		--proxy-name=$(PROXY_NAME) \
+ 		--proxy-name=$(PROXY_NAME) \
 		-s
 
 PROD_TEST_CMD := $(TEST_CMD) \

example.env

@@ -0,0 +1,3 @@
+APIGEE_ACCESS_TOKEN=FOR-YOUR-EYES-ONLY
+PROXY_NAME=nhs-website-content-api-internal-dev
+SOURCE_COMMIT_ID=FOR-YOUR-EYES-ONLY

tests/test_endpoints.py

@@ -11,8 +11,6 @@
 
 def test_ping(nhsd_apim_proxy_url):
     os.environ["PROXY_NAME"] = "dev"
-    with open("smeg.txt", "w") as smeg:
-        smeg.write(str(nhsd_apim_proxy_url))
     resp = requests.get(f"{nhsd_apim_proxy_url}/_ping")
     assert resp.status_code == 200
 
@@ -22,20 +20,23 @@ def test_wait_for_ping(nhsd_apim_proxy_url):
     resp = requests.get(f"{nhsd_apim_proxy_url}/_ping")
     deployed_commit_id = resp.json().get("commitId")
 
-    while (deployed_commit_id != getenv('SOURCE_COMMIT_ID')
-           and retries <= 30
-           and resp.status_code == 200):
+    while (
+        deployed_commit_id != getenv('SOURCE_COMMIT_ID') and
+        retries <= 30 and
+        resp.status_code == 200
+    ):
         resp = requests.get(f"{nhsd_apim_proxy_url}/_ping")
         deployed_commit_id = resp.json().get("commitId")
         retries += 1
 
     if resp.status_code != 200:
         pytest.fail(f"Status code {resp.status_code}, expecting 200")
-    elif retries >= 30:
-        pytest.fail("Timeout Error - max retries")
 
     assert deployed_commit_id == getenv('SOURCE_COMMIT_ID')
 
+    if retries >= 30:
+        pytest.fail("Timeout Error - max retries")
+
 
 @pytest.mark.smoketest
 @pytest.mark.skip(reason="Dont need to run on prod")
@@ -53,23 +54,27 @@ def test_wait_for_status(nhsd_apim_proxy_url, status_endpoint_auth_headers):
     resp = requests.get(f"{nhsd_apim_proxy_url}/_status", headers=status_endpoint_auth_headers)
     deployed_commit_id = resp.json().get("commitId")
 
-    while (deployed_commit_id != getenv('SOURCE_COMMIT_ID')
-           and retries <= 30
-           and resp.status_code == 200
-           and resp.json().get("version")):
+    while (
+        deployed_commit_id != getenv('SOURCE_COMMIT_ID') and
+        retries <= 30 and
+        resp.status_code == 200 and
+        resp.json().get("version")
+    ):
         resp = requests.get(f"{nhsd_apim_proxy_url}/_status", headers=status_endpoint_auth_headers)
         deployed_commit_id = resp.json().get("commitId")
         retries += 1
 
     if resp.status_code != 200:
         pytest.fail(f"Status code {resp.status_code}, expecting 200")
-    elif retries >= 30:
-        pytest.fail("Timeout Error - max retries")
-    elif not resp.json().get("version"):
-        pytest.fail("version not found")
 
     assert deployed_commit_id == getenv('SOURCE_COMMIT_ID')
 
+    if retries >= 30:
+        pytest.fail("Timeout Error - max retries")
+
+    if not resp.json().get("version"):
+        pytest.fail("version not found")
+
 
 def test_app_unauthorised(nhsd_apim_proxy_url, nhsd_apim_auth_headers):
     resp = requests.get(f"{nhsd_apim_proxy_url}/conditions/", headers=nhsd_apim_auth_headers)