Allow clientId hint when using Managed Identity

grafana · Jun 20, 2024 · f0bcf34 · f0bcf34
1 parent c271284
commit f0bcf34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/azcredentials/builder.go b/azcredentials/builder.go
@@ -48,6 +48,15 @@ func getFromCredentialsObject(credentialsObj map[string]interface{}, secureData
 
 	case AzureAuthManagedIdentity:
 		credentials := &AzureManagedIdentityCredentials{}
+
+		clientId, err := maputil.GetStringOptional(credentialsObj, "clientId")
+		if err != nil {
+			return nil, err
+		}
+		if clientId != "" {
+			credentials.ClientId = clientId
+		}
+
 		return credentials, nil
 
 	case AzureAuthWorkloadIdentity:

diff --git a/azcredentials/builder_test.go b/azcredentials/builder_test.go
@@ -149,6 +149,7 @@ func TestFromDatasourceData(t *testing.T) {
 		var data = map[string]interface{}{
 			"azureCredentials": map[string]interface{}{
 				"authType": "msi",
+				"clientId": "CLIENT-ID"
 			},
 		}
 		var secureData = map[string]string{}
@@ -161,7 +162,7 @@ func TestFromDatasourceData(t *testing.T) {
 		credential := (result).(*AzureManagedIdentityCredentials)
 
 		// ClientId currently not parsed
-		assert.Equal(t, credential.ClientId, "")
+		assert.Equal(t, credential.ClientId, "CLIENT-ID")
 	})
 
 	t.Run("should return workload identity credentials when workload identity auth configured", func(t *testing.T) {