fix: fix wronge merge resolution

Author: fege

tests/model_registry/rbac/test_mr_rbac_sa.py

@@ -4,7 +4,7 @@
 from typing import Self
 from simple_logger.logger import get_logger
 from model_registry import ModelRegistry as ModelRegistryClient
-from tests.model_registry.rbac.utils import get_mr_client_args
+from tests.model_registry.rbac.utils import build_mr_client_args
 from utilities.constants import DscComponents
 from mr_openapi.exceptions import ForbiddenException
 
@@ -50,7 +50,7 @@ def test_service_account_access_denied(
         LOGGER.info(f"Targeting Model Registry REST endpoint: {model_registry_instance_rest_endpoint}")
         LOGGER.info("Expecting initial access DENIAL (403 Forbidden)")
 
-        client_args = get_mr_client_args(
+        client_args = build_mr_client_args(
             rest_endpoint=model_registry_instance_rest_endpoint, token=sa_token, author="rbac-test-denied"
         )
         LOGGER.debug(f"Attempting client connection with args: {client_args}")
@@ -82,7 +82,7 @@ def test_service_account_access_granted(
         LOGGER.info("Applied RBAC Role/Binding via fixtures. Expecting access GRANT.")
 
         try:
-            client_args = get_mr_client_args(
+            client_args = build_mr_client_args(
                 rest_endpoint=model_registry_instance_rest_endpoint, token=sa_token, author="rbac-test-granted"
             )
             LOGGER.debug(f"Attempting client connection with args: {client_args}")