Refactor configauth, getters use the map instead of iteration

config/configauth/clientauth.go

@@ -15,13 +15,11 @@
 package configauth // import "go.opentelemetry.io/collector/config/configauth"
 
 import (
-	"fmt"
 	"net/http"
 
 	"google.golang.org/grpc/credentials"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config"
 )
 
 // ClientAuthenticator is an Extension that can be used as an authenticator for the configauth.Authentication option.
@@ -44,35 +42,3 @@ type GRPCClientAuthenticator interface {
 	ClientAuthenticator
 	PerRPCCredentials() (credentials.PerRPCCredentials, error)
 }
-
-// GetHTTPClientAuthenticator attempts to select the appropriate HTTPClientAuthenticator from the list of extensions,
-// based on the component id of the extension. If an authenticator is not found, an error is returned.
-// This should be only used by HTTP clients.
-func GetHTTPClientAuthenticator(extensions map[config.ComponentID]component.Extension,
-	componentID config.ComponentID) (HTTPClientAuthenticator, error) {
-	for id, ext := range extensions {
-		if id == componentID {
-			if auth, ok := ext.(HTTPClientAuthenticator); ok {
-				return auth, nil
-			}
-			return nil, fmt.Errorf("requested authenticator is not for HTTP clients")
-		}
-	}
-	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", componentID.String(), errAuthenticatorNotFound)
-}
-
-// GetGRPCClientAuthenticator attempts to select the appropriate GRPCClientAuthenticator from the list of extensions,
-// based on the component id of the extension. If an authenticator is not found, an error is returned.
-// This should only be used by gRPC clients.
-func GetGRPCClientAuthenticator(extensions map[config.ComponentID]component.Extension,
-	componentID config.ComponentID) (GRPCClientAuthenticator, error) {
-	for id, ext := range extensions {
-		if id == componentID {
-			if auth, ok := ext.(GRPCClientAuthenticator); ok {
-				return auth, nil
-			}
-			return nil, fmt.Errorf("requested authenticator is not for gRPC clients")
-		}
-	}
-	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", componentID.String(), errAuthenticatorNotFound)
-}

config/configauth/configauth.go

@@ -32,16 +32,56 @@ type Authentication struct {
 	AuthenticatorName string `mapstructure:"authenticator"`
 }
 
