Using json_credentials_path in get_for_service_account_json.

Was private_key_path.
googleapis · Feb 15, 2015 · a80f1dd · a80f1dd
1 parent 66b47b5
commit a80f1dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/gcloud/credentials.py b/gcloud/credentials.py
@@ -73,13 +73,16 @@ def get_credentials():
     return client.GoogleCredentials.get_application_default()
 
 
-def get_for_service_account_json(private_key_path, scope=None):
+def get_for_service_account_json(json_credentials_path, scope=None):
     """Gets the credentials for a service account with JSON key.
 
-    :type private_key_path: string
-    :param private_key_path: The path to a private key file (this file was
-                             given to you when you created the service
-                             account). This file must be in JSON key format.
+    :type json_credentials_path: string
+    :param json_credentials_path: The path to a private key file (this file was
+                                  given to you when you created the service
+                                  account). This file must contain a JSON
+                                  object with a private key and other
+                                  credentials information (downloaded from the
+                                  Google APIs console).
 
     :type scope: string or tuple of string
     :param scope: The scope against which to authenticate. (Different services
@@ -93,7 +96,7 @@ def get_for_service_account_json(private_key_path, scope=None):
               credentials object.
     """
     credentials = _get_application_default_credential_from_file(
-        private_key_path)
+        json_credentials_path)
     if scope is not None:
         credentials = credentials.create_scoped(scope)
     return credentials

diff --git a/gcloud/test_credentials.py b/gcloud/test_credentials.py
@@ -63,9 +63,9 @@ def test_get_for_service_account_p12_w_scope(self):
 
 class Test_get_for_service_account_json(unittest2.TestCase):
 
-    def _callFUT(self, private_key_path, scope=None):
+    def _callFUT(self, json_credentials_path, scope=None):
         from gcloud.credentials import get_for_service_account_json
-        return get_for_service_account_json(private_key_path, scope=scope)
+        return get_for_service_account_json(json_credentials_path, scope=scope)
 
     def test_it(self):
         from gcloud._testing import _Monkey