fix policy __delitem__

Author: jkwlui

api_core/google/api_core/iam.py

@@ -133,7 +133,7 @@ def __setitem__(self, key, value):
         value = set(value)
         for binding in self._bindings:
             if binding["role"] == key:
-                binding["member"] = value
+                binding["members"] = value
                 return
         self._bindings.append({"role": key, "members": value})
 

api_core/tests/unit/test_iam.py

@@ -79,6 +79,17 @@ def test___setitem__(self):
         assert len(policy) == 1
         assert dict(policy) == {"rolename": PRINCIPALS}
 
+    def test__set_item__overwrite(self):
+        USER = "user:phred@example.com"
+        ALL_USERS = "allUsers"
+        MEMBERS = set([ALL_USERS])
+        policy = self._make_one()
+        policy["rolename"] = [USER]
+        policy["rolename"] = [ALL_USERS]
+        assert policy["rolename"] == MEMBERS
+        assert len(policy) == 1
+        assert dict(policy) == {"rolename": MEMBERS}
+
     def test___setitem___version3(self):
         policy = self._make_one("DEADBEEF", 3)
         with pytest.raises(InvalidOperationException, match=_DICT_ACCESS_MSG):
@@ -89,17 +100,20 @@ def test___setitem___with_conditions(self):
         CONDITION = {"expression": "2 > 1"}
         policy = self._make_one("DEADBEEF", 1)
         policy.bindings = [
-            {"role": "role/reader", "members": [USER], "condition": CONDITION}
+            {"role": "role/reader", "members": set([USER]), "condition": CONDITION}
         ]
         with pytest.raises(InvalidOperationException, match=_DICT_ACCESS_MSG):
             policy["role/reader"] = ["user:phred@example.com"]
 
     def test___delitem___hit(self):
         policy = self._make_one()
-        policy.bindings = [{"role": "rolename", "members": ["phred@example.com"]}]
-        del policy["rolename"]
-        assert len(policy) == 0
-        assert dict(policy) == {}
+        policy.bindings = [
+            {"role": "to/keep", "members": set(["phred@example.com"])},
+            {"role": "to/remove", "members": set(["phred@example.com"])}
+        ]
+        del policy["to/remove"]
+        assert len(policy) == 1
+        assert dict(policy) == {"to/keep": set(["phred@example.com"])}
 
     def test___delitem___miss(self):
         policy = self._make_one()
@@ -116,7 +130,7 @@ def test___delitem___with_conditions(self):
         CONDITION = {"expression": "2 > 1"}
         policy = self._make_one("DEADBEEF", 1)
         policy.bindings = [
-            {"role": "role/reader", "members": [USER], "condition": CONDITION}
+            {"role": "role/reader", "members": set([USER]), "condition": CONDITION}
         ]
         with pytest.raises(InvalidOperationException, match=_DICT_ACCESS_MSG):
             del policy["role/reader"]
@@ -125,7 +139,7 @@ def test_bindings_property(self):
         USER = "user:phred@example.com"
         CONDITION = {"expression": "2 > 1"}
         policy = self._make_one()
-        BINDINGS = [{"role": "role/reader", "members": [USER], "condition": CONDITION}]
+        BINDINGS = [{"role": "role/reader", "members": set([USER]), "condition": CONDITION}]
         policy.bindings = BINDINGS
         assert policy.bindings == BINDINGS