Switch from oauth2client to google-auth (#2726)

Jon Wayne Parrott · web-flow · commit 405ae406518d · 2016-12-02T15:02:25.000-08:00
* 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.
diff --git a/packages/google-cloud-pubsub/unit_tests/test__gax.py b/packages/google-cloud-pubsub/unit_tests/test__gax.py
@@ -430,7 +430,7 @@ def test_list_subscriptions_no_paging(self):
                                 push_config=push_cfg_pb)
         response = _GAXPageIterator([sub_pb])
         gax_api = _GAXSubscriberAPI(_list_subscriptions_response=response)
-        creds = _Credentials()
+        creds = object()
         client = Client(project=self.PROJECT, credentials=creds)
         api = self._make_one(gax_api, client)
 
@@ -476,7 +476,7 @@ def test_list_subscriptions_with_paging(self):
         response = _GAXPageIterator([sub_pb], page_token=NEW_TOKEN)
         gax_api = _GAXSubscriberAPI(_list_subscriptions_response=response)
         client = _Client(self.PROJECT)
-        creds = _Credentials()
+        creds = object()
         client = Client(project=self.PROJECT, credentials=creds)
         api = self._make_one(gax_api, client)
 
@@ -914,7 +914,7 @@ def make_channel(*args):
 
         mock_publisher_api.SERVICE_ADDRESS = host
 
