Remove usage of GoogleCredentials (GoogleCloudPlatform#810)

Author: Jon Wayne Parrott

appengine/flexible/datastore/requirements.txt

@@ -1,4 +1,3 @@
 Flask==0.12
 google-cloud-datastore==0.22.1
 gunicorn==19.6.0
-oauth2client==4.0.0

appengine/flexible/endpoints/clients/service_to_service_non_default/main.py

@@ -20,7 +20,7 @@
 import json
 import time
 
-from googleapiclient.discovery import build
+import googleapiclient.discovery
 import httplib2
 from oauth2client.contrib.appengine import AppAssertionCredentials
 import webapp2
@@ -36,7 +36,8 @@ def generate_jwt():
     credentials = AppAssertionCredentials(
         'https://www.googleapis.com/auth/iam')
     http_auth = credentials.authorize(httplib2.Http())
-    service = build(serviceName='iam', version='v1', http=http_auth)
+    service = googleapiclient.discovery.build(
+        serviceName='iam', version='v1', http=http_auth)
 
     now = int(time.time())
 

appengine/flexible/kinto/requirements.txt

@@ -1,3 +1,2 @@
 gunicorn==19.6.0
-oauth2client==4.0.0
 kinto==5.3.5

appengine/flexible/pubsub/requirements.txt

@@ -1,4 +1,3 @@
 Flask==0.12
 google-cloud-pubsub==0.22.0
 gunicorn==19.6.0
-oauth2client==4.0.0

appengine/standard/bigquery/main.py

@@ -24,7 +24,7 @@
 import json
 import os
 
-from googleapiclient.discovery import build
+import googleapiclient.discovery
 from oauth2client.contrib.appengine import OAuth2DecoratorFromClientSecrets
 import webapp2
 
@@ -38,7 +38,7 @@
     scope='https://www.googleapis.com/auth/bigquery')
 
 # Create the bigquery api client
-service = build('bigquery', 'v2')
+service = googleapiclient.discovery.build('bigquery', 'v2')
 
 
 class MainPage(webapp2.RequestHandler):

appengine/standard/storage/api-client/main.py

@@ -25,17 +25,15 @@
 import json
 import StringIO
 
-from googleapiclient import discovery
-from googleapiclient import http
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
+import googleapiclient.http
 import webapp2
 
 
 # The bucket that will be used to list objects.
 BUCKET_NAME = '<your-bucket-name>'
 
-credentials = GoogleCredentials.get_application_default()
-storage = discovery.build('storage', 'v1', credentials=credentials)
+storage = googleapiclient.discovery.build('storage', 'v1')
 
 
 class MainPage(webapp2.RequestHandler):
@@ -44,7 +42,8 @@ def upload_object(self, bucket, file_object):
             'name': 'storage-api-client-sample-file.txt',
         }
         req = storage.objects().insert(
-            bucket=bucket, body=body, media_body=http.MediaIoBaseUpload(
+            bucket=bucket, body=body,
+            media_body=googleapiclient.http.MediaIoBaseUpload(
                 file_object, 'application/octet-stream'))
         resp = req.execute()
         return resp

bigquery/api/async_query.py

@@ -23,8 +23,7 @@
 import time
 import uuid
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 
 # [START async_query]
@@ -82,11 +81,8 @@ def main(
         project_id, query_string, batch, num_retries, interval,
         use_legacy_sql):
     # [START build_service]
-    # Grab the application's default credentials from the environment.
-    credentials = GoogleCredentials.get_application_default()
-
     # Construct the service object for interacting with the BigQuery API.
-    bigquery = discovery.build('bigquery', 'v2', credentials=credentials)
+    bigquery = googleapiclient.discovery.build('bigquery', 'v2')
     # [END build_service]
 
     # Submit the job and wait for it to complete.

bigquery/api/export_data_to_cloud_storage.py

@@ -27,8 +27,7 @@
 import time
 import uuid
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 
 # [START export_table]
@@ -107,11 +106,8 @@ def poll_job(bigquery, job):
 def main(cloud_storage_path, project_id, dataset_id, table_id,
          num_retries, interval, export_format="CSV", compression="NONE"):
     # [START build_service]
-    # Grab the application's default credentials from the environment.
-    credentials = GoogleCredentials.get_application_default()
-
     # Construct the service object for interacting with the BigQuery API.
-    bigquery = discovery.build('bigquery', 'v2', credentials=credentials)
+    bigquery = googleapiclient.discovery.build('bigquery', 'v2')
     # [END build_service]
 
     job = export_table(

bigquery/api/getting_started.py

@@ -27,17 +27,14 @@
 # [START all]
 import argparse
 
-from googleapiclient.discovery import build
+import googleapiclient.discovery
 from googleapiclient.errors import HttpError
-from oauth2client.client import GoogleCredentials
 
 
 def main(project_id):
     # [START build_service]
-    # Grab the application's default credentials from the environment.
-    credentials = GoogleCredentials.get_application_default()
     # Construct the service object for interacting with the BigQuery API.
-    bigquery_service = build('bigquery', 'v2', credentials=credentials)
+    bigquery_service = googleapiclient.discovery.build('bigquery', 'v2')
     # [END build_service]
 
     try:

bigquery/api/installed_app.py

@@ -27,7 +27,7 @@
 import argparse
 import pprint
 
-from googleapiclient import discovery
+import googleapiclient.discovery
 from googleapiclient.errors import HttpError
 from oauth2client import tools
 from oauth2client.client import AccessTokenRefreshError
@@ -51,7 +51,7 @@ def main(args):
         credentials = tools.run_flow(flow, storage, args)
 
     # Create a BigQuery client using the credentials.
-    bigquery_service = discovery.build(
+    bigquery_service = googleapiclient.discovery.build(
         'bigquery', 'v2', credentials=credentials)
 
     # List all datasets in BigQuery