BUG#38072835: Authentication OCI plugin option parameters not being supported by the aio connector

Added support for OCI authentication connection options
for the async implementation of the connector.

Fixed linting and typing issues.

Change-Id: I384dafad3ab1f27921972456f0b4b3a93116792d

Author: Oscar Pacheco

CHANGES.txt

@@ -15,6 +15,7 @@ v9.4.0
 - WL#16963: Update the OpenTelemetry version
 - WL#16962: Update the Python Protobuf version
 - WL#16954: Make sdist packages pip installable
+- BUG#38072835: Authentication OCI plugin option parameters not being supported by the aio connector
 - BUG#37868219: RPM packages have incorrect copyright year in their metadata
 - BUG#37859771: mysql/connector python version 9.3.0 has a regression which cannot persist binary data with percent signs in it
 - BUG#37820231: Text based django ORM filters doesn't work with Connector/Python

mysql-connector-python/lib/mysql/connector/aio/abstracts.py

@@ -212,6 +212,8 @@ def __init__(
         tls_versions: Optional[List[str]] = None,
         tls_ciphersuites: Optional[List[str]] = None,
         loop: Optional[asyncio.AbstractEventLoop] = None,
+        oci_config_file: Optional[str] = None,
+        oci_config_profile: Optional[str] = None,
     ):
         # private (shouldn't be manipulated directly internally)
         self.__charset: Optional[Charset] = None
@@ -283,8 +285,10 @@ def __init__(
         self._have_next_result: bool = False
         self._unread_result: bool = False
         self._in_transaction: bool = False
-        self._oci_config_file: Optional[str] = None
-        self._oci_config_profile: Optional[str] = None
+        self._oci_config_file: Optional[str] = oci_config_file
+        """Path to the configuration file."""
+        self._oci_config_profile: Optional[str] = oci_config_profile
+        """Profile name."""
         self._webauthn_callback: Optional[Union[str, Callable[[str], None]]] = (
             webauthn_callback
         )

mysql-connector-python/lib/mysql/connector/aio/connection.py

@@ -891,7 +891,7 @@ async def get_rows(
         if not self.unread_result:
             raise InternalError("No result set available")
 
-        rows: Tuple[List[Tuple[Any, ...]], Optional[EofPacketType]] = ([], None)
+        rows = ([], None)  # type: ignore[var-annotated]
         try:
             read_timeout = kwargs.get("read_timeout", None)
             if binary:

mysql-connector-python/lib/mysql/connector/aio/plugins/authentication_webauthn_client.py

@@ -195,7 +195,7 @@ def auth_response(self, auth_data: bytes, **kwargs: Any) -> Optional[bytes]:
         if device is not None:
             logger.debug("WebAuthn - Use USB HID channel")
         elif CTAP_PCSC_DEVICE_AVAILABLE:
-            device = next(CtapPcscDevice.list_devices(), None)  # type: ignore[arg-type]
+            device = next(CtapPcscDevice.list_devices(), None)
 
         if device is None:
             raise errors.InterfaceError("No FIDO device found")

mysql-connector-python/lib/mysql/connector/connection.py

@@ -815,7 +815,7 @@ def get_rows(
         if not self.unread_result:
             raise InternalError("No result set available")
 
-        rows: Tuple[List[Tuple], Optional[EofPacketType]] = ([], None)
+        rows = ([], None)  # type: ignore[var-annotated]
         try:
             read_timeout = kwargs.get("read_timeout", None)
             if binary:
@@ -1285,7 +1285,7 @@ def set_allow_local_infile_in_path(self, path: str) -> None:
         """
         self._allow_local_infile_in_path = path
 
-    @MySQLConnectionAbstract.use_unicode.setter  # type: ignore
+    @MySQLConnectionAbstract.use_unicode.setter
     def use_unicode(self, value: bool) -> None:
         self._use_unicode = value
         if self.converter:

mysql-connector-python/lib/mysql/connector/django/base.py

@@ -352,7 +352,7 @@ def __getattr__(self, attr: str) -> bool:
         raise AttributeError
 
     def get_connection_params(self) -> Dict[str, Any]:
-        kwargs = {
+        kwargs: dict = {
             "consume_results": True,
         }
 

mysql-connector-python/lib/mysql/connector/opentelemetry/instrumentation.py

@@ -547,6 +547,7 @@ def wrapper(
         kwargs[OPTION_CNX_TRACER] = tracer
 
         # attach connection span
+        # pylint: disable=not-context-manager
         with trace.use_span(kwargs[OPTION_CNX_SPAN], end_on_exit=False) as cnx_span:
             # Add basic net information.
             set_connection_span_attrs(None, cnx_span, kwargs)

mysql-connector-python/lib/mysql/connector/plugins/authentication_webauthn_client.py

@@ -194,7 +194,7 @@ def auth_response(self, auth_data: bytes, **kwargs: Any) -> Optional[bytes]:
         if device is not None:
             logger.debug("WebAuthn - Use USB HID channel")
         elif CTAP_PCSC_DEVICE_AVAILABLE:
-            device = next(CtapPcscDevice.list_devices(), None)  # type: ignore[arg-type]
+            device = next(CtapPcscDevice.list_devices(), None)
 
         if device is None:
             raise errors.InterfaceError("No FIDO device found")

mysqlx-connector-python/lib/mysqlx/connection.py

@@ -728,7 +728,7 @@ def __init__(self, settings: Dict[str, Any]) -> None:
 
         if "host" in settings and settings["host"]:
             self._routers.append(
-                {  # type: ignore[arg-type]
+                {
                     "host": settings.get("host"),
                     "port": settings.get("port", None),
                 }
@@ -1288,7 +1288,7 @@ def execute_sql_scalar(self, sql: StatementType) -> int:
         result.fetch_all()
         if result.count == 0:
             raise InterfaceError("No data found")
-        return result[0][0]  # type: ignore[index]
+        return result[0][0]
 
     @catch_network_exception
     def get_row_result(self, cmd: str, fields: Dict[str, Any]) -> RowResult:
@@ -1645,7 +1645,7 @@ def add_connection(self, cnx: Optional[PooledConnection] = None) -> None:
                 raise PoolError("Connection instance not subclass of PooledSession")
             if cnx.is_server_disconnected():
                 self.remove_connections()
-                cnx.close()  # type: ignore[attr-defined]
+                cnx.close()
 
         self.queue_connection(cnx)
 
@@ -2362,7 +2362,7 @@ def get_default_schema(self) -> Optional[Schema]:
                 .fetch_all()
             )
             try:
-                if res[0][0] == schema:  # type: ignore[index]
+                if res[0][0] == schema:
                     return Schema(self, schema)
             except IndexError:
                 raise ProgrammingError(