use azureInputConfig instead of authConfig

Author: kaiyan-sheng

docs/reference/filebeat/filebeat-input-azure-eventhub.md

@@ -85,12 +85,10 @@ For detailed instructions on how to set up an Azure AD service principal and con
 
 The `azure-eventhub` input supports the following configuration options:
 
-
 ### `eventhub` [_eventhub]
 
 The name of the eventhub users would like to read from, field required.
 
-
 ### `consumer_group` [_consumer_group]
 
 Optional, we recommend using a dedicated consumer group for the azure input. Reusing consumer groups among non-related consumers can cause unexpected behavior and possibly lost events.
@@ -118,7 +116,6 @@ This option is required if:
 
 A Blob Storage account is required to store, retrieve, or update the offset or state of the Event Hub messages. This means that after stopping Filebeat it can resume from where it stopped processing messages.
 
-
 ### `eventhub_namespace` [_eventhub_namespace]
 
 ```{applies_to}
@@ -164,27 +161,22 @@ Supported values:
 - `https://login.microsoftonline.us` (Azure Government)
 - `https://login.chinacloudapi.cn` (Azure China)
 
-
 ### `storage_account` [_storage_account]
 
 The name of the storage account. Required.
 
-
 ### `storage_account_key` [_storage_account_key]
 
 The storage account key, this key will be used to authorize access to data in your storage account, option is required.
 
-
 ### `storage_account_container` [_storage_account_container]
 
 Optional, the name of the storage account container you would like to store the offset information in.
 
-
 ### `resource_manager_endpoint` [_resource_manager_endpoint]
 
 Optional, by default we are using the azure public environment, to override, users can provide a specific resource manager endpoint in order to use a different azure environment. Ex: [https://management.chinacloudapi.cn/](https://management.chinacloudapi.cn/) for azure ChinaCloud [https://management.microsoftazure.de/](https://management.microsoftazure.de/) for azure GermanCloud [https://management.azure.com/](https://management.azure.com/) for azure PublicCloud [https://management.usgovcloudapi.net/](https://management.usgovcloudapi.net/) for azure USGovernmentCloud Users can also use this in case of a Hybrid Cloud model, where one may define their own endpoints.
 
-
 ## Metrics [_metrics_3]
 
 This input exposes metrics under the [HTTP monitoring endpoint](/reference/filebeat/http-endpoint.md). These metrics are exposed under the `/inputs` path. They can be used to observe the activity of the input.

x-pack/filebeat/input/azureeventhub/auth.go

@@ -24,24 +24,6 @@ const (
 	AuthTypeClientSecret string = "client_secret"
 )
 
-// authConfig represents the authentication configuration.
-type authConfig struct {
-	// AuthType specifies the authentication method to use.
-	// If not specified, will be inferred from other fields:
-	// - If connection_string is provided, defaults to connection_string
-	// - Otherwise, defaults to client_secret
-	AuthType string
-
-	// Connection string authentication
-	ConnectionString string
-
-	// Client secret authentication
-	TenantID      string
-	ClientID      string
-	ClientSecret  string
-	AuthorityHost string
-}
-
 // createCredential creates a TokenCredential if needed based on the authentication type.
 // Returns nil for connection_string authentication (which doesn't use credentials).
 func createCredential(cfg *azureInputConfig, log *logp.Logger) (azcore.TokenCredential, error) {
@@ -50,14 +32,7 @@ func createCredential(cfg *azureInputConfig, log *logp.Logger) (azcore.TokenCred
 		// No credential needed for connection string authentication
 		return nil, nil
 	case AuthTypeClientSecret:
-		credConfig := authConfig{
-			AuthType:      cfg.AuthType,
-			TenantID:      cfg.TenantID,
-			ClientID:      cfg.ClientID,
-			ClientSecret:  cfg.ClientSecret,
-			AuthorityHost: cfg.AuthorityHost,
-		}
-		credential, err := newClientSecretCredential(credConfig, log)
+		credential, err := newClientSecretCredential(cfg, log)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create client secret credential: %w", err)
 		}
@@ -196,4 +171,3 @@ func CreateStorageAccountContainerClient(cfg *azureInputConfig, log *logp.Logger
 		return nil, fmt.Errorf("invalid auth_type: %s", cfg.AuthType)
 	}
 }
-

x-pack/filebeat/input/azureeventhub/client_secret.go

@@ -17,7 +17,7 @@ import (
 )
 
 // newClientSecretCredential creates a new client secret credential(Oauth2).
-func newClientSecretCredential(config authConfig, log *logp.Logger) (azcore.TokenCredential, error) {
+func newClientSecretCredential(config *azureInputConfig, log *logp.Logger) (azcore.TokenCredential, error) {
 	log = log.Named("client_secret")
 
 	if config.TenantID == "" {

x-pack/filebeat/input/azureeventhub/config_test.go

@@ -422,7 +422,7 @@ func TestConnectionStringConfigValidation(t *testing.T) {
 				return c
 			}(),
 			expectError: true,
-			errorMsg:    "storage_account_connection_string is required when using connection_string authentication with processor v2",
+			errorMsg:    "no storage account connection string configured (config: storage_account_connection_string)",
 		},
 		{
 			name: "invalid auth_type",