JCLOUDS-1043: Support IAM service accounts in Google Cloud

This commit is contained in:
Ignasi Barrera 2016-04-26 18:32:23 +02:00
parent 86848e3ddd
commit ab3a6f003b
2 changed files with 55 additions and 3 deletions

View File

@ -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));
}
}
}

View File

@ -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");
}
}