Switch from oauth2client to google-auth by theacodes · Pull Request #2726 · googleapis/google-cloud-python

theacodes · 2016-11-11T22:21:49Z

Removes all use of oauth2client from every package and tests.
Updates core to use google-auth's default credentials, project ID, and scoping logic.
Updates bigtable to use google-auth's scoping logic.

dhermes

Really great changes! Why do we don't merge this?

Sign in to view

 from six.moves import http_client
-from six.moves import configparser
-
-from google.cloud.environment_vars import PROJECT


Sign in to view

 implicit environments are:

- * GOOGLE_CLOUD_PROJECT environment variable
+ * GOOGLE_CLOUD_PROJECT and GCLOUD_PROJECT environment variable


Sign in to view

- if project is None:
- project = _compute_engine_id()
-
+ _, project = google.auth.default()


Sign in to view

 return cls(*args, **kwargs)

- @classmethod
- def from_service_account_p12(cls, client_email, private_key_path,


Sign in to view

 environment.
 """
- return client.GoogleCredentials.get_application_default()
+ credentials, _ = google.auth.default()


Sign in to view


 [testing]
 deps =
+ mock


Sign in to view

- returned_project = self._call_fut(project)
-
- return returned_project, _callers
+ def test(self):


Sign in to view

+ def test(self):
+ with mock.patch('google.auth.default', autospec=True) as default:
+ default.return_value = (
+ mock.sentinel.credentials, mock.sentinel.project)


Sign in to view

+ project = self._call_fut(mock.sentinel.project)
+
+ self.assertEqual(project, mock.sentinel.project)
+ self.assertFalse(default.called)


Sign in to view

+ credentials = mock.sentinel.credentials
 conn = self._make_one(credentials)
- self.assertIs(conn.credentials, credentials)
+ self.assertIs(conn.credentials, mock.sentinel.credentials)


Sign in to view

-try:
+import google_auth_httplib2
+
+try: # pragma: NO COVER


Sign in to view

- with _Monkey(MUT, grpc=grpc_mod,
- MetadataPlugin=mock_plugin):
+
+ grpc_patch = mock.patch.object(MUT, 'grpc', new=grpc_mod)


Sign in to view

+ request_patch = mock.patch('google_auth_httplib2.Request')
+ plugin_patch = mock.patch.object(
+ MUT, 'AuthMetadataPlugin', create=True)
+ with grpc_patch, request_patch as request_mock, plugin_patch as plugin:


Sign in to view

 def get_credentials():
 """Gets credentials implicitly from the current environment.

-.. note::


Sign in to view

+try: # pragma: NO COVER
 import grpc
-except ImportError: # pragma: NO COVER
+ from google.auth.transport.grpc import AuthMetadataPlugin


Sign in to view

- def create_scoped(self, scope):
- self._scopes = scope
- return self
+ pass


Sign in to view

- ``$ gcloud beta auth application-default login``
- * Google App Engine application ID
- * Google Compute Engine project ID (from metadata server)
+ See :func:`google.auth.default` for details on how the default project


Sign in to view

- custom_metadata_plugin = MetadataPlugin(credentials)
+ http = httplib2.Http()
+ custom_metadata_plugin = AuthMetadataPlugin(
+ credentials, google_auth_httplib2.Request(http=http))


Sign in to view

 http_levels = {}
 httplib2.debuglevel = level
- if http is not None:
+ if http is not None and hasattr(http, 'connections'):


Sign in to view

 REQUIREMENTS = [
 'httplib2 >= 0.9.1',
 'googleapis-common-protos >= 1.3.4',
- 'oauth2client >= 3.0.0, < 4.0.0dev',


Sign in to view

+ project = self._call_fut(mock.sentinel.project)
+
+ self.assertEqual(project, mock.sentinel.project)
+ self.assertFalse(default.called)


dhermes · 2016-12-02T22:27:29Z

@jonparrott Your translate failure may be a rebase issue? Or an old tox env?

dhermes

Approving with malice

theacodes · 2016-12-02T23:01:54Z

Merging with ill intent.

…kground-update) There is no specific reason to fix version and to manage this dependency differently (get last version), and it solved the issue below: for recent image push I have this error with gcloud 0.21.0: Traceback (most recent call last): File "./src/orchestrator/launch_backgroundupdate.py", line 8, in <module> init_gcloud_log(GCLOUD_PROJECT, u'background_update', IS_TEST_ENV) File "/usr/local/lib/python2.7/site-packages/common/log.py", line 14, in init_gcloud_log handler = CloudLoggingHandler(client, logger_name) File "/usr/local/lib/python2.7/site-packages/google/cloud/logging/handlers/handlers.py", line 80, in __init__ self.transport = transport(client, name) File "/usr/local/lib/python2.7/site-packages/google/cloud/logging/handlers/transports/background_thread.py", line 154, in __init__ http = client._connection.credentials.authorize(http) AttributeError: 'Credentials' object has no attribute 'authorize' It seems related to change: googleapis/google-cloud-python#2726 Upgrade to 0.21.1 fix the issue.

* Removes all use of oauth2client from every package and tests. * Updates core to use google-auth's default credentials, project ID, and scoping logic. * Updates bigtable to use google-auth's scoping logic.

theacodes added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Nov 11, 2016

theacodes assigned dhermes Nov 11, 2016

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Nov 11, 2016

theacodes force-pushed the google-auth branch from 4563140 to 2581686Compare November 11, 2016 22:25

dhermes reviewed Nov 11, 2016
View reviewed changes

dhermes reviewed Nov 12, 2016
View reviewed changes

Jon Wayne Parrott added 5 commits December 1, 2016 14:31

Switch core to google-auth.
a6d2846

Update gRPC helpers
bb487ee

Address review comments
eae7799

Remove references to oauth2client
3b908c8

Get storage system tests to pass
46f83da

theacodes force-pushed the google-auth branch from 4820062 to 46f83daCompare December 1, 2016 22:46

Jon Wayne Parrott added 10 commits December 1, 2016 14:46

Swap NO COVER location
bf09a31

Update to latest google-auth
ddb75c8

Update docstring to point to google auth.
4ef18d4

Fix bigquery test coverage
464460b

Fix datastore tests
86fb2ab

Fix language tests
2feb33c

Fix logging tests
91bfa18

Fix monitoring tests
1f4977d

Fix pubsub tests
5b27859

Fix resource manager tests
e7f29da

dhermes reviewed Dec 2, 2016
View reviewed changes

Jon Wayne Parrott added 5 commits December 2, 2016 10:45

Fix runtimeconfig tests
2b12b27

Fix speech samples
7d47bdf

Fix storage tests
f8929f4

Fix vision tests
bf03afc

Remove all _Credentials classes
dba6136

Jon Wayne Parrott added 2 commits December 2, 2016 14:34

Update minimum google-auth version
4f0feeb

Use credentials.signer_email
f32d639

dhermes approved these changes Dec 2, 2016
View reviewed changes

theacodes merged commit 0581c28 into googleapis:masterDec 2, 2016

theacodes deleted the google-auth branch December 2, 2016 23:02

theacodes mentioned this pull request Dec 2, 2016
Drop oauth2client in favor of google-auth #2639
Closed

This was referenced Dec 5, 2016
Cutting new releases for BigQuery, Language and Core. #2815
Merged
Update versions for mega-release. #2846
Merged

yelsayd mentioned this pull request Sep 5, 2017
Bumping google.cloud from 0.19 to 0.27 googledatalab/pydatalab#483
Closed

theacodes unassigned dhermes Sep 28, 2018

Uh oh!

Conversation

theacodes commented Nov 11, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dhermes left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

theacodes commented Nov 11, 2016•
edited
Loading