fix: resolve mypy and lint issues

Author: nbayati

packages/google-auth/google/auth/aio/transport/mtls.py

@@ -17,16 +17,13 @@
 """
 
 import asyncio
-import contextlib
 import logging
-import os
 import ssl
-import tempfile
 from typing import Optional
 
 from google.auth import exceptions
-import google.auth.transport.mtls
 from google.auth.transport._mtls_helper import secure_cert_key_paths
+import google.auth.transport.mtls
 
 _LOGGER = logging.getLogger(__name__)
 

packages/google-auth/google/auth/transport/_mtls_helper.py

@@ -20,7 +20,7 @@
 from os import environ, getenv, path
 import re
 import subprocess
-from typing import Generator, Optional, Tuple, Union
+from typing import cast, Generator, Optional, Tuple, Union
 
 from google.auth import _agent_identity_utils
 from google.auth import environment_vars
@@ -118,7 +118,9 @@ def secure_cert_key_paths(
                 if (cert_path is None or os.path.exists(cert_path)) and (
                     key_path is None or os.path.exists(key_path)
                 ):
-                    yield cert_path or cert, key_path or key, passphrase
+                    yield cast(str, cert_path or cert), cast(
+                        str, key_path or key
+                    ), passphrase
                     return
             finally:
                 import sys
@@ -137,7 +139,7 @@ def secure_cert_key_paths(
         key_path,
         new_passphrase,
     ):
-        yield cert_path or cert, key_path or key, new_passphrase
+        yield cast(str, cert_path or cert), cast(str, key_path or key), new_passphrase
 
 
 def _encrypt_key_if_plaintext(
@@ -199,7 +201,9 @@ def _secure_wipe_and_remove(file_path: str):
 
 
 @contextlib.contextmanager
-def _memfd_cert_key_paths(cert_bytes: Optional[bytes], key_bytes: Optional[bytes]):
+def _memfd_cert_key_paths(
+    cert_bytes: Optional[bytes], key_bytes: Optional[bytes]
+) -> Generator[Tuple[Optional[str], Optional[str]], None, None]:
     """Creates secure, in-memory virtual files on Linux using memfd_create.
 
     Yields:
@@ -237,8 +241,10 @@ def _memfd_cert_key_paths(cert_bytes: Optional[bytes], key_bytes: Optional[bytes
 
 @contextlib.contextmanager
 def _tempfile_cert_key_paths(
-    cert_bytes: Optional[bytes], key_bytes: Optional[bytes], passphrase: Optional[bytes]
-):
+    cert_bytes: Optional[bytes],
+    key_bytes: Optional[bytes],
+    passphrase: Optional[bytes],
+) -> Generator[Tuple[Optional[str], Optional[str], Optional[bytes]], None, None]:
     """Creates secure temporary file paths on disk, encrypting private keys.
 
     Yields:

packages/google-auth/tests/transport/test__mtls_helper.py

@@ -16,9 +16,8 @@
 import re
 from unittest import mock
 
-from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives import hashes
 import pytest  # type: ignore
 
 from google.auth import environment_vars, exceptions

packages/google-auth/tests/transport/test_requests.py

@@ -16,7 +16,6 @@
 import functools
 import http.client as http_client
 import os
-import sys
 from unittest import mock
 
 import freezegun

packages/google-auth/tests/transport/test_urllib3.py

@@ -14,7 +14,6 @@
 
 import http.client as http_client
 import os
-import sys
 from unittest import mock
 
 import pytest  # type: ignore