From ada42d7d7c480bdce1b026b03e0305a97e481f31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adria=CC=80=20Sala?= <asala@redhat.com>
Date: Tue, 21 Jan 2025 12:55:24 +0100
Subject: [PATCH] fix: azure credential awxkit client_id collision

---
 awxkit/awxkit/api/pages/credentials.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/awxkit/awxkit/api/pages/credentials.py b/awxkit/awxkit/api/pages/credentials.py
index 75c724a8d522..d7d95aa18b41 100644
--- a/awxkit/awxkit/api/pages/credentials.py
+++ b/awxkit/awxkit/api/pages/credentials.py
@@ -134,6 +134,8 @@ def get_payload_field_and_value_from_kwargs_or_config_cred(field, kind, kwargs,
         config_field = 'ad_user'
     elif field == 'client':
         config_field = 'client_id'
+    elif field == 'client_id' and 'azure' in kind:  # Needed to avoid service account client_id collision
+        config_field = ''
     elif field == 'authorize_password':
         config_field = 'authorize'
     else: