linting

internal/impl/kafka/sasl.go

@@ -150,9 +150,6 @@ func oauthSaslFromConfig(c *service.ParsedConfig) (sasl.Mechanism, error) {
 	token, err := c.FieldString("token")
 
 	if err != nil && token != "" {
-		if err != nil {
-			return nil, err
-		}
 		var extensions map[string]string
 		if c.Contains("extensions") {
 			if extensions, err = c.FieldStringMap("extensions"); err != nil {
@@ -181,7 +178,7 @@ func acquireToken(ctx context.Context, c *service.ParsedConfig) (string, error)
 		return "", err
 	}
 
-	clientId, err := c.FieldString("clientId")
+	clientID, err := c.FieldString("clientId")
 	if err != nil {
 		return "", err
 	}
@@ -196,7 +193,7 @@ func acquireToken(ctx context.Context, c *service.ParsedConfig) (string, error)
 		return "", err
 	}
 
-	authHeaderValue := base64.StdEncoding.EncodeToString([]byte(clientId + ":" + clientSecret))
+	authHeaderValue := base64.StdEncoding.EncodeToString([]byte(clientID + ":" + clientSecret))
 
 	queryParams := url.Values{}
 	queryParams.Set("grant_type", "client_credentials")
@@ -239,7 +236,7 @@ func acquireToken(ctx context.Context, c *service.ParsedConfig) (string, error)
 
 	accessToken, ok := tokenResponse["access_token"].(string)
 	if !ok {
-		return "", fmt.Errorf("access_token not found in token response")
+		return "", errors.New("access_token not found in token response")
 	}
 
 	return accessToken, nil

internal/impl/opensearch/auth.go

@@ -24,7 +24,7 @@ const (
 	aFieldAuthTokenCache        = "token_cache"
 	aFieldAuthTokenKey          = "token_key"
 	aFieldAuthTokenEndpoint     = "tokenEndpoint"
-	aFieldAuthTokenClientId     = "clientId"
+	aFieldAuthTokenClientID     = "clientId"
 	aFieldAuthTokenClientSecret = "clientSecret"
 	aFieldAuthTokenScope        = "scope"
 )
@@ -44,7 +44,7 @@ func OAuthAuthField() *service.ConfigField {
 		service.NewStringField(aFieldAuthTokenEndpoint).
 			Description("The endpoint to use for OAUTHBEARER token acquisition.").
 			Default(""),
-		service.NewStringField(aFieldAuthTokenClientId).
+		service.NewStringField(aFieldAuthTokenClientID).
 			Description("The client ID to use for OAUTHBEARER token acquisition.").
 			Default(""),
 		service.NewStringField(aFieldAuthTokenClientSecret).
@@ -84,7 +84,7 @@ func oAuthFromParsed(conf *service.ParsedConfig) (res OAuthConfig, err error) {
 		if res.TokenEndpoint, err = conf.FieldString(aFieldAuthTokenEndpoint); err != nil {
 			return
 		}
-		if res.ClientId, err = conf.FieldString(aFieldAuthTokenClientId); err != nil {
+		if res.ClientID, err = conf.FieldString(aFieldAuthTokenClientID); err != nil {
 			return
 		}
 		if res.ClientSecret, err = conf.FieldString(aFieldAuthTokenClientSecret); err != nil {
@@ -103,7 +103,7 @@ type OAuthConfig struct {
 	TokenCacheName    string
 	TokenCacheKey     string
 	TokenEndpoint     string
-	ClientId          string
+	ClientID          string
 	ClientSecret      string
 	Scope             string
 }
@@ -132,7 +132,7 @@ func (c *OAuthConfig) GetCachedToken(mgr *service.Resources) (*oauth2.Token, err
 
 func (c *OAuthConfig) GetToken(ctx context.Context) (*oauth2.Token, error) {
 
-	authHeaderValue := base64.StdEncoding.EncodeToString([]byte(c.ClientId + ":" + c.ClientSecret))
+	authHeaderValue := base64.StdEncoding.EncodeToString([]byte(c.ClientID + ":" + c.ClientSecret))
 
 	queryParams := url.Values{}
 	queryParams.Set("grant_type", "client_credentials")
@@ -188,7 +188,7 @@ func NewOAuth2Config() OAuthConfig {
 		TokenCacheName:    "",
 		TokenCacheKey:     "",
 		TokenEndpoint:     "",
-		ClientId:          "",
+		ClientID:          "",
 		ClientSecret:      "",
 		Scope:             "",
 	}