update

Author: Nivedithaa Mahendran

src/mas/devops/users.py

@@ -228,30 +228,36 @@ def get_or_create_user(self, payload):
         """
         Get an existing user or create a new one if not found.
 
-        This method is idempotent - if the user already exists (identified by payload["id"]),
-        their existing record is returned without modification. If the user doesn't exist,
-        they are created with the provided payload.
+        This method is idempotent - if the user already exists (identified by payload["id"]
+        for version < 9.1 or payload["personid"] for version >= 9.1), their existing record
+        is returned without modification. If the user doesn't exist, they are created with
+        the provided payload.
 
         For MAS version >= 9.1, this method uses the Manage API masapiuser endpoint.
         For earlier versions, it uses the Core API v3/users endpoint.
 
         Args:
             payload (dict): User definition dictionary containing user details.
-                          Must include "id" field as the unique identifier.
+                          Must include "id" field (version < 9.1) or "personid" field
+                          (version >= 9.1) as the unique identifier.
 
         Returns:
             dict: The user record (either existing or newly created).
 
         Raises:
             Exception: If user creation fails with an unexpected status code.
         """
-        existing_user = self.get_user(payload["id"])
+        # Determine the user ID field based on version
+        user_id_field = "personid" if Version(self.mas_version) >= Version('9.1') else "id"
+        user_id = payload[user_id_field]
+
+        existing_user = self.get_user(user_id)
 
         if existing_user is not None:
             self.logger.info(f"Existing user {existing_user['id']} found")
             return existing_user
 
-        self.logger.info(f"Creating new user {payload['id']}")
+        self.logger.info(f"Creating new user {user_id}")
 
         # For MAS version >= 9.1, use the Manage API masapiuser endpoint
         if Version(self.mas_version) >= Version('9.1'):
@@ -266,7 +272,7 @@ def get_or_create_user(self, payload):
                 "Content-Type": "application/json",
                 "apikey": maxadmin_manage_api_key["apikey"]
             }
-            self.logger.info(f"Creating new user {payload['id']} with Manage API with payload {payload}")
+            self.logger.info(f"Creating new user {user_id} with Manage API with payload {payload}")
             response = requests.post(
                 url,
                 json=payload,

test/src/test_users.py

@@ -367,10 +367,17 @@ def test_get_or_create_user_exists(user_utils, requests_mock, mock_manage_api_ke
         request_headers={"apikey": mock_manage_api_key["apikey"]},
         json={"id": user_id},
         status_code=201,
-        additional_matcher=lambda req: additional_matcher(req, json={"id": user_id}, cert=PEM_PATH)
+        additional_matcher=lambda req: additional_matcher(req, json={"personid": user_id}, cert=PEM_PATH)
     )
 
-    assert user_utils.get_or_create_user({"id": user_id}) == {"id": user_id, "displayName": user_id}
+    # Use correct payload structure based on version
+    from packaging.version import Version
+    if Version(user_utils.mas_version) >= Version('9.1'):
+        payload = {"personid": user_id}
+    else:
+        payload = {"id": user_id}
+
+    assert user_utils.get_or_create_user(payload) == {"id": user_id, "displayName": user_id}
     assert get.call_count == 1
     assert post_core.call_count == 0
     assert post_manage.call_count == 0
@@ -395,10 +402,17 @@ def test_get_or_create_user_notfound(user_utils, requests_mock, mock_manage_api_
         request_headers={"apikey": mock_manage_api_key["apikey"]},
         json={"id": user_id, "displayName": user_id},
         status_code=201,
-        additional_matcher=lambda req: additional_matcher(req, json={"id": user_id}, cert=PEM_PATH)
+        additional_matcher=lambda req: additional_matcher(req, json={"personid": user_id}, cert=PEM_PATH)
     )
 
-    assert user_utils.get_or_create_user({"id": user_id}) == {"id": user_id, "displayName": user_id}
+    # Use correct payload structure based on version
+    from packaging.version import Version
+    if Version(user_utils.mas_version) >= Version('9.1'):
+        payload = {"personid": user_id}
+    else:
+        payload = {"id": user_id}
+
+    assert user_utils.get_or_create_user(payload) == {"id": user_id, "displayName": user_id}
     assert get.call_count == 1
     # Check that the correct endpoint was called based on version
     if user_utils.mas_version >= '9.1':
@@ -428,11 +442,18 @@ def test_get_or_create_user_error(user_utils, requests_mock, mock_manage_api_key
         request_headers={"apikey": mock_manage_api_key["apikey"]},
         json={"error": "unknown"},
         status_code=500,
-        additional_matcher=lambda req: additional_matcher(req, json={"id": user_id}, cert=PEM_PATH)
+        additional_matcher=lambda req: additional_matcher(req, json={"personid": user_id}, cert=PEM_PATH)
     )
 
+    # Use correct payload structure based on version
+    from packaging.version import Version
+    if Version(user_utils.mas_version) >= Version('9.1'):
+        payload = {"personid": user_id}
+    else:
+        payload = {"id": user_id}
+
     with pytest.raises(Exception):
-        user_utils.get_or_create_user({"id": user_id})
+        user_utils.get_or_create_user(payload)
     assert get.call_count == 1
     # Check that the correct endpoint was called based on version
     if user_utils.mas_version >= '9.1':