Repository: jclouds-labs-google Updated Branches: refs/heads/1.9.x 3b556ee48 -> 3053cb5ae
JCLOUDS-1043: Support IAM service accounts in Google Cloud Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/3053cb5a Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/3053cb5a Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/3053cb5a Branch: refs/heads/1.9.x Commit: 3053cb5ae2df54150c44bb4476370c7f34495b5e Parents: 3b556ee Author: Ignasi Barrera <[email protected]> Authored: Thu Apr 28 15:12:41 2016 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu Apr 28 15:12:41 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-labs-google/blob/3053cb5a/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java ---------------------------------------------------------------------- diff --git a/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java b/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java index d60b2d0..eb4ecb1 100644 --- a/googlecloud/src/main/java/org/jclouds/googlecloud/config/CurrentProject.java +++ b/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 [email protected] or " // - + "[email protected]"; + + "[email protected] 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-labs-google/blob/3053cb5a/googlecloud/src/test/java/org/jclouds/googlecloud/config/ClientEmailTest.java ---------------------------------------------------------------------- diff --git a/googlecloud/src/test/java/org/jclouds/googlecloud/config/ClientEmailTest.java b/googlecloud/src/test/java/org/jclouds/googlecloud/config/ClientEmailTest.java new file mode 100644 index 0000000..d47b199 --- /dev/null +++ b/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("[email protected]"), "1234567890"); + } + + public void testParseClientIdWithExtendedUid() { + assertEquals(toProjectNumber("[email protected]"), "1234567890"); + } + + public void testParseProjectIdFromIAMAccount() { + assertEquals(toProjectNumber("account@project_id.iam.gserviceaccount.com"), "project_id"); + } +}
