remove unneeded parameter since we're now relying on the context

On-behalf-of: @SAP [email protected]

Author: xrstf

pkg/authentication/filters.go

@@ -25,11 +25,11 @@ import (
 	"github.com/kcp-dev/kcp/pkg/proxy/lookup"
 )
 
-// WithWorkspaceAuthentication looks up the target cluster in the given auth index
+// WithWorkspaceAuthResolver looks up the target cluster in the given auth index
 // to populate a possible workspace authenticator in the request's context. This
 // is used to let other middlewares know about the existence of additional auth
 // options.
-func WithWorkspaceAuthentication(handler http.Handler, authIndex AuthenticatorIndex) http.Handler {
+func WithWorkspaceAuthResolver(handler http.Handler, authIndex AuthenticatorIndex) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 		wsType := lookup.WorkspaceTypeFrom(req.Context())
 		if wsType.Empty() {

pkg/authentication/workspace.go

@@ -22,14 +22,10 @@ import (
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 )
 
-type workspaceAuthenticator struct {
-	authIndex AuthenticatorIndex
-}
+type workspaceAuthenticator struct{}
 
-func NewWorkspaceAuthenticator(authIndex AuthenticatorIndex) authenticator.Request {
-	return &workspaceAuthenticator{
-		authIndex: authIndex,
-	}
+func NewWorkspaceAuthenticator() authenticator.Request {
+	return &workspaceAuthenticator{}
 }
 
 func (a *workspaceAuthenticator) AuthenticateRequest(req *http.Request) (*authenticator.Response, bool, error) {

pkg/proxy/server.go

@@ -121,7 +121,7 @@ func NewServer(ctx context.Context, c CompletedConfig) (*Server, error) {
 		// a custom authenticator exists or not. This needs to be determined before
 		// the optionalAuthentication middleware can run, as it needs to know about
 		// the workspace authenticator.
-		handler = authentication.WithWorkspaceAuthentication(handler, s.AuthController)
+		handler = authentication.WithWorkspaceAuthResolver(handler, s.AuthController)
 	}
 
 	if hasShardMapping {

pkg/server/config.go

@@ -470,7 +470,7 @@ func NewConfig(ctx context.Context, opts kcpserveroptions.CompletedOptions) (*Co
 
 			genericConfig.Authentication.Authenticator = authenticatorunion.New(
 				genericConfig.Authentication.Authenticator,
-				authentication.NewWorkspaceAuthenticator(authIndexState),
+				authentication.NewWorkspaceAuthenticator(),
 			)
 
 			authIndex = authIndexState
@@ -491,7 +491,7 @@ func NewConfig(ctx context.Context, opts kcpserveroptions.CompletedOptions) (*Co
 		// the authentication middleware can run, as it needs to know about the
 		// workspace authenticator.
 		if kcpfeatures.DefaultFeatureGate.Enabled(kcpfeatures.WorkspaceAuthentication) {
-			apiHandler = authentication.WithWorkspaceAuthentication(apiHandler, authIndex)
+			apiHandler = authentication.WithWorkspaceAuthResolver(apiHandler, authIndex)
 		}
 
 		// this will be replaced in DefaultBuildHandlerChain. So at worst we get twice as many warning.