Empty string for user upsert and delete not allowed

Author: IgorChvyrov-sm

src/conductor/asyncio_client/adapters/api/user_resource_api.py

@@ -1,6 +1,7 @@
 from pydantic import StrictStr
 
 from conductor.asyncio_client.http.api import UserResourceApi
+from conductor.asyncio_client.adapters.models import UpsertUserRequestAdapter as UpsertUserRequest
 
 
 class UserResourceApiAdapter(UserResourceApi):
@@ -23,3 +24,24 @@ async def get_user(
         if not id:
             id = None
         return await super().get_user(id=id, *args, **kwargs)
+
+    async def upsert_user(
+        self,
+        id: StrictStr,
+        upsert_user_request: UpsertUserRequest,
+        *args,
+        **kwargs,
+    ) -> object:
+        if not id:
+            id = None
+        return await super().upsert_user(id=id, upsert_user_request=upsert_user_request, *args, **kwargs)
+
+    async def delete_user(
+        self,
+        id: StrictStr,
+        *args,
+        **kwargs,
+    ) -> object:
+        if not id:
+            id = None
+        return await super().delete_user(id=id, *args, **kwargs)

src/conductor/client/adapters/api/user_resource_api_adapter.py

@@ -11,3 +11,13 @@ def get_user(self, id, **kwargs):
         if not id:
             id = None
         return super().get_user(id=id, **kwargs)
+
+    def upsert_user(self, id, upsert_user_request, **kwargs):
+        if not id:
+            id = None
+        return super().upsert_user(id=id, upsert_user_request=upsert_user_request, **kwargs)
+
+    def delete_user(self, id, **kwargs):
+        if not id:
+            id = None
+        return super().delete_user(id=id, **kwargs)

tests/unit/orkes/test_async_authorization_client.py

@@ -279,6 +279,14 @@ async def test_delete_user(mocker, authorization_client):
     mock.assert_called_with(id=USER_ID)
 
 
+@pytest.mark.asyncio
+async def test_delete_user_with_empty_string(mocker, authorization_client):
+    from conductor.asyncio_client.http.api import UserResourceApi
+    mock = mocker.patch.object(UserResourceApi, "delete_user")
+    await authorization_client.delete_user("")
+    mock.assert_called_with(id=None)
+
+
 @pytest.mark.asyncio
 async def test_list_users_with_apps(
     mocker, authorization_client, conductor_user_adapter
@@ -311,6 +319,16 @@ async def test_upsert_user(mocker, authorization_client, conductor_user_adapter)
     assert user.uuid == USER_UUID
 
 
+@pytest.mark.asyncio
+async def test_upsert_user_with_empty_string(mocker, authorization_client, conductor_user_adapter):
+    from conductor.asyncio_client.http.api import UserResourceApi
+    mock = mocker.patch.object(UserResourceApi, "upsert_user")
+    upsert_req = UpsertUserRequestAdapter(name=USER_NAME, roles=["ADMIN"])
+    mock.return_value = conductor_user_adapter
+    await authorization_client.upsert_user("", upsert_req)
+    mock.assert_called_with(id=None, upsert_user_request=upsert_req)
+
+
 @pytest.mark.asyncio
 async def test_create_group(mocker, authorization_client, group_adapter):
     mock = mocker.patch.object(GroupResourceApiAdapter, "upsert_group")

tests/unit/orkes/test_authorization_client.py

@@ -301,6 +301,15 @@ def test_upsert_user(mocker, authorization_client, conductor_user, roles):
     assert user.roles == roles
 
 
+def test_upsert_user_with_empty_string(mocker, authorization_client, conductor_user, roles):
+    from conductor.client.codegen.api.user_resource_api import UserResourceApi
+    mock = mocker.patch.object(UserResourceApi, "upsert_user")
+    upsertReq = UpsertUserRequest(USER_NAME, ["ADMIN"])
+    mock.return_value = conductor_user.to_dict()
+    authorization_client.upsert_user("", upsertReq)
+    mock.assert_called_with(id=None, upsert_user_request=upsertReq)
+
+
 def test_get_user(mocker, authorization_client, conductor_user, roles):
     mock = mocker.patch.object(UserResourceApi, "get_user")
     mock.return_value = conductor_user.to_dict()
@@ -342,6 +351,13 @@ def test_delete_user(mocker, authorization_client):
     mock.assert_called_with(USER_ID)
 
 
+def test_delete_user_with_empty_string(mocker, authorization_client):
+    from conductor.client.codegen.api.user_resource_api import UserResourceApi
+    mock = mocker.patch.object(UserResourceApi, "delete_user")
+    authorization_client.delete_user("")
+    mock.assert_called_with(id=None)
+
+
 def test_upsert_group(mocker, authorization_client, conductor_group, group_roles):
     mock = mocker.patch.object(GroupResourceApi, "upsert_group")
     upsertReq = UpsertGroupRequest(GROUP_NAME, ["USER"])