Update plugins/inputs/azure_monitor/azure_monitor.go

Co-authored-by: Sven Rebhan <36194019+srebhan@users.noreply.github.com>
influxdata · Jun 5, 2024 · 4d95995 · 4d95995
1 parent 3d818d9
commit 4d95995
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/plugins/inputs/azure_monitor/azure_monitor.go b/plugins/inputs/azure_monitor/azure_monitor.go
@@ -160,20 +160,16 @@ func (acm *azureClientsManager) createAzureClients(
 	clientID string,
 	clientSecret string,
 	tenantID string,
-) (azureClients *receiver.AzureClients, err error) {
-	var token azcore.TokenCredential
+) (*receiver.AzureClients, error) {
 	if clientSecret != "" {
-		azureClients, err = receiver.CreateAzureClients(subscriptionID, clientID, clientSecret, tenantID)
-	} else {
-		if token, err = azidentity.NewDefaultAzureCredential(&azidentity.DefaultAzureCredentialOptions{
-			TenantID: tenantID,
-		}); err == nil {
-			azureClients, err = receiver.CreateAzureClientsWithCreds(subscriptionID, token)
-		}
+		return receiver.CreateAzureClients(subscriptionID, clientID, clientSecret, tenantID)
 	}
+
+	token, err := azidentity.NewDefaultAzureCredential(&azidentity.DefaultAzureCredentialOptions{TenantID: tenantID})
 	if err != nil {
-		return nil, fmt.Errorf("error creating Azure clients: %w", err)
+		return nil, fmt.Errorf("error creating Azure token: %w", err)
 	}
+	return receiver.CreateAzureClientsWithCreds(subscriptionID, token)
 
 	return azureClients, nil
 }