jclouds git commit: JCLOUDS-1043: Support IAM service accounts in Google Cloud

[na...@apache.org]

Repository: jclouds
Updated Branches:
  refs/heads/master 86848e3dd -> ab3a6f003


JCLOUDS-1043: Support IAM service accounts in Google Cloud


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ab3a6f00
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ab3a6f00
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ab3a6f00

Branch: refs/heads/master
Commit: ab3a6f003bc660b87958a63cd4f0138c5248bf3b
Parents: 86848e3
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Apr 26 18:32:23 2016 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Apr 28 10:15:33 2016 +0200

----------------------------------------------------------------------
 .../googlecloud/config/CurrentProject.java      | 13 ++++--
 .../googlecloud/config/ClientEmailTest.java     | 45 ++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/ab3a6f00/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java
----------------------------------------------------------------------
diff --git a/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java b/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java
index d60b2d0..eb4ecb1 100644
--- a/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java
+++ b/common/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java
@@ -37,14 +37,21 @@ public @interface CurrentProject {
    public static final class ClientEmail {
       public static final String DESCRIPTION = "" //
             + "client_email which usually looks like project_id@developer.gserviceaccount.com or " //
-            + "project_id-extended_uid@developer.gserviceaccount.com";
+            + "project_id-extended_uid@developer.gserviceaccount.com or " //
+            + "account@project_id.iam.gserviceaccount.com";
       private static final Pattern PROJECT_NUMBER_PATTERN = Pattern.compile("^([0-9]+)[@-].*");
+      private static final String IAM_ACCOUNT_SUFFIX = ".iam.gserviceaccount.com";
 
       /** Parses the project number from the client email or throws an {@linkplain IllegalArgumentException}. */
       public static String toProjectNumber(String email) {
          Matcher matcher = PROJECT_NUMBER_PATTERN.matcher(email);
-         checkArgument(matcher.find(), "Client email %s is malformed. Should be %s", email, DESCRIPTION);
-         return matcher.group(1);
+         boolean isIAM = email.endsWith(IAM_ACCOUNT_SUFFIX);
+         checkArgument(isIAM || matcher.find(), "Client email %s is malformed. Should be %s", email, DESCRIPTION);
+         return isIAM ? projectIdFromIAM(email) : matcher.group(1);
+      }
+
+      private static String projectIdFromIAM(String email) {
+         return email.substring(email.indexOf('@') + 1, email.indexOf(IAM_ACCOUNT_SUFFIX));
       }
    }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/ab3a6f00/common/googlecloud/src/test/java/org/jclouds/googlecloud/config/ClientEmailTest.java
----------------------------------------------------------------------
diff --git a/common/googlecloud/src/test/java/org/jclouds/googlecloud/config/ClientEmailTest.java b/common/googlecloud/src/test/java/org/jclouds/googlecloud/config/ClientEmailTest.java
new file mode 100644
index 0000000..d47b199
--- /dev/null
+++ b/common/googlecloud/src/test/java/org/jclouds/googlecloud/config/ClientEmailTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.googlecloud.config;
+
+import static org.jclouds.googlecloud.config.CurrentProject.ClientEmail.toProjectNumber;
+import static org.testng.Assert.assertEquals;
+
+import org.jclouds.googlecloud.config.CurrentProject.ClientEmail;
+import org.testng.annotations.Test;
+
+@Test(groups = "unit", testName = "ClientEmailTest")
+public class ClientEmailTest {
+
+   @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Client email foo is malformed. Should be "
+         + ClientEmail.DESCRIPTION)
+   public void testMalformedClientEmail() {
+      toProjectNumber("foo");
+   }
+
+   public void testParseClientId() {
+      assertEquals(toProjectNumber("1234567890@developer.gserviceaccount.com"), "1234567890");
+   }
+
+   public void testParseClientIdWithExtendedUid() {
+      assertEquals(toProjectNumber("1234567890-project_foo@developer.gserviceaccount.com"), "1234567890");
+   }
+
+   public void testParseProjectIdFromIAMAccount() {
+      assertEquals(toProjectNumber("account@project_id.iam.gserviceaccount.com"), "project_id");
+   }
+}