Fix failover2 wrong writer host

Author: aaron-congo

aws_advanced_python_wrapper/cluster_topology_monitor.py

@@ -20,14 +20,11 @@
 from concurrent.futures import ThreadPoolExecutor
 from typing import TYPE_CHECKING, Dict, Optional
 
-from aws_advanced_python_wrapper.errors import AwsWrapperError
 from aws_advanced_python_wrapper.host_availability import HostAvailability
 from aws_advanced_python_wrapper.hostinfo import HostInfo
 from aws_advanced_python_wrapper.utils.atomic import AtomicReference
 from aws_advanced_python_wrapper.utils.messages import Messages
-from aws_advanced_python_wrapper.utils.rds_utils import RdsUtils
-from aws_advanced_python_wrapper.utils.storage.storage_service import (
-    StorageService, Topology)
+from aws_advanced_python_wrapper.utils.rdsutils import RdsUtils
 from aws_advanced_python_wrapper.utils.thread_safe_connection_holder import \
     ThreadSafeConnectionHolder
 from aws_advanced_python_wrapper.utils.utils import LogUtils
@@ -307,8 +304,8 @@ def _open_any_connection_and_update_topology(self) -> Topology:
                              self._cluster_id, self._initial_host_info.host)
 
                 try:
-                    writer_id = self._topology_utils.get_writer_id_if_connected(
-                        conn, self._plugin_service.driver_dialect)
+                    writer_id = self._topology_utils.get_writer_host_if_connected(
+                            conn, self._plugin_service.driver_dialect)
                     if writer_id:
                         self._is_verified_writer_connection = True
                         writer_verified_by_this_thread = True
@@ -317,10 +314,9 @@ def _open_any_connection_and_update_topology(self) -> Topology:
                             writer_host_info = self._initial_host_info
                             self._writer_host_info.set(writer_host_info)
                         else:
-                            instance_template = self._get_instance_template(writer_id, conn)
-                            writer_host = instance_template.host.replace("?", writer_id)
-                            port = instance_template.port \
-                                if instance_template.is_port_specified() \
+                            writer_host = self._instance_template.host.replace("?", writer_id)
+                            port = self._instance_template.port \
+                                if self._instance_template.is_port_specified() \
                                 else self._initial_host_info.port
                             writer_host_info = HostInfo(
                                 writer_host,