unrefactor II: remove mock dynamodb

Author: JamesW1-NHS

ack_backend/tests/test_splunk_logging.py

@@ -1,11 +1,10 @@
 """Tests for ack lambda logging decorators"""
-
 import unittest
 from unittest.mock import patch, call
 import json
 from io import StringIO
 from contextlib import ExitStack
-from moto import mock_s3, mock_dynamodb
+from moto import mock_s3
 from boto3 import client as boto3_client
 
 from tests.utils.values_for_ack_backend_tests import (
@@ -19,21 +18,18 @@
 from tests.utils.utils_for_ack_backend_tests import generate_event
 
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
-    from clients import REGION_NAME
     from ack_processor import lambda_handler
 
 s3_client = boto3_client("s3")
-dynamodb_client = boto3_client("dynamodb", region_name=REGION_NAME)
 
 
-@mock_s3
-@mock_dynamodb
 @patch.dict("os.environ", MOCK_ENVIRONMENT_DICT)
+@mock_s3
 class TestLoggingDecorators(unittest.TestCase):
     """Tests for the ack lambda logging decorators"""
 
     def setUp(self):
-        GenericSetUp(s3_client, None, dynamodb_client)
+        GenericSetUp(s3_client)
 
         # MOCK SOURCE FILE WITH 100 ROWS TO SIMULATE THE SCENARIO WHERE THE ACK FILE IS NO FULL.
         # TODO: Test all other scenarios.

ack_backend/tests/utils/generic_setup_and_teardown_for_ack_backend.py

@@ -1,13 +1,6 @@
 """Generic setup and teardown for ACK backend tests"""
 
-from unittest.mock import patch
-
-from tests.utils.mock_environment_variables import BucketNames, MOCK_ENVIRONMENT_DICT, Firehose
-
-# Ensure environment variables are mocked before importing from src files
-with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
-    from clients import REGION_NAME
-    from constants import AuditTableKeys, AUDIT_TABLE_NAME, AUDIT_TABLE_QUEUE_NAME_GSI, AUDIT_TABLE_FILENAME_GSI
+from tests.utils.mock_environment_variables import BucketNames, Firehose, REGION_NAME
 
 
 class GenericSetUp:
@@ -18,7 +11,7 @@ class GenericSetUp:
     * If firehose_client is provided, creates a firehose delivery stream
     """
 
-    def __init__(self, s3_client=None, firehose_client=None, dynamodb_client=None):
+    def __init__(self, s3_client=None, firehose_client=None):
 
         if s3_client:
             for bucket_name in [BucketNames.SOURCE, BucketNames.DESTINATION, BucketNames.MOCK_FIREHOSE]:
@@ -37,41 +30,11 @@ def __init__(self, s3_client=None, firehose_client=None, dynamodb_client=None):
                 },
             )
 
-        if dynamodb_client:
-            dynamodb_client.create_table(
-                TableName=AUDIT_TABLE_NAME,
-                KeySchema=[{"AttributeName": AuditTableKeys.MESSAGE_ID, "KeyType": "HASH"}],
-                AttributeDefinitions=[
-                    {"AttributeName": AuditTableKeys.MESSAGE_ID, "AttributeType": "S"},
-                    {"AttributeName": AuditTableKeys.FILENAME, "AttributeType": "S"},
-                    {"AttributeName": AuditTableKeys.QUEUE_NAME, "AttributeType": "S"},
-                    {"AttributeName": AuditTableKeys.STATUS, "AttributeType": "S"},
-                ],
-                ProvisionedThroughput={"ReadCapacityUnits": 5, "WriteCapacityUnits": 5},
-                GlobalSecondaryIndexes=[
-                    {
-                        "IndexName": AUDIT_TABLE_FILENAME_GSI,
-                        "KeySchema": [{"AttributeName": AuditTableKeys.FILENAME, "KeyType": "HASH"}],
-                        "Projection": {"ProjectionType": "KEYS_ONLY"},
-                        "ProvisionedThroughput": {"ReadCapacityUnits": 5, "WriteCapacityUnits": 5},
-                    },
-                    {
-                        "IndexName": AUDIT_TABLE_QUEUE_NAME_GSI,
-                        "KeySchema": [
-                            {"AttributeName": AuditTableKeys.QUEUE_NAME, "KeyType": "HASH"},
-                            {"AttributeName": AuditTableKeys.STATUS, "KeyType": "RANGE"},
-                        ],
-                        "Projection": {"ProjectionType": "ALL"},
-                        "ProvisionedThroughput": {"ReadCapacityUnits": 5, "WriteCapacityUnits": 5},
-                    },
-                ],
-            )
-
 
 class GenericTearDown:
     """Performs generic tear down of mock resources"""
 
-    def __init__(self, s3_client=None, firehose_client=None, dynamodb_client=None):
+    def __init__(self, s3_client=None, firehose_client=None):
 
         if s3_client:
             for bucket_name in [BucketNames.SOURCE, BucketNames.DESTINATION, BucketNames.MOCK_FIREHOSE]:
@@ -80,7 +43,4 @@ def __init__(self, s3_client=None, firehose_client=None, dynamodb_client=None):
                 s3_client.delete_bucket(Bucket=bucket_name)
 
         if firehose_client:
-            firehose_client.delete_delivery_stream(DeliveryStreamName=Firehose.STREAM_NAME)
-
-        if dynamodb_client:
-            dynamodb_client.delete_table(TableName=AUDIT_TABLE_NAME)
+            firehose_client.delete_delivery_stream(DeliveryStreamName=Firehose.STREAM_NAME)