modified test to check if the data is written to audit

Author: Karthikeyannhs

tests/integration/conftest.py

@@ -102,11 +102,6 @@ def firehose_client(boto3_session: Session, localstack: URL) -> BaseClient:
     return boto3_session.client("firehose", endpoint_url=str(localstack))
 
 
-@pytest.fixture(autouse=True)
-def firehose_delivery_stream(firehose_client: BaseClient) -> dict[str, Any]:
-    return firehose_client.create_delivery_stream(DeliveryStreamName="eligibility-signposting-audit-stream")
-
-
 @pytest.fixture(scope="session")
 def iam_role(iam_client: BaseClient) -> Generator[str]:
     role_name = "LambdaExecutionRole"
@@ -391,13 +386,38 @@ def rules_bucket(s3_client: BaseClient) -> Generator[BucketName]:
 
 
 @pytest.fixture(scope="session")
-def audit_bucket(s3_client: BaseClient) -> Generator[BucketName]:
+def audit_bucket(s3_client: BaseClient) -> Generator[BucketName, None, None]:
     bucket_name = BucketName(os.getenv("AUDIT_BUCKET_NAME", "test-audit-bucket"))
-    s3_client.create_bucket(Bucket=bucket_name, CreateBucketConfiguration={"LocationConstraint": AWS_REGION})
+    s3_client.create_bucket(
+        Bucket=bucket_name,
+        CreateBucketConfiguration={"LocationConstraint": AWS_REGION}
+    )
     yield bucket_name
+
+    # Delete all objects in the bucket before deletion
+    objects = s3_client.list_objects_v2(Bucket=bucket_name).get("Contents", [])
+    for obj in objects:
+        s3_client.delete_object(Bucket=bucket_name, Key=obj["Key"])
     s3_client.delete_bucket(Bucket=bucket_name)
 
 
+@pytest.fixture(autouse=True)
+def firehose_delivery_stream(firehose_client: BaseClient, audit_bucket: BucketName) -> dict[str, Any]:
+    return firehose_client.create_delivery_stream(
+        DeliveryStreamName="eligibility-signposting-audit-stream",
+        DeliveryStreamType="DirectPut",
+        ExtendedS3DestinationConfiguration={
+            "BucketARN": f"arn:aws:s3:::{audit_bucket}",
+            "RoleARN": "arn:aws:iam::000000000000:role/firehose_delivery_role",
+            "Prefix": "audit-logs/",
+            "BufferingHints": {
+                "SizeInMBs": 1,
+                "IntervalInSeconds": 60
+            },
+            "CompressionFormat": "UNCOMPRESSED",
+        }
+    )
+
 @pytest.fixture(scope="class")
 def campaign_config(s3_client: BaseClient, rules_bucket: BucketName) -> Generator[rules.CampaignConfig]:
     campaign: rules.CampaignConfig = rule.CampaignConfigFactory.build(

tests/integration/lambda/test_app_running_as_lambda.py

@@ -11,11 +11,12 @@
 from brunns.matchers.data import json_matching as is_json_that
 from brunns.matchers.response import is_response
 from faker import Faker
-from hamcrest import assert_that, contains_exactly, contains_string, has_entries, has_item, has_key
+from hamcrest import assert_that, contains_exactly, contains_string, has_entries, has_item, has_key, any_of, starts_with
 from yarl import URL
 
 from eligibility_signposting_api.model.eligibility import NHSNumber
 from eligibility_signposting_api.model.rules import CampaignConfig
+from eligibility_signposting_api.repos.campaign_repo import BucketName
 
 logger = logging.getLogger(__name__)
 
@@ -157,6 +158,8 @@ def test_given_nhs_number_in_path_matches_with_nhs_number_in_headers(
     lambda_client: BaseClient,  # noqa:ARG001
     persisted_person: NHSNumber,
     campaign_config: CampaignConfig,  # noqa:ARG001
+    s3_client: BaseClient,
+    audit_bucket: BucketName,
     api_gateway_endpoint: URL,
 ):
     # Given
@@ -176,6 +179,12 @@ def test_given_nhs_number_in_path_matches_with_nhs_number_in_headers(
         is_response().with_status_code(HTTPStatus.OK).and_body(is_json_that(has_key("processedSuggestions"))),
     )
 
+    objects = s3_client.list_objects_v2(Bucket=audit_bucket).get("Contents", [])
+    object_keys = [obj["Key"] for obj in objects]
+    latest_key = sorted(object_keys)[-1]
+    audit_data = json.loads(s3_client.get_object(Bucket=audit_bucket, Key=latest_key)["Body"].read())
+    assert_that(audit_data, has_entries(test_audit="check if audit works"))
+
 
 def test_given_nhs_number_in_path_does_not_match_with_nhs_number_in_headers_results_in_error_response(
     lambda_client: BaseClient,  # noqa:ARG001