Apply controller autovalues on policy updates

Author: phantomii

gcl_iam/api/controllers.py

@@ -108,6 +108,7 @@ def update(self, uuid, **kwargs):
         if "project_id" in kwargs and self._ctx_project_id:
             self._force_project_id(kwargs["project_id"])
         dm = super(PolicyBasedController, self).get(uuid, **filters)
+        kwargs = self._apply_autovalues(kwargs)
         dm.update_dm(values=kwargs)
         dm.update()
         return dm
@@ -174,6 +175,7 @@ def update(self, uuid, **kwargs):
         self._enforce("update")
         dm = super().get(uuid)
 
+        kwargs = self._apply_autovalues(kwargs)
         dm.update_dm(values=kwargs)
         dm.update()
         return dm

gcl_iam/tests/unit/test_controllers.py

@@ -166,6 +166,54 @@ def test_override_project_id_from_ctx(self, user_context):
         assert kwargs == {"project_id": FAKE_PROJECT_ID}
 
 
+class TestPolicyBasedController:
+    def test_update_applies_autovalues(self, user_context):
+        pc = controllers.PolicyBasedController(request=mock.Mock())
+        pc._enforce_and_override_project_id_in_kwargs = mock.Mock()
+        pc._apply_autovalues = mock.Mock(return_value={"name": "server"})
+        dm = mock.Mock()
+        resource_id = uuid.uuid4()
+
+        with mock.patch.object(
+            controllers.controllers.BaseResourceController,
+            "get",
+            return_value=dm,
+        ) as get:
+            result = pc.update(resource_id, name="client")
+
+        pc._enforce_and_override_project_id_in_kwargs.assert_called_once_with(
+            "update", {}
+        )
+        get.assert_called_once_with(resource_id)
+        pc._apply_autovalues.assert_called_once_with({"name": "client"})
+        dm.update_dm.assert_called_once_with(values={"name": "server"})
+        dm.update.assert_called_once_with()
+        assert result is dm
+
+
+class TestPolicyBasedWithoutProjectController:
+    def test_update_applies_autovalues(self, user_context):
+        pc = controllers.PolicyBasedWithoutProjectController(request=mock.Mock())
+        pc._enforce = mock.Mock()
+        pc._apply_autovalues = mock.Mock(return_value={"name": "server"})
+        dm = mock.Mock()
+        resource_id = uuid.uuid4()
+
+        with mock.patch.object(
+            controllers.controllers.BaseResourceController,
+            "get",
+            return_value=dm,
+        ) as get:
+            result = pc.update(resource_id, name="client")
+
+        pc._enforce.assert_called_once_with("update")
+        get.assert_called_once_with(resource_id)
+        pc._apply_autovalues.assert_called_once_with({"name": "client"})
+        dm.update_dm.assert_called_once_with(values={"name": "server"})
+        dm.update.assert_called_once_with()
+        assert result is dm
+
+
 class TestPolicyBasedCheckOtpController:
     def test_check_otp_verified_true(self, otp_enabled_context):
         pc = controllers.PolicyBasedCheckOtpController(request=mock.Mock())

pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
 ]
 dependencies = [
     "bazooka>=1.1.0,<2.0.0",  # Apache-2.0
-    "restalchemy>=15.1.2,<16.0.0",  # Apache-2.0
+    "restalchemy>=15.2.0,<16.0.0",  # Apache-2.0
     "izulu>=0.50.0,<1.0.0",  # MIT License
     "pyjwt>=2.9.0,<3.0.0",  # MIT License
     "cryptography>=45.0.5,<47.0.0",  # BSD-3 License