> bindings = new HashMap<>();
for (com.google.api.services.cloudresourcemanager.model.Binding bindingPb :
policyPb.getBindings()) {
bindings.put(
- Role.fromStr(bindingPb.getRole()),
+ bindingPb.getRole(),
ImmutableSet.copyOf(
Lists.transform(
bindingPb.getMembers(),
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index 4d12a31274c0..bf9cf0e01a6d 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.ObjectInputStream;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -157,10 +158,10 @@ public Project reload() {
* completes, the project is not retrievable by the {@link ResourceManager#get} and
* {@link ResourceManager#list} methods. The caller must have modify permissions for this project.
*
- * @see Cloud
- * Resource Manager delete
* @throws ResourceManagerException upon failure
+ * @see Cloud
+ * Resource Manager delete
*/
public void delete() {
resourceManager.delete(projectId());
@@ -174,10 +175,10 @@ public void delete() {
* state of {@link ProjectInfo.State#DELETE_IN_PROGRESS}, the project cannot be restored. The
* caller must have modify permissions for this project.
*
- * @see Cloud
- * Resource Manager undelete
* @throws ResourceManagerException upon failure (including when the project can't be restored)
+ * @see Cloud
+ * Resource Manager undelete
*/
public void undelete() {
resourceManager.undelete(projectId());
@@ -188,16 +189,68 @@ public void undelete() {
*
* The caller must have modify permissions for this project.
*
- * @see Cloud
- * Resource Manager update
* @return the Project representing the new project metadata
* @throws ResourceManagerException upon failure
+ * @see Cloud
+ * Resource Manager update
*/
public Project replace() {
return resourceManager.replace(this);
}
+ /**
+ * Returns the IAM access control policy for this project. Returns {@code null} if the resource
+ * does not exist or if you do not have adequate permission to view the project or get the policy.
+ *
+ * @return the IAM policy for the project
+ * @throws ResourceManagerException upon failure
+ * @see
+ * Resource Manager getIamPolicy
+ */
+ public Policy getPolicy() {
+ return resourceManager.getPolicy(projectId());
+ }
+
+ /**
+ * Sets the IAM access control policy for this project. Replaces any existing policy. It is
+ * recommended that you use the read-modify-write pattern. See code samples and important details
+ * of replacing policies in the documentation for {@link ResourceManager#replacePolicy}.
+ *
+ * @return the newly set IAM policy for this project
+ * @throws ResourceManagerException upon failure
+ * @see
+ * Resource Manager setIamPolicy
+ */
+ public Policy replacePolicy(Policy newPolicy) {
+ return resourceManager.replacePolicy(projectId(), newPolicy);
+ }
+
+ /**
+ * Returns the permissions that a caller has on this project. You typically don't call this method
+ * if you're using Google Cloud Platform directly to manage permissions. This method is intended
+ * for integration with your proprietary software, such as a customized graphical user interface.
+ * For example, the Cloud Platform Console tests IAM permissions internally to determine which UI
+ * should be available to the logged-in user. Each service that supports IAM lists the possible
+ * permissions; see the Supported Cloud Platform services page below for links to these
+ * lists.
+ *
+ * @return a list of booleans representing whether the caller has the permissions specified (in
+ * the order of the given permissions)
+ * @throws ResourceManagerException upon failure
+ * @see
+ * Resource Manager testIamPermissions
+ * @see Supported Cloud Platform
+ * Services
+ */
+ List testPermissions(List permissions) {
+ return resourceManager.testPermissions(projectId(), permissions);
+ }
+
@Override
public Builder toBuilder() {
return new Builder(this);
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
index 3d27f2a33ac8..70eeb9c8eb50 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManager.java
@@ -18,10 +18,12 @@
import com.google.common.base.Joiner;
import com.google.common.collect.Sets;
+import com.google.gcloud.IamPolicy;
import com.google.gcloud.Page;
import com.google.gcloud.Service;
-import com.google.gcloud.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
+import java.util.List;
import java.util.Set;
/**
@@ -168,19 +170,19 @@ public static ProjectListOption fields(ProjectField... fields) {
}
/**
- * Create a new project.
+ * Creates a new project.
*
* Initially, the project resource is owned by its creator exclusively. The creator can later
* grant permission to others to read or update the project. Several APIs are activated
* automatically for the project, including Google Cloud Storage.
*
- * @see Cloud
- * Resource Manager create
* @return Project object representing the new project's metadata. The returned object will
* include the following read-only fields supplied by the server: project number, lifecycle
* state, and creation time.
* @throws ResourceManagerException upon failure
+ * @see Cloud
+ * Resource Manager create
*/
Project create(ProjectInfo project);
@@ -201,10 +203,10 @@ public static ProjectListOption fields(ProjectField... fields) {
* completes, the project is not retrievable by the {@link ResourceManager#get} and
* {@link ResourceManager#list} methods. The caller must have modify permissions for this project.
*
- * @see Cloud
- * Resource Manager delete
* @throws ResourceManagerException upon failure
+ * @see Cloud
+ * Resource Manager delete
*/
void delete(String projectId);
@@ -214,10 +216,9 @@ public static ProjectListOption fields(ProjectField... fields) {
*
Returns {@code null} if the project is not found or if the user doesn't have read
* permissions for the project.
*
- * @see Cloud
- * Resource Manager get
* @throws ResourceManagerException upon failure
+ * @see
+ * Cloud Resource Manager get
*/
Project get(String projectId, ProjectGetOption... options);
@@ -228,11 +229,11 @@ public static ProjectListOption fields(ProjectField... fields) {
* at the end of the list. Use {@link ProjectListOption} to filter this list, set page size, and
* set page tokens.
*
- * @see Cloud
- * Resource Manager list
* @return {@code Page}, a page of projects
* @throws ResourceManagerException upon failure
+ * @see Cloud
+ * Resource Manager list
*/
Page list(ProjectListOption... options);
@@ -241,11 +242,11 @@ public static ProjectListOption fields(ProjectField... fields) {
*
* The caller must have modify permissions for this project.
*
- * @see Cloud
- * Resource Manager update
* @return the Project representing the new project metadata
* @throws ResourceManagerException upon failure
+ * @see Cloud
+ * Resource Manager update
*/
Project replace(ProjectInfo newProject);
@@ -257,10 +258,87 @@ public static ProjectListOption fields(ProjectField... fields) {
* state of {@link ProjectInfo.State#DELETE_IN_PROGRESS}, the project cannot be restored. The
* caller must have modify permissions for this project.
*
- * @see Cloud
- * Resource Manager undelete
* @throws ResourceManagerException upon failure
+ * @see Cloud
+ * Resource Manager undelete
*/
void undelete(String projectId);
+
+ /**
+ * Returns the IAM access control policy for the specified project. Returns {@code null} if the
+ * resource does not exist or if you do not have adequate permission to view the project or get
+ * the policy.
+ *
+ * @throws ResourceManagerException upon failure
+ * @see
+ * Resource Manager getIamPolicy
+ */
+ Policy getPolicy(String projectId);
+
+ /**
+ * Sets the IAM access control policy for the specified project. Replaces any existing policy. The
+ * following constraints apply:
+ *
+ * - Projects currently support only user:{emailid} and serviceAccount:{emailid}
+ * members in a binding of a policy.
+ *
- To be added as an owner, a user must be invited via Cloud Platform console and must accept
+ * the invitation.
+ *
- Members cannot be added to more than one role in the same policy.
+ *
- There must be at least one owner who has accepted the Terms of Service (ToS) agreement in
+ * the policy. An attempt to set a policy that removes the last ToS-accepted owner from the
+ * policy will fail.
+ *
- Calling this method requires enabling the App Engine Admin API.
+ *
+ * Note: Removing service accounts from policies or changing their roles can render services
+ * completely inoperable. It is important to understand how the service account is being used
+ * before removing or updating its roles.
+ *
+ * It is recommended that you use the read-modify-write pattern. This pattern entails reading
+ * the project's current policy, updating it locally, and then sending the modified policy for
+ * writing. Cloud IAM solves the problem of conflicting processes simultaneously attempting to
+ * modify a policy by using the {@link IamPolicy#etag etag} property. This property is used to
+ * verify whether the policy has changed since the last request. When you make a request to Cloud
+ * IAM with an etag value, Cloud IAM compares the etag value in the request with the existing etag
+ * value associated with the policy. It writes the policy only if the etag values match. If the
+ * etags don't match, a {@code ResourceManagerException} is thrown, denoting that the server
+ * aborted update. If an etag is not provided, the policy is overwritten blindly.
+ *
+ *
An example of using the read-write-modify pattern is as follows:
+ *
{@code
+ * Policy currentPolicy = resourceManager.getPolicy("my-project-id");
+ * Policy modifiedPolicy =
+ * current.toBuilder().removeIdentity(Role.VIEWER, Identity.user("user@gmail.com"));
+ * Policy newPolicy = resourceManager.replacePolicy("my-project-id", modified);
+ * }
+ *
+ *
+ * @throws ResourceManagerException upon failure
+ * @see
+ * Resource Manager setIamPolicy
+ */
+ Policy replacePolicy(String projectId, Policy newPolicy);
+
+ /**
+ * Returns the permissions that a caller has on the specified project. You typically don't call
+ * this method if you're using Google Cloud Platform directly to manage permissions. This method
+ * is intended for integration with your proprietary software, such as a customized graphical user
+ * interface. For example, the Cloud Platform Console tests IAM permissions internally to
+ * determine which UI should be available to the logged-in user. Each service that supports IAM
+ * lists the possible permissions; see the Supported Cloud Platform services page below for
+ * links to these lists.
+ *
+ * @return A list of booleans representing whether the caller has the permissions specified (in
+ * the order of the given permissions)
+ * @throws ResourceManagerException upon failure
+ * @see
+ * Resource Manager testIamPermissions
+ * @see Supported Cloud Platform
+ * Services
+ */
+ List testPermissions(String projectId, List permissions);
}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
index 4176b4e610ba..e4663cb74cb9 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerImpl.java
@@ -29,9 +29,10 @@
import com.google.gcloud.PageImpl;
import com.google.gcloud.PageImpl.NextPageFetcher;
import com.google.gcloud.RetryHelper.RetryHelperException;
-import com.google.gcloud.spi.ResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpc.Tuple;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Tuple;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -55,8 +56,8 @@ public com.google.api.services.cloudresourcemanager.model.Project call() {
return resourceManagerRpc.create(project.toPb());
}
}, options().retryParams(), EXCEPTION_HANDLER));
- } catch (RetryHelperException e) {
- throw ResourceManagerException.translateAndThrow(e);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
}
}
@@ -70,8 +71,8 @@ public Void call() {
return null;
}
}, options().retryParams(), EXCEPTION_HANDLER);
- } catch (RetryHelperException e) {
- throw ResourceManagerException.translateAndThrow(e);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
}
}
@@ -87,8 +88,8 @@ public com.google.api.services.cloudresourcemanager.model.Project call() {
}
}, options().retryParams(), EXCEPTION_HANDLER);
return answer == null ? null : Project.fromPb(this, answer);
- } catch (RetryHelperException e) {
- throw ResourceManagerException.translateAndThrow(e);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
}
}
@@ -146,8 +147,8 @@ public Project apply(
});
return new PageImpl<>(
new ProjectPageFetcher(serviceOptions, cursor, optionsMap), cursor, projects);
- } catch (RetryHelperException e) {
- throw ResourceManagerException.translateAndThrow(e);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
}
}
@@ -161,8 +162,8 @@ public com.google.api.services.cloudresourcemanager.model.Project call() {
return resourceManagerRpc.replace(newProject.toPb());
}
}, options().retryParams(), EXCEPTION_HANDLER));
- } catch (RetryHelperException e) {
- throw ResourceManagerException.translateAndThrow(e);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
}
}
@@ -176,8 +177,55 @@ public Void call() {
return null;
}
}, options().retryParams(), EXCEPTION_HANDLER);
- } catch (RetryHelperException e) {
- throw ResourceManagerException.translateAndThrow(e);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
+ }
+ }
+
+ @Override
+ public Policy getPolicy(final String projectId) {
+ try {
+ com.google.api.services.cloudresourcemanager.model.Policy answer =
+ runWithRetries(
+ new Callable() {
+ @Override
+ public com.google.api.services.cloudresourcemanager.model.Policy call() {
+ return resourceManagerRpc.getPolicy(projectId);
+ }
+ }, options().retryParams(), EXCEPTION_HANDLER);
+ return answer == null ? null : Policy.fromPb(answer);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
+ }
+ }
+
+ @Override
+ public Policy replacePolicy(final String projectId, final Policy newPolicy) {
+ try {
+ return Policy.fromPb(runWithRetries(
+ new Callable() {
+ @Override
+ public com.google.api.services.cloudresourcemanager.model.Policy call() {
+ return resourceManagerRpc.replacePolicy(projectId, newPolicy.toPb());
+ }
+ }, options().retryParams(), EXCEPTION_HANDLER));
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
+ }
+ }
+
+ @Override
+ public List testPermissions(final String projectId, final List permissions) {
+ try {
+ return runWithRetries(
+ new Callable>() {
+ @Override
+ public List call() {
+ return resourceManagerRpc.testPermissions(projectId, permissions);
+ }
+ }, options().retryParams(), EXCEPTION_HANDLER);
+ } catch (RetryHelperException ex) {
+ throw ResourceManagerException.translateAndThrow(ex);
}
}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
index 5c0c4baf1ecb..c744864147c2 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ResourceManagerOptions.java
@@ -18,9 +18,9 @@
import com.google.common.collect.ImmutableSet;
import com.google.gcloud.ServiceOptions;
-import com.google.gcloud.spi.DefaultResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpcFactory;
+import com.google.gcloud.resourcemanager.spi.DefaultResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpcFactory;
import java.util.Set;
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/DefaultResourceManagerRpc.java
similarity index 53%
rename from gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
rename to gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/DefaultResourceManagerRpc.java
index 61c622fa0c33..9f92ff545874 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/DefaultResourceManagerRpc.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/DefaultResourceManagerRpc.java
@@ -1,9 +1,10 @@
-package com.google.gcloud.spi;
+package com.google.gcloud.resourcemanager.spi;
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.FIELDS;
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.FILTER;
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_SIZE;
-import static com.google.gcloud.spi.ResourceManagerRpc.Option.PAGE_TOKEN;
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.FIELDS;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.FILTER;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_SIZE;
+import static com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Option.PAGE_TOKEN;
import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
@@ -11,13 +12,22 @@
import com.google.api.client.http.HttpTransport;
import com.google.api.client.json.jackson.JacksonFactory;
import com.google.api.services.cloudresourcemanager.Cloudresourcemanager;
+import com.google.api.services.cloudresourcemanager.model.GetIamPolicyRequest;
import com.google.api.services.cloudresourcemanager.model.ListProjectsResponse;
+import com.google.api.services.cloudresourcemanager.model.Policy;
import com.google.api.services.cloudresourcemanager.model.Project;
+import com.google.api.services.cloudresourcemanager.model.SetIamPolicyRequest;
+import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsRequest;
+import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsResponse;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
import com.google.gcloud.resourcemanager.ResourceManagerException;
import com.google.gcloud.resourcemanager.ResourceManagerOptions;
import java.io.IOException;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
public class DefaultResourceManagerRpc implements ResourceManagerRpc {
@@ -38,7 +48,7 @@ private static ResourceManagerException translate(IOException exception) {
}
@Override
- public Project create(Project project) throws ResourceManagerException {
+ public Project create(Project project) {
try {
return resourceManager.projects().create(project).execute();
} catch (IOException ex) {
@@ -47,7 +57,7 @@ public Project create(Project project) throws ResourceManagerException {
}
@Override
- public void delete(String projectId) throws ResourceManagerException {
+ public void delete(String projectId) {
try {
resourceManager.projects().delete(projectId).execute();
} catch (IOException ex) {
@@ -56,7 +66,7 @@ public void delete(String projectId) throws ResourceManagerException {
}
@Override
- public Project get(String projectId, Map options) throws ResourceManagerException {
+ public Project get(String projectId, Map options) {
try {
return resourceManager.projects()
.get(projectId)
@@ -74,8 +84,7 @@ public Project get(String projectId, Map options) throws ResourceMana
}
@Override
- public Tuple> list(Map options)
- throws ResourceManagerException {
+ public Tuple> list(Map options) {
try {
ListProjectsResponse response = resourceManager.projects()
.list()
@@ -92,7 +101,7 @@ public Tuple> list(Map options)
}
@Override
- public void undelete(String projectId) throws ResourceManagerException {
+ public void undelete(String projectId) {
try {
resourceManager.projects().undelete(projectId).execute();
} catch (IOException ex) {
@@ -101,12 +110,58 @@ public void undelete(String projectId) throws ResourceManagerException {
}
@Override
- public Project replace(Project project) throws ResourceManagerException {
+ public Project replace(Project project) {
try {
return resourceManager.projects().update(project.getProjectId(), project).execute();
} catch (IOException ex) {
throw translate(ex);
}
}
-}
+ @Override
+ public Policy getPolicy(String projectId) throws ResourceManagerException {
+ try {
+ return resourceManager.projects()
+ .getIamPolicy(projectId, new GetIamPolicyRequest())
+ .execute();
+ } catch (IOException ex) {
+ ResourceManagerException translated = translate(ex);
+ if (translated.code() == HTTP_FORBIDDEN) {
+ // Service returns permission denied if policy doesn't exist.
+ return null;
+ } else {
+ throw translated;
+ }
+ }
+ }
+
+ @Override
+ public Policy replacePolicy(String projectId, Policy newPolicy) throws ResourceManagerException {
+ try {
+ return resourceManager.projects()
+ .setIamPolicy(projectId, new SetIamPolicyRequest().setPolicy(newPolicy)).execute();
+ } catch (IOException ex) {
+ throw translate(ex);
+ }
+ }
+
+ @Override
+ public List testPermissions(String projectId, List permissions)
+ throws ResourceManagerException {
+ try {
+ TestIamPermissionsResponse response = resourceManager.projects()
+ .testIamPermissions(
+ projectId, new TestIamPermissionsRequest().setPermissions(permissions))
+ .execute();
+ Set permissionsOwned =
+ ImmutableSet.copyOf(firstNonNull(response.getPermissions(), ImmutableList.of()));
+ ImmutableList.Builder answer = ImmutableList.builder();
+ for (String p : permissions) {
+ answer.add(permissionsOwned.contains(p));
+ }
+ return answer.build();
+ } catch (IOException ex) {
+ throw translate(ex);
+ }
+ }
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/ResourceManagerRpc.java
new file mode 100644
index 000000000000..d6ec068a92a3
--- /dev/null
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/ResourceManagerRpc.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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 com.google.gcloud.resourcemanager.spi;
+
+import com.google.api.services.cloudresourcemanager.model.Policy;
+import com.google.api.services.cloudresourcemanager.model.Project;
+import com.google.gcloud.resourcemanager.ResourceManagerException;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ResourceManagerRpc {
+
+ enum Option {
+ FILTER("filter"),
+ FIELDS("fields"),
+ PAGE_SIZE("pageSize"),
+ PAGE_TOKEN("pageToken");
+
+ private final String value;
+
+ Option(String value) {
+ this.value = value;
+ }
+
+ public String value() {
+ return value;
+ }
+
+ @SuppressWarnings("unchecked")
+ T get(Map options) {
+ return (T) options.get(this);
+ }
+
+ String getString(Map options) {
+ return get(options);
+ }
+
+ Integer getInt(Map options) {
+ return get(options);
+ }
+ }
+
+ class Tuple {
+ private final X x;
+ private final Y y;
+
+ private Tuple(X x, Y y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ public static Tuple of(X x, Y y) {
+ return new Tuple<>(x, y);
+ }
+
+ public X x() {
+ return x;
+ }
+
+ public Y y() {
+ return y;
+ }
+ }
+
+ /**
+ * Creates a new project.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ Project create(Project project);
+
+ /**
+ * Marks the project identified by the specified project ID for deletion.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ void delete(String projectId);
+
+ /**
+ * Retrieves the project identified by the specified project ID. Returns {@code null} if the
+ * project is not found or if the user doesn't have read permissions for the project.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ Project get(String projectId, Map options);
+
+ /**
+ * Lists the projects visible to the current user.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ Tuple> list(Map options);
+
+ /**
+ * Restores the project identified by the specified project ID. Undelete will only succeed if the
+ * project has a lifecycle state of {@code DELETE_REQUESTED} state. The caller must have modify
+ * permissions for this project.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ void undelete(String projectId);
+
+ /**
+ * Replaces the attributes of the project. The caller must have modify permissions for this
+ * project.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ Project replace(Project project);
+
+ /**
+ * Returns the IAM policy associated with a project.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ Policy getPolicy(String projectId);
+
+ /**
+ * Replaces the IAM policy associated with the given project.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ Policy replacePolicy(String projectId, Policy newPolicy);
+
+ /**
+ * Tests whether the caller has the given permissions. Returns a list of booleans corresponding to
+ * whether or not the user has the permission in the same position of input list.
+ *
+ * @throws ResourceManagerException upon failure
+ */
+ List testPermissions(String projectId, List permissions);
+
+ // TODO(ajaykannan): implement "Organization" functionality when available (issue #319)
+}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpcFactory.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/ResourceManagerRpcFactory.java
similarity index 90%
rename from gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpcFactory.java
rename to gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/ResourceManagerRpcFactory.java
index c2c607c0c205..4dbd1a00d4c7 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpcFactory.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/spi/ResourceManagerRpcFactory.java
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package com.google.gcloud.spi;
+package com.google.gcloud.resourcemanager.spi;
import com.google.gcloud.resourcemanager.ResourceManagerOptions;
+import com.google.gcloud.spi.ServiceRpcFactory;
/**
* An interface for Resource Manager RPC factory.
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
index a077eb6144a5..4d466e55a897 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/LocalResourceManagerHelper.java
@@ -5,13 +5,19 @@
import static java.net.HttpURLConnection.HTTP_OK;
import com.google.api.client.json.JsonFactory;
+import com.google.api.services.cloudresourcemanager.model.Binding;
+import com.google.api.services.cloudresourcemanager.model.Policy;
import com.google.api.services.cloudresourcemanager.model.Project;
+import com.google.api.services.cloudresourcemanager.model.SetIamPolicyRequest;
+import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsRequest;
+import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsResponse;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.ByteStreams;
+import com.google.gcloud.AuthCredentials;
import com.google.gcloud.resourcemanager.ResourceManagerOptions;
import com.sun.net.httpserver.Headers;
@@ -29,11 +35,13 @@
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
+import java.util.UUID;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -45,7 +53,26 @@
* Utility to create a local Resource Manager mock for testing.
*
* The mock runs in a separate thread, listening for HTTP requests on the local machine at an
- * ephemeral port.
+ * ephemeral port. While this mock attempts to simulate the Cloud Resource Manager, there are some
+ * divergences in behavior. The following is a non-exhaustive list of some of those behavioral
+ * differences:
+ *
+ *
+ * - This mock assumes you have adequate permissions for any action. Related to this,
+ * testIamPermissions always indicates that the caller has all permissions listed in the
+ * request.
+ *
- IAM policies are set to an empty policy with version 0 (only legacy roles supported) upon
+ * project creation. The actual service will not have an empty list of bindings and may also
+ * set your version to 1.
+ *
- There is no input validation for the policy provided when replacing a policy or calling
+ * testIamPermissions.
+ *
- In this mock, projects never move from the DELETE_REQUESTED lifecycle state to
+ * DELETE_IN_PROGRESS without an explicit call to the utility method
+ * {@link #changeLifecycleState}. Similarly, a project is never completely removed without an
+ * explicit call to the utility method {@link #removeProject}.
+ *
- The messages in the error responses given by this mock do not necessarily match the messages
+ * given by the actual service.
+ *
*/
@SuppressWarnings("restriction")
public class LocalResourceManagerHelper {
@@ -77,6 +104,7 @@ public class LocalResourceManagerHelper {
private final HttpServer server;
private final ConcurrentSkipListMap projects = new ConcurrentSkipListMap<>();
+ private final Map policies = new HashMap<>();
private final int port;
private static class Response {
@@ -98,6 +126,7 @@ String body() {
}
private enum Error {
+ ABORTED(409, "global", "aborted", "ABORTED"),
ALREADY_EXISTS(409, "global", "alreadyExists", "ALREADY_EXISTS"),
PERMISSION_DENIED(403, "global", "forbidden", "PERMISSION_DENIED"),
FAILED_PRECONDITION(400, "global", "failedPrecondition", "FAILED_PRECONDITION"),
@@ -149,13 +178,7 @@ public void handle(HttpExchange exchange) {
try {
switch (requestMethod) {
case "POST":
- if (path.endsWith(":undelete")) {
- response = undelete(projectIdFromUri(path));
- } else {
- String requestBody =
- decodeContent(exchange.getRequestHeaders(), exchange.getRequestBody());
- response = create(jsonFactory.fromString(requestBody, Project.class));
- }
+ response = handlePost(exchange, path);
break;
case "DELETE":
response = delete(projectIdFromUri(path));
@@ -186,6 +209,30 @@ public void handle(HttpExchange exchange) {
}
}
+ private Response handlePost(HttpExchange exchange, String path) throws IOException {
+ String requestBody = decodeContent(exchange.getRequestHeaders(), exchange.getRequestBody());
+ if (!path.contains(":")) {
+ return create(jsonFactory.fromString(requestBody, Project.class));
+ } else {
+ switch (path.split(":", 2)[1]) {
+ case "undelete":
+ return undelete(projectIdFromUri(path));
+ case "getIamPolicy":
+ return getPolicy(projectIdFromUri(path));
+ case "setIamPolicy":
+ return replacePolicy(projectIdFromUri(path),
+ jsonFactory.fromString(requestBody, SetIamPolicyRequest.class).getPolicy());
+ case "testIamPermissions":
+ return testPermissions(projectIdFromUri(path),
+ jsonFactory.fromString(requestBody, TestIamPermissionsRequest.class)
+ .getPermissions());
+ default:
+ return Error.BAD_REQUEST.response(
+ "The server could not understand the following request URI: POST " + path);
+ }
+ }
+ }
+
private static void writeResponse(HttpExchange exchange, Response response) {
exchange.getResponseHeaders().set("Content-type", "application/json; charset=UTF-8");
OutputStream outputStream = exchange.getResponseBody();
@@ -258,7 +305,7 @@ private static Map parseListOptions(String query) throws IOExcep
options.put("pageToken", argEntry[1]);
break;
case "pageSize":
- int pageSize = Integer.valueOf(argEntry[1]);
+ int pageSize = Integer.parseInt(argEntry[1]);
if (pageSize < 1) {
throw new IOException("Page size must be greater than 0.");
}
@@ -316,7 +363,7 @@ private static boolean isValidIdOrLabel(String value, int minLength, int maxLeng
return value.length() >= minLength && value.length() <= maxLength;
}
- Response create(Project project) {
+ synchronized Response create(Project project) {
String customErrorMessage = checkForProjectErrors(project);
if (customErrorMessage != null) {
return Error.INVALID_ARGUMENT.response(customErrorMessage);
@@ -328,6 +375,11 @@ Response create(Project project) {
return Error.ALREADY_EXISTS.response(
"A project with the same project ID (" + project.getProjectId() + ") already exists.");
}
+ Policy emptyPolicy = new Policy()
+ .setBindings(Collections.emptyList())
+ .setEtag(UUID.randomUUID().toString())
+ .setVersion(0);
+ policies.put(project.getProjectId(), emptyPolicy);
try {
String createdProjectStr = jsonFactory.toString(project);
return new Response(HTTP_OK, createdProjectStr);
@@ -539,6 +591,53 @@ synchronized Response undelete(String projectId) {
return response;
}
+ synchronized Response getPolicy(String projectId) {
+ Policy policy = policies.get(projectId);
+ if (policy == null) {
+ return Error.PERMISSION_DENIED.response("Project " + projectId + " not found.");
+ }
+ try {
+ return new Response(HTTP_OK, jsonFactory.toString(policy));
+ } catch (IOException e) {
+ return Error.INTERNAL_ERROR.response(
+ "Error when serializing the IAM policy for " + projectId);
+ }
+ }
+
+ synchronized Response replacePolicy(String projectId, Policy policy) {
+ Policy originalPolicy = policies.get(projectId);
+ if (originalPolicy == null) {
+ return Error.PERMISSION_DENIED.response("Error when replacing the policy for " + projectId
+ + " because the project was not found.");
+ }
+ String etag = policy.getEtag();
+ if (etag != null && !originalPolicy.getEtag().equals(etag)) {
+ return Error.ABORTED.response("Policy etag mismatch when replacing the policy for project "
+ + projectId + ", please retry the read.");
+ }
+ policy.setEtag(UUID.randomUUID().toString());
+ policy.setVersion(originalPolicy.getVersion());
+ policies.put(projectId, policy);
+ try {
+ return new Response(HTTP_OK, jsonFactory.toString(policy));
+ } catch (IOException e) {
+ return Error.INTERNAL_ERROR.response(
+ "Error when serializing the policy for project " + projectId);
+ }
+ }
+
+ synchronized Response testPermissions(String projectId, List permissions) {
+ if (!projects.containsKey(projectId)) {
+ return Error.PERMISSION_DENIED.response("Project " + projectId + " not found.");
+ }
+ try {
+ return new Response(HTTP_OK,
+ jsonFactory.toString(new TestIamPermissionsResponse().setPermissions(permissions)));
+ } catch (IOException e) {
+ return Error.INTERNAL_ERROR.response("Error when serializing permissions " + permissions);
+ }
+ }
+
private LocalResourceManagerHelper() {
try {
server = HttpServer.create(new InetSocketAddress(0), 0);
@@ -550,17 +649,21 @@ private LocalResourceManagerHelper() {
}
/**
- * Creates a LocalResourceManagerHelper object that listens to requests on the local machine.
+ * Creates a {@code LocalResourceManagerHelper} object that listens to requests on the local
+ * machine.
*/
public static LocalResourceManagerHelper create() {
return new LocalResourceManagerHelper();
}
/**
- * Returns a ResourceManagerOptions instance that sets the host to use the mock server.
+ * Returns a {@link ResourceManagerOptions} instance that sets the host to use the mock server.
*/
public ResourceManagerOptions options() {
- return ResourceManagerOptions.builder().host("http://localhost:" + port).build();
+ return ResourceManagerOptions.builder()
+ .host("http://localhost:" + port)
+ .authCredentials(AuthCredentials.noAuth())
+ .build();
}
/**
@@ -606,6 +709,7 @@ public synchronized boolean changeLifecycleState(String projectId, String lifecy
public synchronized boolean removeProject(String projectId) {
// Because this method is synchronized, any code that relies on non-atomic read/write operations
// should not fail if that code is also synchronized.
- return projects.remove(checkNotNull(projectId)) != null;
+ policies.remove(checkNotNull(projectId));
+ return projects.remove(projectId) != null;
}
}
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
deleted file mode 100644
index 52dfc2d2368e..000000000000
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/spi/ResourceManagerRpc.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * Licensed 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 com.google.gcloud.spi;
-
-import com.google.api.services.cloudresourcemanager.model.Project;
-import com.google.gcloud.resourcemanager.ResourceManagerException;
-
-import java.util.Map;
-
-public interface ResourceManagerRpc {
-
- enum Option {
- FILTER("filter"),
- FIELDS("fields"),
- PAGE_SIZE("pageSize"),
- PAGE_TOKEN("pageToken");
-
- private final String value;
-
- Option(String value) {
- this.value = value;
- }
-
- public String value() {
- return value;
- }
-
- @SuppressWarnings("unchecked")
- T get(Map options) {
- return (T) options.get(this);
- }
-
- String getString(Map options) {
- return get(options);
- }
-
- Integer getInt(Map options) {
- return get(options);
- }
- }
-
- class Tuple {
- private final X x;
- private final Y y;
-
- private Tuple(X x, Y y) {
- this.x = x;
- this.y = y;
- }
-
- public static Tuple of(X x, Y y) {
- return new Tuple<>(x, y);
- }
-
- public X x() {
- return x;
- }
-
- public Y y() {
- return y;
- }
- }
-
- Project create(Project project) throws ResourceManagerException;
-
- void delete(String projectId) throws ResourceManagerException;
-
- Project get(String projectId, Map options) throws ResourceManagerException;
-
- Tuple> list(Map options) throws ResourceManagerException;
-
- void undelete(String projectId) throws ResourceManagerException;
-
- Project replace(Project project) throws ResourceManagerException;
-
- // TODO(ajaykannan): implement "Organization" functionality when available (issue #319)
-}
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java
index a3418fff98ab..75df0ef9e3ae 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/LocalResourceManagerHelperTest.java
@@ -2,24 +2,29 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import com.google.api.services.cloudresourcemanager.model.Binding;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.resourcemanager.spi.DefaultResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc.Tuple;
import com.google.gcloud.resourcemanager.testing.LocalResourceManagerHelper;
-import com.google.gcloud.spi.DefaultResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpc.Tuple;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
public class LocalResourceManagerHelperTest {
@@ -45,7 +50,12 @@ public class LocalResourceManagerHelperTest {
.setLabels(ImmutableMap.of("k1", "v1", "k2", "v2"));
private static final com.google.api.services.cloudresourcemanager.model.Project
PROJECT_WITH_PARENT =
- copyFrom(COMPLETE_PROJECT).setProjectId("project-with-parent-id").setParent(PARENT);
+ copyFrom(COMPLETE_PROJECT).setProjectId("project-with-parent-id").setParent(PARENT);
+ private static final List BINDINGS = ImmutableList.of(
+ new Binding().setRole("roles/owner").setMembers(ImmutableList.of("user:me@gmail.com")),
+ new Binding().setRole("roles/viewer").setMembers(ImmutableList.of("group:group@gmail.com")));
+ private static final com.google.api.services.cloudresourcemanager.model.Policy POLICY =
+ new com.google.api.services.cloudresourcemanager.model.Policy().setBindings(BINDINGS);
@BeforeClass
public static void beforeClass() {
@@ -92,6 +102,13 @@ public void testCreate() {
assertNull(returnedProject.getParent());
assertNotNull(returnedProject.getProjectNumber());
assertNotNull(returnedProject.getCreateTime());
+ com.google.api.services.cloudresourcemanager.model.Policy policy =
+ rpc.getPolicy(PARTIAL_PROJECT.getProjectId());
+ assertEquals(Collections.emptyList(), policy.getBindings());
+ assertNotNull(policy.getEtag());
+ assertEquals(0, policy.getVersion().intValue());
+ rpc.replacePolicy(PARTIAL_PROJECT.getProjectId(), POLICY);
+ assertEquals(POLICY.getBindings(), rpc.getPolicy(PARTIAL_PROJECT.getProjectId()).getBindings());
try {
rpc.create(PARTIAL_PROJECT);
fail("Should fail, project already exists.");
@@ -99,6 +116,8 @@ public void testCreate() {
assertEquals(409, e.code());
assertTrue(e.getMessage().startsWith("A project with the same project ID")
&& e.getMessage().endsWith("already exists."));
+ assertEquals(
+ POLICY.getBindings(), rpc.getPolicy(PARTIAL_PROJECT.getProjectId()).getBindings());
}
returnedProject = rpc.create(PROJECT_WITH_PARENT);
compareReadWriteFields(PROJECT_WITH_PARENT, returnedProject);
@@ -609,6 +628,58 @@ public void testUndeleteWhenDeleteInProgress() {
}
}
+ @Test
+ public void testGetPolicy() {
+ assertNull(rpc.getPolicy("nonexistent-project"));
+ rpc.create(PARTIAL_PROJECT);
+ com.google.api.services.cloudresourcemanager.model.Policy policy =
+ rpc.getPolicy(PARTIAL_PROJECT.getProjectId());
+ assertEquals(Collections.emptyList(), policy.getBindings());
+ assertNotNull(policy.getEtag());
+ }
+
+ @Test
+ public void testReplacePolicy() {
+ try {
+ rpc.replacePolicy("nonexistent-project", POLICY);
+ fail("Project doesn't exist.");
+ } catch (ResourceManagerException e) {
+ assertEquals(403, e.code());
+ assertTrue(e.getMessage().contains("project was not found"));
+ }
+ rpc.create(PARTIAL_PROJECT);
+ com.google.api.services.cloudresourcemanager.model.Policy invalidPolicy =
+ new com.google.api.services.cloudresourcemanager.model.Policy().setEtag("wrong-etag");
+ try {
+ rpc.replacePolicy(PARTIAL_PROJECT.getProjectId(), invalidPolicy);
+ fail("Invalid etag.");
+ } catch (ResourceManagerException e) {
+ assertEquals(409, e.code());
+ assertTrue(e.getMessage().startsWith("Policy etag mismatch"));
+ }
+ String originalEtag = rpc.getPolicy(PARTIAL_PROJECT.getProjectId()).getEtag();
+ com.google.api.services.cloudresourcemanager.model.Policy newPolicy =
+ rpc.replacePolicy(PARTIAL_PROJECT.getProjectId(), POLICY);
+ assertEquals(POLICY.getBindings(), newPolicy.getBindings());
+ assertNotNull(newPolicy.getEtag());
+ assertNotEquals(originalEtag, newPolicy.getEtag());
+ }
+
+ @Test
+ public void testTestPermissions() {
+ List permissions = ImmutableList.of("resourcemanager.projects.get");
+ try {
+ rpc.testPermissions("nonexistent-project", permissions);
+ fail("Nonexistent project.");
+ } catch (ResourceManagerException e) {
+ assertEquals(403, e.code());
+ assertEquals("Project nonexistent-project not found.", e.getMessage());
+ }
+ rpc.create(PARTIAL_PROJECT);
+ assertEquals(ImmutableList.of(true),
+ rpc.testPermissions(PARTIAL_PROJECT.getProjectId(), permissions));
+ }
+
@Test
public void testChangeLifecycleStatus() {
assertFalse(RESOURCE_MANAGER_HELPER.changeLifecycleState(
@@ -632,8 +703,10 @@ public void testChangeLifecycleStatus() {
public void testRemoveProject() {
assertFalse(RESOURCE_MANAGER_HELPER.removeProject(COMPLETE_PROJECT.getProjectId()));
rpc.create(COMPLETE_PROJECT);
+ assertNotNull(rpc.getPolicy(COMPLETE_PROJECT.getProjectId()));
assertTrue(RESOURCE_MANAGER_HELPER.removeProject(COMPLETE_PROJECT.getProjectId()));
assertNull(rpc.get(COMPLETE_PROJECT.getProjectId(), EMPTY_RPC_OPTIONS));
+ assertNull(rpc.getPolicy(COMPLETE_PROJECT.getProjectId()));
}
private void compareReadWriteFields(
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
index 05d1b85bdbed..04826dd9540f 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/PolicyTest.java
@@ -17,9 +17,10 @@
package com.google.gcloud.resourcemanager;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
-import com.google.common.collect.ImmutableSet;
import com.google.gcloud.Identity;
+import com.google.gcloud.resourcemanager.Policy.ProjectRole;
import org.junit.Test;
@@ -33,8 +34,10 @@ public class PolicyTest {
private static final Identity GROUP = Identity.group("group@gmail.com");
private static final Identity DOMAIN = Identity.domain("google.com");
private static final Policy SIMPLE_POLICY = Policy.builder()
- .addBinding(Policy.Role.VIEWER, ImmutableSet.of(USER, SERVICE_ACCOUNT, ALL_USERS))
- .addBinding(Policy.Role.EDITOR, ImmutableSet.of(ALL_AUTH_USERS, GROUP, DOMAIN))
+ .addIdentity(ProjectRole.OWNER.value(), USER)
+ .addIdentity(ProjectRole.VIEWER.value(), ALL_USERS)
+ .addIdentity(ProjectRole.EDITOR.value(), ALL_AUTH_USERS, DOMAIN)
+ .addIdentity("roles/some-role", SERVICE_ACCOUNT, GROUP)
.build();
private static final Policy FULL_POLICY =
new Policy.Builder(SIMPLE_POLICY.bindings(), "etag", 1).build();
@@ -50,4 +53,16 @@ public void testPolicyToAndFromPb() {
assertEquals(FULL_POLICY, Policy.fromPb(FULL_POLICY.toPb()));
assertEquals(SIMPLE_POLICY, Policy.fromPb(SIMPLE_POLICY.toPb()));
}
+
+ @Test
+ public void testEquals() {
+ Policy copy = Policy.builder()
+ .addIdentity(ProjectRole.OWNER.value(), USER)
+ .addIdentity(ProjectRole.VIEWER.value(), ALL_USERS)
+ .addIdentity(ProjectRole.EDITOR.value(), ALL_AUTH_USERS, DOMAIN)
+ .addIdentity("roles/some-role", SERVICE_ACCOUNT, GROUP)
+ .build();
+ assertEquals(SIMPLE_POLICY, copy);
+ assertNotEquals(SIMPLE_POLICY, FULL_POLICY);
+ }
}
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
index 4e239acc45ef..0f4c205dde17 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ProjectTest.java
@@ -25,12 +25,17 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.Identity;
+import com.google.gcloud.resourcemanager.Policy.ProjectRole;
+import com.google.gcloud.resourcemanager.ProjectInfo.ResourceId;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.util.List;
import java.util.Map;
public class ProjectTest {
@@ -47,6 +52,13 @@ public class ProjectTest {
.createTimeMillis(CREATE_TIME_MILLIS)
.state(STATE)
.build();
+ private static final Identity USER = Identity.user("abc@gmail.com");
+ private static final Identity SERVICE_ACCOUNT =
+ Identity.serviceAccount("service-account@gmail.com");
+ private static final Policy POLICY = Policy.builder()
+ .addIdentity(ProjectRole.OWNER.value(), USER)
+ .addIdentity(ProjectRole.EDITOR.value(), SERVICE_ACCOUNT)
+ .build();
private ResourceManager serviceMockReturnsOptions = createStrictMock(ResourceManager.class);
private ResourceManagerOptions mockOptions = createMock(ResourceManagerOptions.class);
@@ -84,12 +96,12 @@ public void testToBuilder() {
@Test
public void testBuilder() {
- initializeExpectedProject(4);
- expect(resourceManager.options()).andReturn(mockOptions).times(4);
+ expect(resourceManager.options()).andReturn(mockOptions).times(7);
replay(resourceManager);
Project.Builder builder =
- new Project.Builder(new Project(resourceManager, new ProjectInfo.BuilderImpl(PROJECT_ID)));
- Project project = builder.name(NAME)
+ new Project.Builder(new Project(resourceManager, new ProjectInfo.BuilderImpl("wrong-id")));
+ Project project = builder.projectId(PROJECT_ID)
+ .name(NAME)
.labels(LABELS)
.projectNumber(PROJECT_NUMBER)
.createTimeMillis(CREATE_TIME_MILLIS)
@@ -102,6 +114,23 @@ public void testBuilder() {
assertEquals(CREATE_TIME_MILLIS, project.createTimeMillis());
assertEquals(STATE, project.state());
assertEquals(resourceManager.options(), project.resourceManager().options());
+ assertNull(project.parent());
+ ResourceId parent = new ResourceId("id", "type");
+ project = project.toBuilder()
+ .clearLabels()
+ .addLabel("k3", "v3")
+ .addLabel("k4", "v4")
+ .removeLabel("k4")
+ .parent(parent)
+ .build();
+ assertEquals(PROJECT_ID, project.projectId());
+ assertEquals(NAME, project.name());
+ assertEquals(ImmutableMap.of("k3", "v3"), project.labels());
+ assertEquals(PROJECT_NUMBER, project.projectNumber());
+ assertEquals(CREATE_TIME_MILLIS, project.createTimeMillis());
+ assertEquals(STATE, project.state());
+ assertEquals(resourceManager.options(), project.resourceManager().options());
+ assertEquals(parent, project.parent());
}
@Test
@@ -187,6 +216,39 @@ public void testReplace() {
compareProjectInfos(expectedReplacedProject, actualReplacedProject);
}
+ @Test
+ public void testGetPolicy() {
+ expect(resourceManager.options()).andReturn(mockOptions).times(1);
+ expect(resourceManager.getPolicy(PROJECT_ID)).andReturn(POLICY);
+ replay(resourceManager);
+ initializeProject();
+ assertEquals(POLICY, project.getPolicy());
+ }
+
+ @Test
+ public void testReplacePolicy() {
+ expect(resourceManager.options()).andReturn(mockOptions).times(1);
+ expect(resourceManager.replacePolicy(PROJECT_ID, POLICY)).andReturn(POLICY);
+ replay(resourceManager);
+ initializeProject();
+ assertEquals(POLICY, project.replacePolicy(POLICY));
+ }
+
+ @Test
+ public void testTestPermissions() {
+ List response = ImmutableList.of(true, true);
+ String getPermission = "resourcemanager.projects.get";
+ String deletePermission = "resourcemanager.projects.delete";
+ expect(resourceManager.options()).andReturn(mockOptions).times(1);
+ expect(resourceManager.testPermissions(
+ PROJECT_ID, ImmutableList.of(getPermission, deletePermission)))
+ .andReturn(response);
+ replay(resourceManager);
+ initializeProject();
+ assertEquals(
+ response, project.testPermissions(ImmutableList.of(getPermission, deletePermission)));
+ }
+
private void compareProjects(Project expected, Project value) {
assertEquals(expected, value);
compareProjectInfos(expected, value);
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
index 1bc233311a4d..7d52901aa372 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/ResourceManagerImplTest.java
@@ -18,21 +18,25 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.Identity;
import com.google.gcloud.Page;
+import com.google.gcloud.resourcemanager.Policy.ProjectRole;
import com.google.gcloud.resourcemanager.ProjectInfo.ResourceId;
import com.google.gcloud.resourcemanager.ResourceManager.ProjectField;
import com.google.gcloud.resourcemanager.ResourceManager.ProjectGetOption;
import com.google.gcloud.resourcemanager.ResourceManager.ProjectListOption;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpc;
+import com.google.gcloud.resourcemanager.spi.ResourceManagerRpcFactory;
import com.google.gcloud.resourcemanager.testing.LocalResourceManagerHelper;
-import com.google.gcloud.spi.ResourceManagerRpc;
-import com.google.gcloud.spi.ResourceManagerRpcFactory;
import org.easymock.EasyMock;
import org.junit.AfterClass;
@@ -43,6 +47,7 @@
import org.junit.rules.ExpectedException;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
public class ResourceManagerImplTest {
@@ -65,6 +70,12 @@ public class ResourceManagerImplTest {
.parent(PARENT)
.build();
private static final Map EMPTY_RPC_OPTIONS = ImmutableMap.of();
+ private static final Policy POLICY =
+ Policy.builder()
+ .addIdentity(ProjectRole.OWNER.value(), Identity.user("me@gmail.com"))
+ .addIdentity(
+ ProjectRole.EDITOR.value(), Identity.serviceAccount("serviceaccount@gmail.com"))
+ .build();
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -320,6 +331,58 @@ public void testUndelete() {
}
}
+ @Test
+ public void testGetPolicy() {
+ assertNull(RESOURCE_MANAGER.getPolicy(COMPLETE_PROJECT.projectId()));
+ RESOURCE_MANAGER.create(COMPLETE_PROJECT);
+ RESOURCE_MANAGER.replacePolicy(COMPLETE_PROJECT.projectId(), POLICY);
+ Policy retrieved = RESOURCE_MANAGER.getPolicy(COMPLETE_PROJECT.projectId());
+ assertEquals(POLICY.bindings(), retrieved.bindings());
+ assertNotNull(retrieved.etag());
+ assertEquals(0, retrieved.version().intValue());
+ }
+
+ @Test
+ public void testReplacePolicy() {
+ try {
+ RESOURCE_MANAGER.replacePolicy("nonexistent-project", POLICY);
+ fail("Project doesn't exist.");
+ } catch (ResourceManagerException e) {
+ assertEquals(403, e.code());
+ assertTrue(e.getMessage().endsWith("project was not found."));
+ }
+ RESOURCE_MANAGER.create(PARTIAL_PROJECT);
+ Policy oldPolicy = RESOURCE_MANAGER.getPolicy(PARTIAL_PROJECT.projectId());
+ RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.projectId(), POLICY);
+ try {
+ RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.projectId(), oldPolicy);
+ fail("Policy with an invalid etag didn't cause error.");
+ } catch (ResourceManagerException e) {
+ assertEquals(409, e.code());
+ assertTrue(e.getMessage().contains("Policy etag mismatch"));
+ }
+ String originalEtag = RESOURCE_MANAGER.getPolicy(PARTIAL_PROJECT.projectId()).etag();
+ Policy newPolicy = RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.projectId(), POLICY);
+ assertEquals(POLICY.bindings(), newPolicy.bindings());
+ assertNotNull(newPolicy.etag());
+ assertNotEquals(originalEtag, newPolicy.etag());
+ }
+
+ @Test
+ public void testTestPermissions() {
+ List permissions = ImmutableList.of("resourcemanager.projects.get");
+ try {
+ RESOURCE_MANAGER.testPermissions("nonexistent-project", permissions);
+ fail("Nonexistent project");
+ } catch (ResourceManagerException e) {
+ assertEquals(403, e.code());
+ assertEquals("Project nonexistent-project not found.", e.getMessage());
+ }
+ RESOURCE_MANAGER.create(PARTIAL_PROJECT);
+ assertEquals(ImmutableList.of(true),
+ RESOURCE_MANAGER.testPermissions(PARTIAL_PROJECT.projectId(), permissions));
+ }
+
@Test
public void testRetryableException() {
ResourceManagerRpcFactory rpcFactoryMock = EasyMock.createMock(ResourceManagerRpcFactory.class);
diff --git a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
index 35b72ae1713f..4bc1bcede195 100644
--- a/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
+++ b/gcloud-java-resourcemanager/src/test/java/com/google/gcloud/resourcemanager/SerializationTest.java
@@ -16,26 +16,17 @@
package com.google.gcloud.resourcemanager;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
+import com.google.gcloud.BaseSerializationTest;
import com.google.gcloud.Identity;
import com.google.gcloud.PageImpl;
-import com.google.gcloud.RetryParams;
-
-import org.junit.Test;
+import com.google.gcloud.Restorable;
+import com.google.gcloud.resourcemanager.Policy.ProjectRole;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collections;
-public class SerializationTest {
+public class SerializationTest extends BaseSerializationTest {
private static final ResourceManager RESOURCE_MANAGER =
ResourceManagerOptions.defaultInstance().service();
@@ -56,44 +47,24 @@ public class SerializationTest {
private static final ResourceManager.ProjectListOption PROJECT_LIST_OPTION =
ResourceManager.ProjectListOption.filter("name:*");
private static final Policy POLICY = Policy.builder()
- .addBinding(Policy.Role.VIEWER, ImmutableSet.of(Identity.user("abc@gmail.com")))
+ .addIdentity(ProjectRole.VIEWER.value(), Identity.user("abc@gmail.com"))
.build();
+ private static final ResourceManagerException RESOURCE_MANAGER_EXCEPTION =
+ new ResourceManagerException(42, "message");
- @Test
- public void testServiceOptions() throws Exception {
+ @Override
+ protected Serializable[] serializableObjects() {
ResourceManagerOptions options = ResourceManagerOptions.builder().build();
- ResourceManagerOptions serializedCopy = serializeAndDeserialize(options);
- assertEquals(options, serializedCopy);
- options = options.toBuilder()
+ ResourceManagerOptions otherOptions = options.toBuilder()
.projectId("some-unnecessary-project-ID")
- .retryParams(RetryParams.defaultInstance())
.build();
- serializedCopy = serializeAndDeserialize(options);
- assertEquals(options, serializedCopy);
- }
-
- @Test
- public void testModelAndRequests() throws Exception {
- Serializable[] objects = {PARTIAL_PROJECT_INFO, FULL_PROJECT_INFO, PROJECT, PAGE_RESULT,
- PROJECT_GET_OPTION, PROJECT_LIST_OPTION, POLICY};
- for (Serializable obj : objects) {
- Object copy = serializeAndDeserialize(obj);
- assertEquals(obj, obj);
- assertEquals(obj, copy);
- assertNotSame(obj, copy);
- assertEquals(copy, copy);
- }
+ return new Serializable[]{PARTIAL_PROJECT_INFO, FULL_PROJECT_INFO, PROJECT, PAGE_RESULT,
+ PROJECT_GET_OPTION, PROJECT_LIST_OPTION, POLICY, RESOURCE_MANAGER_EXCEPTION, options,
+ otherOptions};
}
- @SuppressWarnings("unchecked")
- private