Skip to content

[BEAM-2152] Remove gcloud auth as application default credentials manages it #2869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sb2nov wants to merge 1 commit into from
Closed

[BEAM-2152] Remove gcloud auth as application default credentials manages it #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions sdks/python/apache_beam/internal/gcp/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from oauth2client.client import GoogleCredentials
from oauth2client.client import OAuth2Credentials

from apache_beam.utils import processes
from apache_beam.utils import retry


Expand Down Expand Up @@ -94,27 +93,6 @@ def _refresh(self, http_request):
datetime.timedelta(seconds=token_data['expires_in']))


class _GCloudWrapperCredentials(OAuth2Credentials):
"""Credentials class wrapping gcloud credentials via shell."""

def __init__(self, user_agent, **kwds):
super(_GCloudWrapperCredentials, self).__init__(
None, None, None, None, None, None, user_agent, **kwds)

def _refresh(self, http_request):
"""Gets an access token using the gcloud client."""
try:
gcloud_process = processes.Popen(
['gcloud', 'auth', 'print-access-token'], stdout=processes.PIPE)
except OSError:
message = 'gcloud tool not found so falling back to using ' +\
'application default credentials'
logging.warning(message)
raise AuthenticationException(message)
output, _ = gcloud_process.communicate()
self.access_token = output.strip()


def get_service_credentials():
"""Get credentials to access Google services."""
user_agent = 'beam-python-sdk/1.0'
Expand All @@ -134,16 +112,6 @@ def get_service_credentials():
'https://www.googleapis.com/auth/datastore'
]

try:
credentials = _GCloudWrapperCredentials(user_agent)
# Check if we are able to get an access token. If not fallback to
# application default credentials.
credentials.get_access_token()
return credentials
except AuthenticationException:
logging.warning('Unable to find credentials from gcloud.')

# Falling back to application default credentials.
try:
credentials = GoogleCredentials.get_application_default()
credentials = credentials.create_scoped(client_scopes)
Expand Down
3 changes: 1 addition & 2 deletions sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,7 @@ def stage_file(self, gcs_or_local_path, file_name, stream,
if e.status_code in reportable_errors:
raise IOError(('Could not upload to GCS path %s: %s. Please verify '
'that credentials are valid and that you have write '
'access to the specified path. Stale credentials can be '
'refreshed by executing "gcloud auth login".') %
'access to the specified path.') %
(gcs_or_local_path, reportable_errors[e.status_code]))
raise
logging.info('Completed GCS upload to %s', gcs_location)
Expand Down