Merge pull request #31563: Cherrypick #31546 to 2.57.0 release branch

apache · Jun 11, 2024 · e92fbfe · e92fbfe
2 parents 3660144 + 8ccb155
commit e92fbfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sdks/python/apache_beam/internal/gcp/auth.py b/sdks/python/apache_beam/internal/gcp/auth.py
@@ -66,7 +66,7 @@ def set_running_in_gce(worker_executing_project):
 
 
 def get_service_credentials(pipeline_options):
-  # type: (PipelineOptions) -> Optional[google.auth.credentials.Credentials]
+  # type: (PipelineOptions) -> Optional[_ApitoolsCredentialsAdapter]
 
   """For internal use only; no backwards-compatibility guarantees.
 
@@ -76,7 +76,7 @@ def get_service_credentials(pipeline_options):
       like impersonated credentials.
 
   Returns:
-    A ``google.auth.credentials.Credentials`` object or None if credentials
+    A ``_ApitoolsCredentialsAdapter`` object or None if credentials
     not found. Returned object is thread-safe.
   """
   return _Credentials.get_service_credentials(pipeline_options)

diff --git a/sdks/python/apache_beam/internal/gcp/auth_test.py b/sdks/python/apache_beam/internal/gcp/auth_test.py
@@ -26,7 +26,7 @@
 try:
   import google.auth as gauth
 except ImportError:
-  gauth = None
+  gauth = None  # type: ignore
 
 
 class MockLoggingHandler(logging.Handler):