fix: integration tests

Author: karenc-bq

aws_advanced_python_wrapper/aurora_connection_tracker_plugin.py

@@ -49,24 +49,6 @@ def populate_opened_connection_set(self, host_info: HostInfo, conn: Connection):
         :param conn: currently opened connection.
         """
 
-        #     // Check if the connection was established using an instance endpoint
-        #     if (rdsUtils.isRdsInstance(hostSpec.getHost())) {
-        #       trackConnection(hostSpec.getHostAndPort(), conn);
-        #       return;
-        #     }
-        #
-        #     final String instanceEndpoint = aliases.stream()
-        #         .filter(x -> rdsUtils.isRdsInstance(rdsUtils.removePort(x)))
-        #         .max(String::compareToIgnoreCase)
-        #         .orElse(null);
-        #
-        #     if (instanceEndpoint == null) {
-        #       LOGGER.finest(
-        #           Messages.get("OpenedConnectionTracker.unableToPopulateOpenedConnectionQueue",
-        #             new Object[] {hostSpec.getHost()}));
-        #       return;
-        #     }
-
         aliases: FrozenSet[str] = host_info.as_aliases()
 
         if self._rds_utils.is_rds_instance(host_info.host):
@@ -99,7 +81,7 @@ def invalidate_all_connections(self, host_info: Optional[HostInfo] = None, host:
             return
 
         for instance in host:
-            if instance is not None and self._rds_utils.is_rds_instance(instance):
+            if instance is not None and self._rds_utils.is_rds_instance(self._rds_utils.remove_port(instance)):
                 instance_endpoint = instance
                 break
 

tests/integration/container/conftest.py

@@ -28,6 +28,7 @@
 from aws_advanced_python_wrapper.host_list_provider import RdsHostListProvider
 from aws_advanced_python_wrapper.plugin_service import PluginServiceImpl
 from aws_advanced_python_wrapper.utils.log import Logger
+from aws_advanced_python_wrapper.utils.rdsutils import RdsUtils
 
 if TYPE_CHECKING:
     from .utils.test_driver import TestDriver
@@ -124,6 +125,7 @@ def pytest_runtest_setup(item):
 
         assert cluster_ip == writer_ip
 
+        RdsUtils.clear_cache()
         RdsHostListProvider._topology_cache.clear()
         RdsHostListProvider._is_primary_cluster_id_cache.clear()
         RdsHostListProvider._cluster_ids_to_update.clear()

tests/integration/container/test_read_write_splitting.py

@@ -516,7 +516,7 @@ def test_pooled_connection__failover_failed(
             self, test_environment: TestEnvironment, test_driver: TestDriver,
             rds_utils, conn_utils, proxied_failover_props):
         writer_host = test_environment.get_writer().get_host()
-        provider = SqlAlchemyPooledConnectionProvider(lambda _, __: {"pool_size": 1}, lambda host_info, props: writer_host in host_info.host)
+        provider = SqlAlchemyPooledConnectionProvider(lambda _, __: {"pool_size": 1}, None, lambda host_info, props: writer_host in host_info.host)
         ConnectionProviderManager.set_connection_provider(provider)
 
         WrapperProperties.PLUGINS.set(proxied_failover_props, "read_write_splitting,failover,host_monitoring")