Merge pull request #146 from wizeline/master

Remove OAuth cache discovery from google client library. (#1)

Author: tylertreat

bigquery/client.py

@@ -175,8 +175,13 @@ def _get_bq_service(credentials=None, service_url=None):
     assert credentials, 'Must provide ServiceAccountCredentials'
 
     http = credentials.authorize(Http())
-    service = build('bigquery', 'v2', http=http,
-                    discoveryServiceUrl=service_url)
+    service = build(
+        'bigquery',
+        'v2',
+        http=http,
+        discoveryServiceUrl=service_url,
+        cache_discovery=False
+    )
 
     return service
 

bigquery/tests/test_client.py

@@ -67,8 +67,13 @@ def test_initialize_readonly(self, mock_build, mock_return_cred):
             scopes=BIGQUERY_SCOPE_READ_ONLY)
         self.assertTrue(
             mock_cred.from_p12_keyfile_buffer.return_value.authorize.called)
-        mock_build.assert_called_once_with('bigquery', 'v2', http=mock_http,
-                                           discoveryServiceUrl=mock_service_url)
+        mock_build.assert_called_once_with(
+            'bigquery',
+            'v2',
+            http=mock_http,
+            discoveryServiceUrl=mock_service_url,
+            cache_discovery=False
+        )
         self.assertEquals(mock_bq, bq_client.bigquery)
         self.assertEquals(project_id, bq_client.project_id)
 
@@ -101,8 +106,13 @@ def test_initialize_read_write(self, mock_build, mock_return_cred):
             service_account, mock.ANY, scopes=BIGQUERY_SCOPE)
         self.assertTrue(
             mock_cred.from_p12_keyfile_buffer.return_value.authorize.called)
-        mock_build.assert_called_once_with('bigquery', 'v2', http=mock_http,
-                                           discoveryServiceUrl=mock_service_url)
+        mock_build.assert_called_once_with(
+            'bigquery',
+            'v2',
+            http=mock_http,
+            discoveryServiceUrl=mock_service_url,
+            cache_discovery=False
+        )
         self.assertEquals(mock_bq, bq_client.bigquery)
         self.assertEquals(project_id, bq_client.project_id)
 
@@ -136,8 +146,13 @@ def test_initialize_key_file(self, mock_build, mock_return_cred):
                                                            scopes=BIGQUERY_SCOPE)
         self.assertTrue(
             mock_cred.from_p12_keyfile.return_value.authorize.called)
-        mock_build.assert_called_once_with('bigquery', 'v2', http=mock_http,
-                                           discoveryServiceUrl=mock_service_url)
+        mock_build.assert_called_once_with(
+            'bigquery',
+            'v2',
+            http=mock_http,
+            discoveryServiceUrl=mock_service_url,
+            cache_discovery=False
+        )
         self.assertEquals(mock_bq, bq_client.bigquery)
         self.assertEquals(project_id, bq_client.project_id)
 
@@ -172,8 +187,13 @@ def test_initialize_json_key_file(self, mock_open, mock_build, mock_return_cred)
                                                                  scopes=BIGQUERY_SCOPE)
         self.assertTrue(
             mock_cred.from_json_keyfile_dict.return_value.authorize.called)
-        mock_build.assert_called_once_with('bigquery', 'v2', http=mock_http,
-                                           discoveryServiceUrl=mock_service_url)
+        mock_build.assert_called_once_with(
+            'bigquery',
+            'v2',
+            http=mock_http,
+            discoveryServiceUrl=mock_service_url,
+            cache_discovery=False
+        )
         self.assertEquals(mock_bq, bq_client.bigquery)
         self.assertEquals(project_id, bq_client.project_id)
 
@@ -208,8 +228,13 @@ def test_initialize_json_key_file_without_project_id(self, mock_open, mock_build
                                                                  scopes=BIGQUERY_SCOPE)
         self.assertTrue(
             mock_cred.from_json_keyfile_dict.return_value.authorize.called)
-        mock_build.assert_called_once_with('bigquery', 'v2', http=mock_http,
-                                           discoveryServiceUrl=mock_service_url)
+        mock_build.assert_called_once_with(
+            'bigquery',
+            'v2',
+            http=mock_http,
+            discoveryServiceUrl=mock_service_url,
+            cache_discovery=False
+        )
         self.assertEquals(mock_bq, bq_client.bigquery)
         self.assertEquals(json_key['project_id'], bq_client.project_id)