Merge pull request #3184 from cupakob/remove-redundant-type-conversion

🌱 Remove redundant type conversion

Author: kcp-ci-bot

pkg/logging/constants.go

@@ -84,13 +84,13 @@ func From(obj Object) []interface{} {
 func FromPrefix(prefix string, obj Object) []interface{} {
 	gvk := obj.GetObjectKind().GroupVersionKind()
 	return []interface{}{
-		prefix + "." + string(WorkspaceKey),
+		prefix + "." + WorkspaceKey,
 		logicalcluster.From(obj).String(),
-		prefix + "." + string(NamespaceKey),
+		prefix + "." + NamespaceKey,
 		obj.GetNamespace(),
-		prefix + "." + string(NameKey),
+		prefix + "." + NameKey,
 		obj.GetName(),
-		prefix + "." + string(APIVersionKey),
+		prefix + "." + APIVersionKey,
 		gvk.GroupVersion(),
 	}
 }

pkg/proxy/options/authentication.go

@@ -27,7 +27,6 @@ import (
 	"github.com/spf13/pflag"
 
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	"k8s.io/client-go/rest"
@@ -106,7 +105,7 @@ func (c *Authentication) ApplyTo(ctx context.Context, authenticationInfo *generi
 	if c.serviceAccountAuthEnabled() {
 		authenticationInfo.APIAudiences = c.BuiltInOptions.APIAudiences
 		if len(c.BuiltInOptions.ServiceAccounts.Issuers) != 0 && len(c.BuiltInOptions.APIAudiences) == 0 {
-			authenticationInfo.APIAudiences = authenticator.Audiences(c.BuiltInOptions.ServiceAccounts.Issuers)
+			authenticationInfo.APIAudiences = c.BuiltInOptions.ServiceAccounts.Issuers
 		}
 
 		config := rest.CopyConfig(rootShardConfig)

pkg/server/filters/filters.go

@@ -76,14 +76,14 @@ func init() {
 // WithAuditEventClusterAnnotation adds the cluster name into the annotation of an audit
 // event. Needs initialized annotations.
 func WithAuditEventClusterAnnotation(handler http.Handler) http.HandlerFunc {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	return func(w http.ResponseWriter, req *http.Request) {
 		cluster := request.ClusterFrom(req.Context())
 		if cluster != nil {
 			kaudit.AddAuditAnnotation(req.Context(), workspaceAnnotation, cluster.Name.String())
 		}
 
 		handler.ServeHTTP(w, req)
-	})
+	}
 }
 
 // WithBlockInactiveLogicalClusters ensures that any requests to logical
@@ -94,7 +94,7 @@ func WithBlockInactiveLogicalClusters(handler http.Handler, kcpClusterClient inf
 		"/apis/core.kcp.io/v1alpha1/logicalclusters",
 	}
 
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+	return func(w http.ResponseWriter, req *http.Request) {
 		_, newURL, _, err := ClusterPathFromAndStrip(req)
 		if err != nil {
 			responsewriters.InternalError(w, req, err)
@@ -126,7 +126,7 @@ func WithBlockInactiveLogicalClusters(handler http.Handler, kcpClusterClient inf
 		}
 
 		handler.ServeHTTP(w, req)
-	})
+	}
 }
 
 // WithClusterScope reads a cluster name from the URL path and puts it into the context.

pkg/virtual/apiexport/authorizer/content_test.go

@@ -61,7 +61,7 @@ func TestContentAuthorizer(t *testing.T) {
 				}),
 			}
 
-			ctx := dynamiccontext.WithAPIDomainKey(context.Background(), dynamiccontext.APIDomainKey("foo/bar"))
+			ctx := dynamiccontext.WithAPIDomainKey(context.Background(), "foo/bar")
 			dec, _, err := auth.Authorize(ctx, &authorizer.AttributesRecord{
 				User: &user.DefaultInfo{},
 			})

pkg/virtual/initializingworkspaces/builder/build.go

@@ -322,12 +322,12 @@ func digestUrl(urlPath, rootPathPrefix string) (
 	// Where the withoutRootPathPrefix starts here: ┘
 	parts := strings.SplitN(withoutRootPathPrefix, "/", 2)
 	if len(parts) < 2 {
-		return genericapirequest.Cluster{}, dynamiccontext.APIDomainKey(""), "", false
+		return genericapirequest.Cluster{}, "", "", false
 	}
 
 	initializerName := parts[0]
 	if initializerName == "" {
-		return genericapirequest.Cluster{}, dynamiccontext.APIDomainKey(""), "", false
+		return genericapirequest.Cluster{}, "", "", false
 	}
 
 	realPath := "/" + parts[1]
@@ -337,7 +337,7 @@ func digestUrl(urlPath, rootPathPrefix string) (
 	// We are now here: ┘
 	// Now, we parse out the logical cluster.
 	if !strings.HasPrefix(realPath, "/clusters/") {
-		return genericapirequest.Cluster{}, dynamiccontext.APIDomainKey(""), "", false // don't accept
+		return genericapirequest.Cluster{}, "", "", false // don't accept
 	}
 
 	withoutClustersPrefix := strings.TrimPrefix(realPath, "/clusters/")