Replace references to Fake* types removed in client-go bump.

Author: benluddy

pkg/user/apiserver/registry/useridentitymapping/identity_test.go

@@ -6,8 +6,8 @@ import (
 	kerrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	userapi "github.com/openshift/api/user/v1"
-	"github.com/openshift/client-go/user/clientset/versioned/typed/user/v1/fake"
+	userv1 "github.com/openshift/api/user/v1"
+	userv1client "github.com/openshift/client-go/user/clientset/versioned/typed/user/v1"
 )
 
 type Action struct {
@@ -16,54 +16,54 @@ type Action struct {
 }
 
 type IdentityRegistry struct {
-	*fake.FakeIdentities
+	userv1client.IdentityInterface
 
 	GetErr        map[string]error
-	GetIdentities map[string]*userapi.Identity
+	GetIdentities map[string]*userv1.Identity
 
 	CreateErr      error
-	CreateIdentity *userapi.Identity
+	CreateIdentity *userv1.Identity
 
 	UpdateErr      error
-	UpdateIdentity *userapi.Identity
+	UpdateIdentity *userv1.Identity
 
 	ListErr      error
-	ListIdentity *userapi.IdentityList
+	ListIdentity *userv1.IdentityList
 
 	Actions *[]Action
 }
 
-func (r *IdentityRegistry) Get(_ context.Context, name string, options metav1.GetOptions) (*userapi.Identity, error) {
+func (r *IdentityRegistry) Get(_ context.Context, name string, options metav1.GetOptions) (*userv1.Identity, error) {
 	*r.Actions = append(*r.Actions, Action{"GetIdentity", name})
 	if identity, ok := r.GetIdentities[name]; ok {
 		return identity, nil
 	}
 	if err, ok := r.GetErr[name]; ok {
 		return nil, err
 	}
-	return nil, kerrs.NewNotFound(userapi.Resource("identity"), name)
+	return nil, kerrs.NewNotFound(userv1.Resource("identity"), name)
 }
 
-func (r *IdentityRegistry) Create(_ context.Context, u *userapi.Identity, _ metav1.CreateOptions) (*userapi.Identity, error) {
+func (r *IdentityRegistry) Create(_ context.Context, u *userv1.Identity, _ metav1.CreateOptions) (*userv1.Identity, error) {
 	*r.Actions = append(*r.Actions, Action{"CreateIdentity", u})
 	if r.CreateIdentity == nil && r.CreateErr == nil {
 		return u, nil
 	}
 	return r.CreateIdentity, r.CreateErr
 }
 
-func (r *IdentityRegistry) Update(_ context.Context, u *userapi.Identity, _ metav1.UpdateOptions) (*userapi.Identity, error) {
+func (r *IdentityRegistry) Update(_ context.Context, u *userv1.Identity, _ metav1.UpdateOptions) (*userv1.Identity, error) {
 	*r.Actions = append(*r.Actions, Action{"UpdateIdentity", u})
 	if r.UpdateIdentity == nil && r.UpdateErr == nil {
 		return u, nil
 	}
 	return r.UpdateIdentity, r.UpdateErr
 }
 
-func (r *IdentityRegistry) List(_ context.Context, options metav1.ListOptions) (*userapi.IdentityList, error) {
+func (r *IdentityRegistry) List(_ context.Context, options metav1.ListOptions) (*userv1.IdentityList, error) {
 	*r.Actions = append(*r.Actions, Action{"ListIdentities", options})
 	if r.ListIdentity == nil && r.ListErr == nil {
-		return &userapi.IdentityList{}, nil
+		return &userv1.IdentityList{}, nil
 	}
 	return r.ListIdentity, r.ListErr
 }

pkg/user/apiserver/registry/useridentitymapping/user_test.go

@@ -6,49 +6,49 @@ import (
 	kerrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	userapi "github.com/openshift/api/user/v1"
-	"github.com/openshift/client-go/user/clientset/versioned/typed/user/v1/fake"
+	userv1 "github.com/openshift/api/user/v1"
+	userv1client "github.com/openshift/client-go/user/clientset/versioned/typed/user/v1"
 )
 
 type UserRegistry struct {
 	// included to fill out the interface for testing
-	*fake.FakeUsers
+	userv1client.UserInterface
 
 	GetErr   map[string]error
-	GetUsers map[string]*userapi.User
+	GetUsers map[string]*userv1.User
 
 	CreateErr  error
-	CreateUser *userapi.User
+	CreateUser *userv1.User
 
 	UpdateErr  map[string]error
-	UpdateUser *userapi.User
+	UpdateUser *userv1.User
 
 	ListErr   error
-	ListUsers *userapi.UserList
+	ListUsers *userv1.UserList
 
 	Actions *[]Action
 }
 
-func (r *UserRegistry) Get(_ context.Context, name string, options metav1.GetOptions) (*userapi.User, error) {
+func (r *UserRegistry) Get(_ context.Context, name string, options metav1.GetOptions) (*userv1.User, error) {
 	*r.Actions = append(*r.Actions, Action{"GetUser", name})
 	if user, ok := r.GetUsers[name]; ok {
 		return user, nil
 	}
 	if err, ok := r.GetErr[name]; ok {
 		return nil, err
 	}
-	return nil, kerrs.NewNotFound(userapi.Resource("user"), name)
+	return nil, kerrs.NewNotFound(userv1.Resource("user"), name)
 }
 
-func (r *UserRegistry) Create(_ context.Context, u *userapi.User, _ metav1.CreateOptions) (*userapi.User, error) {
+func (r *UserRegistry) Create(_ context.Context, u *userv1.User, _ metav1.CreateOptions) (*userv1.User, error) {
 	*r.Actions = append(*r.Actions, Action{"CreateUser", u})
 	if r.CreateUser == nil && r.CreateErr == nil {
 		return u, nil
 	}
 	return r.CreateUser, r.CreateErr
 }
 
-func (r *UserRegistry) Update(_ context.Context, u *userapi.User, _ metav1.UpdateOptions) (*userapi.User, error) {
+func (r *UserRegistry) Update(_ context.Context, u *userv1.User, _ metav1.UpdateOptions) (*userv1.User, error) {
 	*r.Actions = append(*r.Actions, Action{"UpdateUser", u})
 	err, _ := r.UpdateErr[u.Name]
 	if r.UpdateUser == nil && err == nil {
@@ -57,10 +57,10 @@ func (r *UserRegistry) Update(_ context.Context, u *userapi.User, _ metav1.Updat
 	return r.UpdateUser, err
 }
 
-func (r *UserRegistry) List(_ context.Context, options metav1.ListOptions) (*userapi.UserList, error) {
+func (r *UserRegistry) List(_ context.Context, options metav1.ListOptions) (*userv1.UserList, error) {
 	*r.Actions = append(*r.Actions, Action{"ListUsers", options})
 	if r.ListUsers == nil && r.ListErr == nil {
-		return &userapi.UserList{}, nil
+		return &userv1.UserList{}, nil
 	}
 	return r.ListUsers, r.ListErr
 }