Dedupe constants

Signed-off-by: Simo Sorce <[email protected]>

Author: simo5

pkg/oauthserver/api/types.go

@@ -14,8 +14,6 @@ const (
 	// If present, this extra value is used as the preferred username
 	IdentityPreferredUsernameKey = "preferred_username"
 
-	ImpersonateUserHeader      = "Impersonate-User"
-	ImpersonateGroupHeader     = "Impersonate-Group"
 	ImpersonateUserScopeHeader = "Impersonate-User-Scope"
 )
 

pkg/oauthserver/client/impersonate.go

@@ -3,6 +3,7 @@ package client
 import (
 	"net/http"
 
+	authenticationv1 "k8s.io/api/authentication/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
@@ -27,13 +28,13 @@ func newImpersonatingRoundTripper(user user.Info, delegate http.RoundTripper) ht
 
 func (rt *impersonatingRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	req = utilnet.CloneRequest(req)
-	req.Header.Del(authenticationapi.ImpersonateUserHeader)
-	req.Header.Del(authenticationapi.ImpersonateGroupHeader)
+	req.Header.Del(authenticationv1.ImpersonateUserHeader)
+	req.Header.Del(authenticationv1.ImpersonateGroupHeader)
 	req.Header.Del(authenticationapi.ImpersonateUserScopeHeader)
 
-	req.Header.Set(authenticationapi.ImpersonateUserHeader, rt.user.GetName())
+	req.Header.Set(authenticationv1.ImpersonateUserHeader, rt.user.GetName())
 	for _, group := range rt.user.GetGroups() {
-		req.Header.Add(authenticationapi.ImpersonateGroupHeader, group)
+		req.Header.Add(authenticationv1.ImpersonateGroupHeader, group)
 	}
 	for _, scope := range rt.user.GetExtra()[authorizationapi.ScopesKey] {
 		req.Header.Add(authenticationapi.ImpersonateUserScopeHeader, scope)
@@ -68,8 +69,8 @@ func NewImpersonatingRESTClient(user user.Info, client restclient.Interface) res
 
 // Verb does the impersonation per request by setting the proper headers
 func (c impersonatingRESTClient) impersonate(req *restclient.Request) *restclient.Request {
-	req.SetHeader(authenticationapi.ImpersonateUserHeader, c.user.GetName())
-	req.SetHeader(authenticationapi.ImpersonateGroupHeader, c.user.GetGroups()...)
+	req.SetHeader(authenticationv1.ImpersonateUserHeader, c.user.GetName())
+	req.SetHeader(authenticationv1.ImpersonateGroupHeader, c.user.GetGroups()...)
 	req.SetHeader(authenticationapi.ImpersonateUserScopeHeader, c.user.GetExtra()[authorizationapi.ScopesKey]...)
 	return req
 }

test/integration/scopes_test.go

@@ -3,6 +3,7 @@ package integration
 import (
 	"testing"
 
+	authenticationv1 "k8s.io/api/authentication/v1"
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apiserverserviceaccount "k8s.io/apiserver/pkg/authentication/serviceaccount"
@@ -105,7 +106,7 @@ func TestScopedImpersonation(t *testing.T) {
 	}
 
 	err = clusterAdminBuildClient.Build().RESTClient().Get().
-		SetHeader(authenticationapi.ImpersonateUserHeader, "harold").
+		SetHeader(authenticationv1.ImpersonateUserHeader, "harold").
 		SetHeader(authenticationapi.ImpersonateUserScopeHeader, "user:info").
 		Namespace(projectName).Resource("builds").Name("name").Do().Into(&buildapi.Build{})
 	if !kapierrors.IsForbidden(err) {
@@ -114,7 +115,7 @@ func TestScopedImpersonation(t *testing.T) {
 
 	user := &userapi.User{}
 	err = userclient.NewForConfigOrDie(clusterAdminClientConfig).RESTClient().Get().
-		SetHeader(authenticationapi.ImpersonateUserHeader, "harold").
+		SetHeader(authenticationv1.ImpersonateUserHeader, "harold").
 		SetHeader(authenticationapi.ImpersonateUserScopeHeader, "user:info").
 		Resource("users").Name("~").Do().Into(user)
 	if err != nil {