logging INFO issues

Author: Akol125

lambdas/shared/src/common/clients.py

@@ -2,19 +2,9 @@
 import logging
 from boto3 import client as boto3_client, resource as boto3_resource
 
-# Configure root logger with a numeric level and ensure any handlers accept INFO.
 logging.basicConfig(level=logging.INFO)
-root_logger = logging.getLogger()
-root_logger.setLevel(logging.INFO)
-
-for handler in root_logger.handlers:
-    try:
-        handler.setLevel(logging.INFO)
-    except Exception:
-        pass
-
-# Export the configured root logger for modules to use
-logger = root_logger
+logger = logging.getLogger()
+logger.setLevel(logging.INFO)
 
 STREAM_NAME = os.getenv("SPLUNK_FIREHOSE_NAME", "firehose-name-not-defined")
 CONFIG_BUCKET_NAME = os.getenv("CONFIG_BUCKET_NAME", "variconfig-bucketable-not-defined")

lambdas/shared/tests/test_common/test_clients.py

@@ -1,63 +1,61 @@
 import unittest
-from unittest.mock import patch
-import common.clients as clients
+from unittest.mock import patch, MagicMock
+import logging
 import importlib
+import common.clients as clients
 
 
 class TestClients(unittest.TestCase):
-
     BUCKET_NAME = "default-bucket"
     AWS_REGION = "eu-west-2"
 
     def setUp(self):
-        self.boto3_client_patch = patch("boto3.client")
+        # Patch boto3.client
+        self.boto3_client_patch = patch("boto3.client", autospec=True)
         self.mock_boto3_client = self.boto3_client_patch.start()
-        self.logging_patch = patch("logging.getLogger")
-        self.mock_logging = self.logging_patch.start()
-        self.logger_info_patcher = patch("logging.Logger.info")
-        self.mock_logger_info = self.logger_info_patcher.start()
-        self.getenv_patch = patch("os.getenv")
+        self.addCleanup(self.boto3_client_patch.stop)
+
+        # Patch logging.getLogger
+        self.logging_patch = patch("logging.getLogger", autospec=True)
+        self.mock_getLogger = self.logging_patch.start()
+        self.addCleanup(self.logging_patch.stop)
+
+        # Patch os.getenv
+        self.getenv_patch = patch("os.getenv", autospec=True)
         self.mock_getenv = self.getenv_patch.start()
+        self.addCleanup(self.getenv_patch.stop)
+
+        # Set environment variable mock return values
         self.mock_getenv.side_effect = lambda key, default=None: {
             "CONFIG_BUCKET_NAME": self.BUCKET_NAME,
             "AWS_REGION": self.AWS_REGION,
         }.get(key, default)
 
-        self.mock_boto3_client.return_value = self.mock_boto3_client
-        self.mock_boto3_client.return_value.send_message = {}
-
-    def tearDown(self):
-        patch.stopall()
+        # Simulate logger instance and patch setLevel
+        self.mock_logger_instance = MagicMock()
+        self.mock_getLogger.return_value = self.mock_logger_instance
 
-    def test_os_environ(self):
-        # Test if environment variables are set correctly
+        # Reload the module under test to apply patches
         importlib.reload(clients)
+
+    def test_env_variables_loaded(self):
+        """Test that environment variables are loaded correctly"""
         self.assertEqual(clients.CONFIG_BUCKET_NAME, self.BUCKET_NAME)
         self.assertEqual(clients.REGION_NAME, self.AWS_REGION)
 
-    def test_boto3_client(self):
-        ''' Test boto3 client is created with correct parameters '''
-        importlib.reload(clients)
+    def test_boto3_client_created_for_s3(self):
+        """Test that S3 boto3 client is created with correct region"""
         self.mock_boto3_client.assert_any_call("s3", region_name=self.AWS_REGION)
 
-    def test_firehose_client(self):
-        ''' Test firehose client is created with correct parameters '''
-        importlib.reload(clients)
+    def test_boto3_client_created_for_firehose(self):
+        """Test that Firehose boto3 client is created with correct region"""
         self.mock_boto3_client.assert_any_call("firehose", region_name=self.AWS_REGION)
 
-    def test_logging_setup(self):
-        ''' Test logging is set up correctly '''
-        importlib.reload(clients)
-        self.assertTrue(hasattr(clients, 'logger'))
+    def test_logger_is_initialized(self):
+        """Test that a logger instance is initialized"""
+        self.mock_getLogger.assert_called_once_with()
+        self.assertTrue(hasattr(clients, "logger"))
 
-    def test_logging_configuration(self):
-        ''' Test logging configuration '''
-        importlib.reload(clients)
-        clients.logger.setLevel.assert_called_once_with("INFO")
-
-    def test_logging_initialization(self):
-        ''' Test logging initialization '''
-        importlib.reload(clients)
-        self.mock_logging.assert_called_once_with()
-        self.assertTrue(hasattr(clients, 'logger'))
-        clients.logger.setLevel.assert_any_call("INFO")
+    def test_logger_set_level(self):
+        """Test that logger level is set to INFO"""
+        self.mock_logger_instance.setLevel.assert_called_once_with(logging.INFO)