-        creds = _Credentials()
+        creds = object()
         connection = _Connection(in_emulator=False,
                                  credentials=creds)
         patch = mock.patch.multiple(
@@ -986,7 +986,7 @@ def make_channel(*args):
 
         mock_subscriber_api.SERVICE_ADDRESS = host
 
-        creds = _Credentials()
+        creds = object()
         connection = _Connection(in_emulator=False,
                                  credentials=creds)
         patch = mock.patch.multiple(
@@ -1216,10 +1216,3 @@ class _Client(object):
 
     def __init__(self, project):
         self.project = project
-
-
-class _Credentials(object):
-
-    @staticmethod
-    def create_scoped_required():
-        return False
diff --git a/packages/google-cloud-pubsub/unit_tests/test__http.py b/packages/google-cloud-pubsub/unit_tests/test__http.py
@@ -454,7 +454,7 @@ def test_list_subscriptions_no_paging(self):
         SUB_INFO = {'name': self.SUB_PATH, 'topic': self.TOPIC_PATH}
         RETURNED = {'subscriptions': [SUB_INFO]}
         connection = _Connection(RETURNED)
-        creds = _Credentials()
+        creds = object()
         client = Client(project=self.PROJECT, credentials=creds)
         client._connection = connection
         api = self._make_one(client)
@@ -497,7 +497,7 @@ def test_list_subscriptions_with_paging(self):
             'nextPageToken': 'TOKEN2',
         }
         connection = _Connection(RETURNED)
-        creds = _Credentials()
+        creds = object()
         client = Client(project=self.PROJECT, credentials=creds)
         client._connection = connection
         api = self._make_one(client)
@@ -902,10 +902,3 @@ class _Client(object):
     def __init__(self, connection, project):
         self._connection = connection
         self.project = project
-
-
-class _Credentials(object):
-
-    @staticmethod
-    def create_scoped_required():
-        return False
diff --git a/packages/google-cloud-pubsub/unit_tests/test_client.py b/packages/google-cloud-pubsub/unit_tests/test_client.py
@@ -33,7 +33,7 @@ def _make_one(self, *args, **kw):
     def test_publisher_api_wo_gax(self):
         from google.cloud.pubsub._http import _PublisherAPI
 
-        creds = _Credentials()
+        creds = object()
 
         client = self._make_one(
             project=self.PROJECT, credentials=creds,
@@ -52,7 +52,7 @@ def test_no_gax_ctor(self):
         import mock
         from google.cloud.pubsub._http import _PublisherAPI
 
-        creds = _Credentials()
+        creds = object()
         with mock.patch('google.cloud.pubsub.client._USE_GAX',
                         new=True):
             client = self._make_one(project=self.PROJECT, credentials=creds,
@@ -78,7 +78,7 @@ def __init__(self, _wrapped, client):
                 self._wrapped = _wrapped
                 self._client = client
 
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(
             project=self.PROJECT, credentials=creds,
             use_gax=True)
@@ -102,7 +102,7 @@ def __init__(self, _wrapped, client):
     def test_subscriber_api_wo_gax(self):
         from google.cloud.pubsub._http import _SubscriberAPI
 
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(
             project=self.PROJECT, credentials=creds,
             use_gax=False)
@@ -132,7 +132,7 @@ def __init__(self, _wrapped, client):
                 self._wrapped = _wrapped
                 self._client = client
 
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(
             project=self.PROJECT, credentials=creds,
             use_gax=True)
@@ -155,7 +155,7 @@ def __init__(self, _wrapped, client):
 
     def test_iam_policy_api(self):
         from google.cloud.pubsub._http import _IAMPolicyAPI
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(project=self.PROJECT, credentials=creds)
         conn = client._connection = object()
         api = client.iam_policy_api
@@ -168,7 +168,7 @@ def test_iam_policy_api(self):
     def test_list_topics_no_paging(self):
         from google.cloud.pubsub.topic import Topic
 
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(project=self.PROJECT, credentials=creds)
         client._connection = object()
         api = _FauxPublisherAPI(items=[Topic(self.TOPIC_NAME, client)])
@@ -191,7 +191,7 @@ def test_list_topics_with_paging(self):
         TOKEN1 = 'TOKEN1'
         TOKEN2 = 'TOKEN2'
         SIZE = 1
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(project=self.PROJECT, credentials=creds)
         client._connection = object()
         api = _FauxPublisherAPI([Topic(self.TOPIC_NAME, client)], TOKEN2)
@@ -209,7 +209,7 @@ def test_list_topics_with_paging(self):
         self.assertEqual(api._listed_topics, (self.PROJECT, 1, TOKEN1))
 
     def test_list_topics_missing_key(self):
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(project=self.PROJECT, credentials=creds)
         client._connection = object()
         api = _FauxPublisherAPI()
@@ -229,7 +229,7 @@ def test_list_subscriptions_no_paging(self):
         from google.cloud.pubsub.topic import Topic
 
         SUB_INFO = {'name': self.SUB_PATH, 'topic': self.TOPIC_PATH}
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(project=self.PROJECT, credentials=creds,
                                 use_gax=False)
         returned = {'subscriptions': [SUB_INFO]}
@@ -267,7 +267,7 @@ def test_list_subscriptions_with_paging(self):
         from google.cloud.pubsub.topic import Topic
 
         SUB_INFO = {'name': self.SUB_PATH, 'topic': self.TOPIC_PATH}
-        creds = _Credentials()
+        creds = object()
         client = self._make_one(project=self.PROJECT, credentials=creds,
                                 use_gax=False)
 
@@ -320,7 +320,7 @@ def test_list_subscriptions_with_paging(self):
 
     def test_list_subscriptions_w_missing_key(self):
         PROJECT = 'PROJECT'
-        creds = _Credentials()
+        creds = object()
 
         client = self._make_one(project=PROJECT, credentials=creds)
         client._connection = object()
@@ -338,7 +338,7 @@ def test_list_subscriptions_w_missing_key(self):
     def test_topic(self):
         PROJECT = 'PROJECT'
         TOPIC_NAME = 'TOPIC_NAME'
-        creds = _Credentials()
+        creds = object()
 
         client_obj = self._make_one(project=PROJECT, credentials=creds)
         new_topic = client_obj.topic(TOPIC_NAME)
@@ -350,19 +350,6 @@ def test_topic(self):
         self.assertFalse(new_topic.timestamp_messages)
 
 
-class _Credentials(object):
-
-    _scopes = None
-
-    @staticmethod
-    def create_scoped_required():
-        return True
-
-    def create_scoped(self, scope):
-        self._scopes = scope
-        return self
-
-
 class _Iterator(object):
 
     def __init__(self, items, token):
