fix: remove unneccesary boto3 call to verify region

Author: faviansamatha

aws_advanced_python_wrapper/aws_secrets_manager_plugin.py

@@ -211,7 +211,7 @@ def _apply_secret_to_properties(self, properties: Properties):
 
     def _get_rds_region(self, secret_id: str, props: Properties) -> str:
         session = self._session if self._session else boto3.Session()
-        region = self._region_utils.get_region(props, WrapperProperties.SECRETS_MANAGER_REGION.name, session=session)
+        region = self._region_utils.get_region(props, WrapperProperties.SECRETS_MANAGER_REGION.name)
 
         if region:
             return region

aws_advanced_python_wrapper/federated_plugin.py

@@ -84,7 +84,7 @@ def _connect(self, host_info: HostInfo, props: Properties, connect_func: Callabl
 
         host = IamAuthUtils.get_iam_host(props, host_info)
         port = IamAuthUtils.get_port(props, host_info, self._plugin_service.database_dialect.default_port)
-        region = self._region_utils.get_region(props, WrapperProperties.IAM_REGION.name, host, self._session)
+        region = self._region_utils.get_region(props, WrapperProperties.IAM_REGION.name, host)
         if not region:
             error_message = "RdsUtils.UnsupportedHostname"
             logger.debug(error_message, host)

aws_advanced_python_wrapper/iam_plugin.py

@@ -78,7 +78,7 @@ def _connect(self, host_info: HostInfo, props: Properties, connect_func: Callabl
             raise AwsWrapperError(Messages.get_formatted("IamAuthPlugin.IsNoneOrEmpty", WrapperProperties.USER.name))
 
         host = IamAuthUtils.get_iam_host(props, host_info)
-        region = self._region_utils.get_region(props, WrapperProperties.IAM_REGION.name, host, self._session)
+        region = self._region_utils.get_region(props, WrapperProperties.IAM_REGION.name, host)
         if not region:
             error_message = "RdsUtils.UnsupportedHostname"
             logger.debug(error_message, host)

aws_advanced_python_wrapper/okta_plugin.py

@@ -80,7 +80,7 @@ def _connect(self, host_info: HostInfo, props: Properties, connect_func: Callabl
 
         host = IamAuthUtils.get_iam_host(props, host_info)
         port = IamAuthUtils.get_port(props, host_info, self._plugin_service.database_dialect.default_port)
-        region = self._region_utils.get_region(props, WrapperProperties.IAM_REGION.name, host, self._session)
+        region = self._region_utils.get_region(props, WrapperProperties.IAM_REGION.name, host)
         if not region:
             error_message = "RdsUtils.UnsupportedHostname"
             logger.debug(error_message, host)

aws_advanced_python_wrapper/utils/region_utils.py

@@ -36,17 +36,15 @@ def __init__(self):
     def get_region(self,
                    props: Properties,
                    prop_key: str,
-                   hostname: Optional[str] = None,
-                   session: Optional[Session] = None) -> Optional[str]:
+                   hostname: Optional[str] = None) -> Optional[str]:
         region = props.get(prop_key)
         if region:
-            return self.verify_region(region, session)
+            return region
 
-        return self.get_region_from_hostname(hostname, session)
+        return self.get_region_from_hostname(hostname)
 
-    def get_region_from_hostname(self, hostname: Optional[str], session: Optional[Session] = None) -> Optional[str]:
-        region = self._rds_utils.get_rds_region(hostname)
-        return self.verify_region(region, session) if region else None
+    def get_region_from_hostname(self, hostname: Optional[str]) -> Optional[str]:
+        return self._rds_utils.get_rds_region(hostname)
 
     def verify_region(self, region: str, session: Optional[Session] = None) -> str:
         session = session if session is not None else Session()