Fix addBinding method for quickstartV2 (GoogleCloudPlatform#3594)

melaniedejong · web-flow · commit 26339506c170 · 2020-08-21T16:59:48.000-07:00
* Fix addBinding method

* Update imports

* Lint
diff --git a/iam/api-client/src/main/java/iam/snippets/QuickstartV2.java b/iam/api-client/src/main/java/iam/snippets/QuickstartV2.java
@@ -98,22 +98,27 @@ public static void addBinding(
     // Gets the project's policy.
     Policy policy = getPolicy(crmService, projectId);
 
-    // If binding already exists, adds member to binding.
-    List<Binding> bindings = policy.getBindings();
-    for (Binding b : bindings) {
+    // Finds binding in policy, if it exists
+    Binding binding = null;
+    for (Binding b : policy.getBindings()) {
       if (b.getRole().equals(role)) {
-        b.getMembers().add(member);
+        binding = b; 
         break;
       }
     }
 
-    // If binding does not exist, adds binding to policy.
-    Binding binding = new Binding();
-    binding.setRole(role);
-    binding.setMembers(Collections.singletonList(member));
-    policy.getBindings().add(binding);
+    if (binding != null) {
+      // If binding already exists, adds member to binding.
+      binding.getMembers().add(member);
+    } else {
+      // If binding does not exist, adds binding to policy.
+      binding = new Binding();
+      binding.setRole(role);
+      binding.setMembers(Collections.singletonList(member));
+      policy.getBindings().add(binding);
+    }
 
-    // Set the updated policy
+    // Sets the updated policy
     setPolicy(crmService, projectId, policy);
   }
 
@@ -123,9 +128,8 @@ public static void removeMember(
     Policy policy = getPolicy(crmService, projectId);
 
     // Removes the member from the role.
-    List<Binding> bindings = policy.getBindings();
     Binding binding = null;
-    for (Binding b : bindings) {
+    for (Binding b : policy.getBindings()) {
       if (b.getRole().equals(role)) {
         binding = b;
         break;
