---

Frank Natividad · Frank Natividad · commit 97475bcf7a0d · 2017-04-27T09:10:12.000-07:00
yaml --- r: 8055 b: refs/heads/tswast-patch-1 c: b21740b h: refs/heads/master i: 8053: 2c46324 8051: 3d9765e 8047: d7ca53c
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 6ec2d3ccd352d44867af0fb19a55d964c1fdb3e5
+refs/heads/tswast-patch-1: b21740be6c10b4fa9ef9430045c135fc574f8f4e
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketIamSnippets.java b/branches/tswast-patch-1/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/snippets/BucketIamSnippets.java
@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * EDITING INSTRUCTIONS
- * This file is referenced in Storage's javadoc. Any change to this file should be reflected in
- * Storage's javadoc.
- */
-
 package com.google.cloud.examples.storage.snippets;
 
 import com.google.cloud.Identity;
@@ -47,7 +41,6 @@ public BucketIamSnippets(Storage storage) {
   /**
    * Example of listing the Bucket-Level IAM Roles and Members
    */
-
   public Policy listBucketIamMembers(String bucketName) {
     // [START view_bucket_iam_members]
     // Initialize a Cloud Storage client
@@ -59,8 +52,7 @@ public Policy listBucketIamMembers(String bucketName) {
     // Print Roles and its identities
     Map<Role, Set<Identity>> policyBindings = policy.getBindings();
     for(Map.Entry<Role, Set<Identity>> entry : policyBindings.entrySet()) {
-        System.out.printf("Role: %s", entry.getKey());
-        System.out.printf(" Identities: %s\n", entry.getValue());
+        System.out.printf("Role: %s Identities: %s\n", entry.getKey(), entry.getValue());
     }
     // [END view_bucket_iam_members]
     return policy;
@@ -69,7 +61,6 @@ public Policy listBucketIamMembers(String bucketName) {
   /**
    * Example of adding a member to the Bucket-level IAM
    */
-
   public void addBucketIamMember(String bucketName, Role role, Identity identity) {
     // [START add_bucket_iam_member]
     // Initialize a Cloud Storage client
@@ -79,19 +70,18 @@ public void addBucketIamMember(String bucketName, Role role, Identity identity)
     Policy policy = storage.getIamPolicy(bucketName);
 
     // Add identity to Bucket-level IAM role
-    Policy updatedPolicy = policy.toBuilder().addIdentity(role, identity).build();
+    Policy updatedPolicy = storage.setIamPolicy(bucketName,
+        policy.toBuilder().addIdentity(role, identity).build());
 
-    // Update the bucket IAM Policy
-    storage.setIamPolicy(bucketName, updatedPolicy);
-
-    System.out.printf("Added %s with role %s to %s\n", identity, role, bucketName);
+    if (updatedPolicy.getBindings().get(role).contains(identity)) {
+      System.out.printf("Added %s with role %s to %s\n", identity, role, bucketName);
+    }
     // [END add_bucket_iam_member]
   }
 
   /**
    * Example of removing a member from the Bucket-level IAM
    */
-
   public void removeBucketIamMember(String bucketName, Role role, Identity identity) {
     // [START remove_bucket_iam_member]
     // Initialize a Cloud Storage client
@@ -100,13 +90,14 @@ public void removeBucketIamMember(String bucketName, Role role, Identity identit
     // Get IAM Policy for a bucket
     Policy policy = storage.getIamPolicy(bucketName);
 
-    // Remove identity from Bucket-level IAM role
-    Policy updatedPolicy = policy.toBuilder().removeIdentity(role, identity).build();
+    // Remove an identity from a Bucket-level IAM role
+    Policy updatedPolicy = storage.setIamPolicy(bucketName,
+        policy.toBuilder().removeIdentity(role, identity).build());
 
-    // Update the bucket IAM Policy
-    storage.setIamPolicy(bucketName, updatedPolicy);
-
-    System.out.printf("Removed %s with role %s from %s\n", identity, role, bucketName);
+    if (updatedPolicy.getBindings().get(role) == null ||
+        !updatedPolicy.getBindings().get(role).contains(identity)) {
+      System.out.printf("Removed %s with role %s from %s\n", identity, role, bucketName);
+    }
     // [END remove_bucket_iam_member]
   }
 }
