chore: fix static check errors

Author: karenc-bq

aws_advanced_python_wrapper/aurora_connection_tracker_plugin.py

@@ -27,6 +27,7 @@
 if TYPE_CHECKING:
     from aws_advanced_python_wrapper.driver_dialect import DriverDialect
     from aws_advanced_python_wrapper.plugin_service import PluginService
+    from aws_advanced_python_wrapper.hostinfo import HostInfo
     from aws_advanced_python_wrapper.pep249 import Connection
 
     from aws_advanced_python_wrapper.utils.rds_url_type import RdsUrlType
@@ -35,7 +36,6 @@
 from _weakrefset import WeakSet
 
 from aws_advanced_python_wrapper.errors import FailoverError
-from aws_advanced_python_wrapper.hostinfo import HostInfo, HostRole
 from aws_advanced_python_wrapper.pep249_methods import DbApiMethod
 from aws_advanced_python_wrapper.plugin import Plugin, PluginFactory
 from aws_advanced_python_wrapper.utils.log import Logger
@@ -83,10 +83,10 @@ def _prune_connections(cls):
                             to_remove.append(conn)
                     except Exception:
                         pass
-            
+
             for conn in to_remove:
                 conn_set.discard(conn)
-            
+
             # Remove empty connection sets
             if not conn_set:
                 del cls._opened_connections[host]
@@ -105,8 +105,8 @@ def populate_opened_connection_set(self, host_info: HostInfo, conn: Connection):
             self._track_connection(host_info.as_alias(), conn)
             return
 
-        instance_endpoint: Optional[str] = next((alias for alias in aliases if self._rds_utils.is_rds_instance(self._rds_utils.remove_port(alias))),
-                                                None)
+        instance_endpoint: Optional[str] = next(
+            (alias for alias in aliases if self._rds_utils.is_rds_instance(self._rds_utils.remove_port(alias))), None)
         if not instance_endpoint:
             logger.debug("OpenedConnectionTracker.UnableToPopulateOpenedConnectionSet")
             return
@@ -143,12 +143,15 @@ def invalidate_all_connections(self, host_info: Optional[HostInfo] = None, host:
             self._log_connection_set(instance_endpoint, connection_set)
             self._invalidate_connections(connection_set)
 
-    def remove_connection_tracking(self, host_info: HostInfo, connection: Connection):
+    def remove_connection_tracking(self, host_info: HostInfo, connection: Connection | None):
+        if not connection:
+            return
+
         if self._rds_utils.is_rds_instance(host_info.host):
             host = host_info.as_alias()
         else:
             host = next((alias for alias in host_info.as_aliases()
-                         if self._rds_utils.is_rds_instance(self._rds_utils.remove_port(alias))), None)
+                         if self._rds_utils.is_rds_instance(self._rds_utils.remove_port(alias))), "")
 
         if not host:
             return
@@ -168,7 +171,7 @@ def _task(connection_set: WeakSet):
         while connection_set is not None:
             try:
                 conn_reference = connection_set.pop()
-            except KeyError as e:
+            except KeyError:
                 # connection_set is empty
                 # use KeyError instead of len() to determine whether connection_set is empty to prevent data race
                 break
@@ -182,7 +185,6 @@ def _task(connection_set: WeakSet):
                 # Swallow this exception, current connection should be useless anyway
                 pass
 
-
     def _invalidate_connections(self, connection_set: WeakSet):
         invalidate_connection_thread: Thread = Thread(daemon=True, target=self._task,
                                                       args=[connection_set])  # type: ignore
@@ -286,7 +288,8 @@ def execute(self, target: object, method_name: str, execute_func: Callable, *arg
 
         except Exception as e:
             if isinstance(e, FailoverError):
-                AuroraConnectionTrackerPlugin._host_list_refresh_end_time_nano = perf_counter_ns() + AuroraConnectionTrackerPlugin._TOPOLOGY_CHANGES_EXPECTED_TIME_NANO
+                AuroraConnectionTrackerPlugin._host_list_refresh_end_time_nano = (
+                        perf_counter_ns() + AuroraConnectionTrackerPlugin._TOPOLOGY_CHANGES_EXPECTED_TIME_NANO)
                 # Calling this method may effectively close/abort a current connection
                 self._check_writer_changed(True)
             raise

aws_advanced_python_wrapper/fastest_response_strategy_plugin.py

@@ -17,7 +17,6 @@
 import time
 from copy import copy
 from dataclasses import dataclass
-from datetime import datetime
 from threading import Event, Lock, Thread
 from time import sleep
 from typing import (TYPE_CHECKING, Callable, ClassVar, Dict, List, Optional,

tests/unit/test_aurora_connection_tracker.py

@@ -40,7 +40,7 @@ def mock_cursor(mocker):
     return mocker.MagicMock()
 
 
-@pytest.fixturey
+@pytest.fixture
 def mock_plugin_service(mocker):
     return mocker.MagicMock()
 
@@ -116,12 +116,12 @@ def test_prune_connections_logs_none_connection(mocker, caplog):
     mock_conn_set.__iter__ = mocker.MagicMock(return_value=iter([None]))
     mock_conn_set.__len__ = mocker.MagicMock(return_value=1)
     mock_conn_set.discard = mocker.MagicMock()
-    
+
     OpenedConnectionTracker._opened_connections = {"test-host": mock_conn_set}
-    
+
     with caplog.at_level("DEBUG"):
         tracker._prune_connections()
-    
+
     mock_conn_set.discard.assert_called_with(None)
 
 
@@ -131,16 +131,16 @@ def test_prune_connections_logs_closed_connection(mocker, caplog):
     mock_conn = mocker.MagicMock()
     mock_conn.__module__ = "psycopg"
     mock_conn.is_closed.return_value = True
-    
+
     mock_conn_set = mocker.MagicMock(spec=WeakSet)
     mock_conn_set.__iter__ = mocker.MagicMock(return_value=iter([mock_conn]))
     mock_conn_set.__len__ = mocker.MagicMock(return_value=1)
     mock_conn_set.discard = mocker.MagicMock()
-    
+
     tracker = OpenedConnectionTracker()
     OpenedConnectionTracker._opened_connections = {"test-host": mock_conn_set}
-    
+
     with caplog.at_level("DEBUG"):
         tracker._prune_connections()
-    
+
     mock_conn_set.discard.assert_called_with(mock_conn)