openstack/deb-python-oauth2client
Code Issues Proposed changes

Merge pull request #570 from jonparrott/fix-adc-order

Browse Source 
Fix Application Default Credentials resolution order.
This commit is contained in:
Nathaniel Manista
2016-07-27 13:59:28 -07:00
committed by GitHub
parent bb2386ea51 2d270b0cf7
commit 86bd966cf2
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oauth2client/client.py
View File

@@ -1244,10 +1244,10 @@ class GoogleCredentials(OAuth2Credentials):
"""Gets credentials implicitly from the environment.
Checks environment in order of precedence:
- Google App Engine (production and testing)
- Environment variable GOOGLE_APPLICATION_CREDENTIALS pointing to
a file with stored credentials information.
- Stored "well known" file associated with `gcloud` command line tool.
- Google App Engine (production and testing)
- Google Compute Engine production environment.
Raises:
@@ -1256,8 +1256,8 @@ class GoogleCredentials(OAuth2Credentials):
"""
# Environ checks (in order).
environ_checkers = [
cls._implicit_credentials_from_gae,
cls._implicit_credentials_from_files,
cls._implicit_credentials_from_gae,
cls._implicit_credentials_from_gce,
]

29
tests/test_client.py
View File

@@ -306,7 +306,8 @@ class GoogleCredentialsTests(unittest2.TestCase):
credentials.create_scoped(['dummy_scope']))
@mock.patch.object(client.GoogleCredentials,
'_implicit_credentials_from_files')
'_implicit_credentials_from_files',
return_value=None)
@mock.patch.object(client.GoogleCredentials,
'_implicit_credentials_from_gce')
@mock.patch.object(client, '_in_gae_environment',
@@ -317,8 +318,8 @@ class GoogleCredentialsTests(unittest2.TestCase):
from_gce, from_files):
credentials = client.GoogleCredentials.get_application_default()
self.assertEqual(credentials, gae_adc.return_value)
from_files.assert_called_once_with()
in_gae.assert_called_once_with()
from_files.assert_not_called()
from_gce.assert_not_called()
@mock.patch.object(client.GoogleCredentials,
@@ -618,10 +619,10 @@ class GoogleCredentialsTests(unittest2.TestCase):
credentials = client.GoogleCredentials.get_application_default()
self.validate_service_account_credentials(credentials)
get_well_known.assert_not_called()
in_gce.assert_not_called()
get_env_file.assert_called_once_with()
in_gae.assert_called_once_with()
get_well_known.assert_not_called()
in_gae.assert_not_called()
in_gce.assert_not_called()
def test_env_name(self):
self.assertEqual(None, client.SETTINGS.env_name)
@@ -642,10 +643,10 @@ class GoogleCredentialsTests(unittest2.TestCase):
credentials = client.GoogleCredentials.get_application_default()
self.validate_google_credentials(credentials)
get_well_known.assert_not_called()
in_gce.assert_not_called()
get_env_file.assert_called_once_with()
in_gae.assert_called_once_with()
get_well_known.assert_not_called()
in_gae.assert_not_called()
in_gce.assert_not_called()
@mock.patch('oauth2client.client._in_gce_environment')
@mock.patch('oauth2client.client._in_gae_environment', return_value=False)
@@ -667,10 +668,10 @@ class GoogleCredentialsTests(unittest2.TestCase):
get_env_file.return_value + ' (pointed to by ' +
client.GOOGLE_APPLICATION_CREDENTIALS + ' environment variable):'))
get_well_known.assert_not_called()
in_gce.assert_not_called()
get_env_file.assert_called_once_with()
in_gae.assert_called_once_with()
get_well_known.assert_not_called()
in_gae.assert_not_called()
in_gce.assert_not_called()
@mock.patch('oauth2client.client._in_gce_environment', return_value=False)
@mock.patch('oauth2client.client._in_gae_environment', return_value=False)
@@ -689,8 +690,8 @@ class GoogleCredentialsTests(unittest2.TestCase):
client.GoogleCredentials.get_application_default()
self.assertEqual(client.ADC_HELP_MSG, str(exc_manager.exception))
get_well_known.assert_called_once_with()
get_env_file.assert_called_once_with()
get_well_known.assert_called_once_with()
in_gae.assert_called_once_with()
in_gce.assert_called_once_with()
@@ -716,9 +717,9 @@ class GoogleCredentialsTests(unittest2.TestCase):
self.assertEqual(result, result_creds)
get_from_file.assert_called_once_with(__file__)
get_well_known.assert_called_once_with()
get_env_file.assert_called_once_with()
in_gae.assert_called_once_with()
get_well_known.assert_called_once_with()
in_gae.assert_not_called()
in_gce.assert_not_called()
def test_from_stream_service_account(self):