Use directly the ComponentID in configauth (#4238)

Depends on #4237

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

config/configauth/configauth.go

@@ -28,60 +28,45 @@ var (
 
 // Authentication defines the auth settings for the receiver.
 type Authentication struct {
-	// AuthenticatorName specifies the name of the extension to use in order to authenticate the incoming data point.
-	AuthenticatorName string `mapstructure:"authenticator"`
+	// AuthenticatorID specifies the name of the extension to use in order to authenticate the incoming data point.
+	AuthenticatorID config.ComponentID `mapstructure:"authenticator"`
 }
 
 // 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 ext, found := extensions[a.AuthenticatorID]; found {
 		if auth, ok := ext.(ServerAuthenticator); ok {
 			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)
+	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", a.AuthenticatorID, 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 ext, found := extensions[a.AuthenticatorID]; 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)
+	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", a.AuthenticatorID, 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 ext, found := extensions[a.AuthenticatorID]; 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)
+	return nil, fmt.Errorf("failed to resolve authenticator %q: %w", a.AuthenticatorID, errAuthenticatorNotFound)
 }

config/configauth/configauth_test.go

@@ -26,7 +26,7 @@ import (
 func TestGetAuthenticator(t *testing.T) {
 	// prepare
 	cfg := &Authentication{
-		AuthenticatorName: "mock",
+		AuthenticatorID: config.NewComponentID("mock"),
 	}
 	ext := map[config.ComponentID]component.Extension{
 		config.NewComponentID("mock"): &MockAuthenticator{},
@@ -49,7 +49,7 @@ func TestGetAuthenticatorFails(t *testing.T) {
 		{
 			desc: "ServerAuthenticator not found",
 			cfg: &Authentication{
-				AuthenticatorName: "does-not-exist",
+				AuthenticatorID: config.NewComponentID("does-not-exist"),
 			},
 			ext:      map[config.ComponentID]component.Extension{},
 			expected: errAuthenticatorNotFound,

config/configgrpc/configgrpc_test.go

@@ -66,7 +66,7 @@ func TestAllGrpcClientSettings(t *testing.T) {
 		WriteBufferSize: 1024,
 		WaitForReady:    true,
 		BalancerName:    "round_robin",
-		Auth:            &configauth.Authentication{AuthenticatorName: "testauth"},
+		Auth:            &configauth.Authentication{AuthenticatorID: config.NewComponentID("testauth")},
 	}
 
 	host := &mockHost{
@@ -133,7 +133,7 @@ func TestGrpcServerAuthSettings(t *testing.T) {
 
 	// test
 	gss.Auth = &configauth.Authentication{
-		AuthenticatorName: "mock",
+		AuthenticatorID: config.NewComponentID("mock"),
 	}
 	host := &mockHost{
 		ext: map[config.ComponentID]component.Extension{
@@ -208,29 +208,19 @@ func TestGRPCClientSettingsError(t *testing.T) {
 				BalancerName:    "test",
 			},
 		},
-		{
-			err: "id must not be empty",
-			settings: GRPCClientSettings{
-				Endpoint: "localhost:1234",
-				Auth:     &configauth.Authentication{},
-			},
-			host: &mockHost{ext: map[config.ComponentID]component.Extension{
-				config.NewComponentID("mock"): &configauth.MockClientAuthenticator{},
-			}},
-		},
 		{
 			err: "failed to resolve authenticator \"doesntexist\": authenticator not found",
 			settings: GRPCClientSettings{
 				Endpoint: "localhost:1234",
-				Auth:     &configauth.Authentication{AuthenticatorName: "doesntexist"},
+				Auth:     &configauth.Authentication{AuthenticatorID: config.NewComponentID("doesntexist")},
 			},
 			host: &mockHost{ext: map[config.ComponentID]component.Extension{}},
 		},
 		{
 			err: "no extensions configuration available",
 			settings: GRPCClientSettings{
 				Endpoint: "localhost:1234",
-				Auth:     &configauth.Authentication{AuthenticatorName: "doesntexist"},
+				Auth:     &configauth.Authentication{AuthenticatorID: config.NewComponentID("doesntexist")},
 			},
 			host: &mockHost{},
 		},

config/confighttp/confighttp_test.go

@@ -131,14 +131,7 @@ func TestHTTPClientSettingsError(t *testing.T) {
 			err: "failed to resolve authenticator \"dummy\": authenticator not found",
 			settings: HTTPClientSettings{
 				Endpoint: "https://localhost:1234/v1/traces",
-				Auth:     &configauth.Authentication{AuthenticatorName: "dummy"},
-			},
-		},
-		{
-			err: "id must not be empty",
-			settings: HTTPClientSettings{
-				Endpoint: "https://localhost:1234/v1/traces",
-				Auth:     &configauth.Authentication{AuthenticatorName: ""},
+				Auth:     &configauth.Authentication{AuthenticatorID: config.NewComponentID("dummy")},
 			},
 		},
 	}
@@ -174,7 +167,7 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			name: "with_auth_configuration_and_no_extension",
 			settings: HTTPClientSettings{
 				Endpoint: "localhost:1234",
-				Auth:     &configauth.Authentication{AuthenticatorName: "dummy"},
+				Auth:     &configauth.Authentication{AuthenticatorID: config.NewComponentID("dummy")},
 			},
 			shouldErr: true,
 			extensionMap: map[config.ComponentID]component.Extension{
@@ -185,15 +178,15 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			name: "with_auth_configuration_and_no_extension_map",
 			settings: HTTPClientSettings{
 				Endpoint: "localhost:1234",
-				Auth:     &configauth.Authentication{AuthenticatorName: "dummy"},
+				Auth:     &configauth.Authentication{AuthenticatorID: config.NewComponentID("dummy")},
 			},
 			shouldErr: true,
 		},
 		{
 			name: "with_auth_configuration_has_extension",
 			settings: HTTPClientSettings{
 				Endpoint: "localhost:1234",
-				Auth:     &configauth.Authentication{AuthenticatorName: "mock"},
+				Auth:     &configauth.Authentication{AuthenticatorID: config.NewComponentID("mock")},
 			},
 			shouldErr: false,
 			extensionMap: map[config.ComponentID]component.Extension{
@@ -204,7 +197,7 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
 			name: "with_auth_configuration_has_err_extension",
 			settings: HTTPClientSettings{
 				Endpoint: "localhost:1234",
-				Auth:     &configauth.Authentication{AuthenticatorName: "mock"},
+				Auth:     &configauth.Authentication{AuthenticatorID: config.NewComponentID("mock")},
 			},
 			shouldErr: true,
 			extensionMap: map[config.ComponentID]component.Extension{

exporter/otlpexporter/config_test.go

@@ -85,7 +85,7 @@ func TestLoadConfig(t *testing.T) {
 				},
 				WriteBufferSize: 512 * 1024,
 				BalancerName:    "round_robin",
-				Auth:            &configauth.Authentication{AuthenticatorName: "nop"},
+				Auth:            &configauth.Authentication{AuthenticatorID: config.NewComponentID("nop")},
 			},
 		})
 }