Remove usage of GoogleCredentials (#810)

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

bigquery/api/list_datasets_projects.py

@@ -25,8 +25,7 @@
 import argparse
 from pprint import pprint
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 from six.moves.urllib.error import HTTPError
 
 
@@ -60,9 +59,8 @@ def list_projects(bigquery):
 
 
 def main(project_id):
-    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')
 
     list_datasets(bigquery, project_id)
     list_projects(bigquery)

bigquery/api/load_data_by_post.py

@@ -26,9 +26,8 @@
 import json
 import time
 
-from googleapiclient import discovery
-from googleapiclient.http import MediaFileUpload
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
+import googleapiclient.http
 
 
 # [START make_post]
@@ -44,9 +43,8 @@ def load_data(schema_path, data_path, project_id, dataset_id, table_id):
         dataset_id: The dataset id of the destination table.
         table_id: The table id to load data into.
     """
-    # Create a bigquery service object, using the application's default auth
-    credentials = GoogleCredentials.get_application_default()
-    bigquery = discovery.build('bigquery', 'v2', credentials=credentials)
+    # Create a bigquery service object.
+    bigquery = googleapiclient.discovery.build('bigquery', 'v2')
 
     # Infer the data format from the name of the data file.
     source_format = 'CSV'
@@ -74,7 +72,7 @@ def load_data(schema_path, data_path, project_id, dataset_id, table_id):
                 }
             }
         },
-        media_body=MediaFileUpload(
+        media_body=googleapiclient.http.MediaFileUpload(
             data_path,
             mimetype='application/octet-stream'))
     job = insert_request.execute()

bigquery/api/load_data_from_csv.py

@@ -28,8 +28,7 @@
 import time
 import uuid
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 
 # [START load_table]
@@ -105,11 +104,8 @@ def poll_job(bigquery, job):
 def main(project_id, dataset_id, table_name, schema_file, data_path,
          poll_interval, num_retries):
     # [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]
 
     with open(schema_file, 'r') as f:

bigquery/api/streaming.py

@@ -27,8 +27,7 @@
 import json
 import uuid
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 from six.moves import input
 
 
@@ -54,11 +53,8 @@ def stream_row_to_bigquery(bigquery, project_id, dataset_id, table_name, row,
 # [START run]
 def main(project_id, dataset_id, table_name, num_retries):
     # [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]
 
     for row in get_rows():

bigquery/api/sync_query.py

@@ -21,8 +21,7 @@
 import argparse
 import json
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 
 # [START sync_query]
@@ -45,11 +44,8 @@ def sync_query(
 # [START run]
 def main(project_id, query, timeout, num_retries, 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]
 
     query_job = sync_query(

compute/api/create_instance.py

@@ -28,8 +28,7 @@
 import os
 import time
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 from six.moves import input
 
 
@@ -146,8 +145,7 @@ def wait_for_operation(compute, project, zone, operation):
 
 # [START run]
 def main(project, bucket, zone, instance_name, wait=True):
-    credentials = GoogleCredentials.get_application_default()
-    compute = discovery.build('compute', 'v1', credentials=credentials)
+    compute = googleapiclient.discovery.build('compute', 'v1')
 
     print('Creating instance.')
 

compute/auth/application_default.py

@@ -24,19 +24,17 @@
 
 import argparse
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 
 def create_service():
-    # Get the application default credentials. When running locally, these are
-    # available after running `gcloud auth`. When running on compute
-    # engine, these are available from the environment.
-    credentials = GoogleCredentials.get_application_default()
-
     # Construct the service object for interacting with the Cloud Storage API -
     # the 'storage' service, at version 'v1'.
-    return discovery.build('storage', 'v1', credentials=credentials)
+    # Authentication is provided by application default credentials.
+    # When running locally, these are available after running
+    # `gcloud auth application-default login`. When running on Compute
+    # Engine, these are available from the environment.
+    return googleapiclient.discovery.build('storage', 'v1')
 
 
 def list_buckets(service, project_id):

compute/encryption/generate_wrapped_rsa_key_test.py

@@ -13,8 +13,7 @@
 
 import os
 
-from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 import generate_wrapped_rsa_key
 
@@ -24,8 +23,7 @@ def test_main():
 
 
 def test_create_disk(cloud_config):
-    credentials = GoogleCredentials.get_application_default()
-    compute = discovery.build('compute', 'beta', credentials=credentials)
+    compute = googleapiclient.discovery.build('compute', 'beta')
 
     # Generate the key.
     key_bytes = os.urandom(32)

dataproc/create_cluster_and_submit_job.py

@@ -16,9 +16,8 @@
 import argparse
 import os
 
-from apiclient import discovery
 from google.cloud import storage
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 # Currently only the "global" region is supported
 REGION = 'global'
@@ -177,8 +176,7 @@ def wait_for_job(dataproc, project, job_id):
 def get_client():
     """Builds an http client authenticated with the service account
     credentials."""
-    credentials = GoogleCredentials.get_application_default()
-    dataproc = discovery.build('dataproc', 'v1', credentials=credentials)
+    dataproc = googleapiclient.discovery.build('dataproc', 'v1')
     return dataproc
 # [END get_client]
 

dataproc/list_clusters.py

@@ -16,8 +16,7 @@
 
 import argparse
 
-from apiclient import discovery
-from oauth2client.client import GoogleCredentials
+import googleapiclient.discovery
 
 # Currently only the "global" region is supported
 REGION = 'global'
@@ -34,10 +33,8 @@ def list_clusters(dataproc, project):
 
 # [START get_client]
 def get_client():
-    """Builds an http client authenticated with the service account
-    credentials."""
-    credentials = GoogleCredentials.get_application_default()
-    dataproc = discovery.build('dataproc', 'v1', credentials=credentials)
+    """Builds a client to the dataproc API."""
+    dataproc = googleapiclient.discovery.build('dataproc', 'v1')
     return dataproc
 # [END get_client]