-// GetServerAuthenticator attempts to select the appropriate from the list of extensions, based on the requested extension name.
-// If an authenticator is not found, an error is returned.
-func GetServerAuthenticator(extensions map[config.ComponentID]component.Extension, componentID config.ComponentID) (ServerAuthenticator, error) {
-	for id, ext := range extensions {
+// GetServerAuthenticator attempts to select the appropriate ServerAuthenticator from the list of extensions,
+// based on the requested extension name. If an authenticator is not found, an error is returned.
+func (a Authentication) GetServerAuthenticator(extensions map[config.ComponentID]component.Extension) (ServerAuthenticator, error) {
+	componentID, err := config.NewComponentIDFromString(a.AuthenticatorName)
+	if err != nil {
+		return nil, err
+	}
+
+	if ext, found := extensions[componentID]; found {
 		if auth, ok := ext.(ServerAuthenticator); ok {
-			if id == componentID {
-				return auth, nil
-			}
+			return auth, nil
+		}
+		return nil, fmt.Errorf("requested authenticator is not a server authenticator")
+	}
+
+	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", componentID.String(), errAuthenticatorNotFound)
+}
+
+// GetHTTPClientAuthenticator attempts to select the appropriate HTTPClientAuthenticator from the list of extensions,
+// based on the component id of the extension. If an authenticator is not found, an error is returned.
+// This should be only used by HTTP clients.
+func (a Authentication) GetHTTPClientAuthenticator(extensions map[config.ComponentID]component.Extension) (HTTPClientAuthenticator, error) {
+	componentID, err := config.NewComponentIDFromString(a.AuthenticatorName)
+	if err != nil {
+		return nil, err
+	}
+
+	if ext, found := extensions[componentID]; found {
+		if auth, ok := ext.(HTTPClientAuthenticator); ok {
+			return auth, nil
 		}
+		return nil, fmt.Errorf("requested authenticator is not a HTTPClientAuthenticator")
+	}
+	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", componentID.String(), errAuthenticatorNotFound)
+}
+
+// GetGRPCClientAuthenticator attempts to select the appropriate GRPCClientAuthenticator from the list of extensions,
+// based on the component id of the extension. If an authenticator is not found, an error is returned.
+// This should only be used by gRPC clients.
+func (a Authentication) GetGRPCClientAuthenticator(extensions map[config.ComponentID]component.Extension) (GRPCClientAuthenticator, error) {
+	componentID, err := config.NewComponentIDFromString(a.AuthenticatorName)
+	if err != nil {
+		return nil, err
 	}
 
+	if ext, found := extensions[componentID]; found {
+		if auth, ok := ext.(GRPCClientAuthenticator); ok {
+			return auth, nil
+		}
+		return nil, fmt.Errorf("requested authenticator is not a GRPCClientAuthenticator")
+	}
 	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", componentID.String(), errAuthenticatorNotFound)
 }

config/configauth/configauth_test.go

@@ -32,11 +32,7 @@ func TestGetAuthenticator(t *testing.T) {
 		config.NewComponentID("mock"): &MockAuthenticator{},
 	}
 
-	// test
-	componentID, err := config.NewComponentIDFromString(cfg.AuthenticatorName)
-	assert.NoError(t, err)
-
-	authenticator, err := GetServerAuthenticator(ext, componentID)
+	authenticator, err := cfg.GetServerAuthenticator(ext)
 
 	// verify
 	assert.NoError(t, err)
@@ -61,9 +57,7 @@ func TestGetAuthenticatorFails(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.desc, func(t *testing.T) {
-			componentID, err := config.NewComponentIDFromString(tC.cfg.AuthenticatorName)
-			assert.NoError(t, err)
-			authenticator, err := GetServerAuthenticator(tC.ext, componentID)
+			authenticator, err := tC.cfg.GetServerAuthenticator(tC.ext)
 			assert.ErrorIs(t, err, tC.expected)
 			assert.Nil(t, authenticator)
 		})

config/configgrpc/configgrpc.go

@@ -30,7 +30,6 @@ import (
 	"google.golang.org/grpc/keepalive"
 
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/config/configauth"
 	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configtls"
@@ -223,12 +222,7 @@ func (gcs *GRPCClientSettings) ToDialOptions(host component.Host) ([]grpc.DialOp
 			return nil, fmt.Errorf("no extensions configuration available")
 		}
 
-		componentID, cperr := config.NewComponentIDFromString(gcs.Auth.AuthenticatorName)
-		if cperr != nil {
-			return nil, cperr
-		}
-
-		grpcAuthenticator, cerr := configauth.GetGRPCClientAuthenticator(host.GetExtensions(), componentID)
+		grpcAuthenticator, cerr := gcs.Auth.GetGRPCClientAuthenticator(host.GetExtensions())
 		if cerr != nil {
 			return nil, cerr
 		}
@@ -325,16 +319,11 @@ func (gss *GRPCServerSettings) ToServerOption(host component.Host, settings comp
 		}
 	}
 
-	uInterceptors := []grpc.UnaryServerInterceptor{}
-	sInterceptors := []grpc.StreamServerInterceptor{}
+	var uInterceptors []grpc.UnaryServerInterceptor
+	var sInterceptors []grpc.StreamServerInterceptor
 
 	if gss.Auth != nil {
-		componentID, cperr := config.NewComponentIDFromString(gss.Auth.AuthenticatorName)
-		if cperr != nil {
-			return nil, cperr
-		}
-
-		authenticator, err := configauth.GetServerAuthenticator(host.GetExtensions(), componentID)
+		authenticator, err := gss.Auth.GetServerAuthenticator(host.GetExtensions())
 		if err != nil {
 			return nil, err
 		}

config/confighttp/confighttp.go

@@ -90,12 +90,7 @@ func (hcs *HTTPClientSettings) ToClient(ext map[config.ComponentID]component.Ext
 			return nil, fmt.Errorf("extensions configuration not found")
 		}
 
-		componentID, cperr := config.NewComponentIDFromString(hcs.Auth.AuthenticatorName)
-		if cperr != nil {
-			return nil, cperr
-		}
-
-		httpCustomAuthRoundTripper, aerr := configauth.GetHTTPClientAuthenticator(ext, componentID)
+		httpCustomAuthRoundTripper, aerr := hcs.Auth.GetHTTPClientAuthenticator(ext)
 		if aerr != nil {
 			return nil, aerr
 		}