Repository: libcloud Updated Branches: refs/heads/trunk 59fec8e7a -> 88170f658
[google] Allow for old and new style service account client email address Closes LIBCLOUD-785 Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/88170f65 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/88170f65 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/88170f65 Branch: refs/heads/trunk Commit: 88170f6582dd6cc3bce87c0ab3a89118551fe508 Parents: 59fec8e Author: Eric Johnson <erjoh...@google.com> Authored: Fri Dec 18 23:57:47 2015 +0000 Committer: Eric Johnson <erjoh...@google.com> Committed: Fri Dec 18 23:57:47 2015 +0000 ---------------------------------------------------------------------- CHANGES.rst | 4 ++++ libcloud/common/google.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/88170f65/CHANGES.rst ---------------------------------------------------------------------- diff --git a/CHANGES.rst b/CHANGES.rst index b175664..874aebb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -30,6 +30,10 @@ General Compute ~~~~~~~ +- [google] Allow for old and new style service account client email address + (LIBCLOUD-785) + [Hoang Phan] + - Minor security improvement for storing cached GCE credentials (LIBCLOUD-718) [Siim Põder] http://git-wip-us.apache.org/repos/asf/libcloud/blob/88170f65/libcloud/common/google.py ---------------------------------------------------------------------- diff --git a/libcloud/common/google.py b/libcloud/common/google.py index 491d5af..bfc8f9b 100644 --- a/libcloud/common/google.py +++ b/libcloud/common/google.py @@ -607,7 +607,7 @@ class GoogleAuthType(object): @staticmethod def _is_sa(user_id): - return user_id.endswith('@developer.gserviceaccount.com') + return user_id.endswith('.gserviceaccount.com') class GoogleBaseConnection(ConnectionUserAndKey, PollingConnection):
