fix tests

Author: bbilly1

app/src/test_validate.py

@@ -25,9 +25,8 @@ def test_validate_timestamp_valid():
     """expected timestamp"""
     headers = {"x-timestamp": str(int(time.time()))}
     request_body = b""
-    json_data = {}
 
-    validator = ValidateRequest(headers, json_data, request_body)
+    validator = ValidateRequest(headers, request_body)
     try:
         validator.validate_timestamp()
     except ValueError:
@@ -38,9 +37,8 @@ def test_validate_timestamp_missing():
     """no timestamp"""
     headers = {}
     request_body = b""
-    json_data = {}
 
-    validator = ValidateRequest(headers, json_data, request_body)
+    validator = ValidateRequest(headers, request_body)
     with pytest.raises(ValueError, match="missing x-timestamp in header"):
         validator.validate_timestamp()
 
@@ -49,9 +47,8 @@ def test_validate_timestamp_invalid_format():
     """not a real time stamp"""
     headers = {"x-timestamp": "invalid-timestamp"}
     request_body = b""
-    json_data = {}
 
-    validator = ValidateRequest(headers, json_data, request_body)
+    validator = ValidateRequest(headers, request_body)
     with pytest.raises(
         ValueError, match="expected x-timestamp to be epoch int"
     ):
@@ -63,9 +60,8 @@ def test_validate_timestamp_out_of_range():
     future_timestamp = int(time.time()) + 1000
     headers = {"x-timestamp": str(future_timestamp)}
     request_body = b""
-    json_data = {}
 
-    validator = ValidateRequest(headers, json_data, request_body)
+    validator = ValidateRequest(headers, request_body)
     with pytest.raises(
         ValueError, match="Request is too old or too far in the future"
     ):
@@ -80,10 +76,9 @@ def test_validate_signature_valid():
         "x-timestamp": timestamp,
         "x-signature": generate_signature(SECRET_KEY, request_body, timestamp),
     }
-    json_data = {}
 
     with patch.dict("os.environ", {"SECRET_KEY": SECRET_KEY}):
-        validator = ValidateRequest(headers, json_data, request_body)
+        validator = ValidateRequest(headers, request_body)
         try:
             validator.validate_signature()
         except ValueError:
@@ -95,9 +90,8 @@ def test_validate_signature_missing():
     timestamp = str(int(time.time()))
     request_body = b"test body"
     headers = {"x-timestamp": timestamp}
-    json_data = {}
 
-    validator = ValidateRequest(headers, json_data, request_body)
+    validator = ValidateRequest(headers, request_body)
     with pytest.raises(ValueError, match="missing x-signature in header"):
         validator.validate_signature()
 
@@ -107,10 +101,9 @@ def test_validate_signature_invalid():
     timestamp = str(int(time.time()))
     request_body = b"test body"
     headers = {"x-timestamp": timestamp, "x-signature": "invalid-signature"}
-    json_data = {}
 
     with patch.dict("os.environ", {"SECRET_KEY": SECRET_KEY}):
-        validator = ValidateRequest(headers, json_data, request_body)
+        validator = ValidateRequest(headers, request_body)
         with pytest.raises(ValueError, match="invalid signature"):
             validator.validate_signature()
 
@@ -121,7 +114,7 @@ def test_get_container_name_valid():
     request_body = b""
     data = RequestData(container_name="test-container")
 
-    validator = ValidateRequest(headers, data, request_body)
-    container_name = validator.get_container_name()
+    validator = ValidateRequest(headers, request_body)
+    container_name = validator.get_container_name(data)
 
     assert container_name == "test-container"