@@ -17,7 +17,10 @@ func TestHandler(t *testing.T) {

 }

 func TestRedirectingStateValidCSRF(t *testing.T) {

-	fakeCSRF := &csrf.FakeCSRF{"xyz", nil}

+	fakeCSRF := &csrf.FakeCSRF{

+		Token: "xyz",

+		Err:   nil,

+	}

 	redirectingState := CSRFRedirectingState(fakeCSRF)

 	req, _ := http.NewRequest("GET", "http://www.example.com", nil)

@@ -38,7 +41,10 @@ func TestRedirectingStateValidCSRF(t *testing.T) {

 }

 func TestRedirectingStateInvalidCSRF(t *testing.T) {

-	fakeCSRF := &csrf.FakeCSRF{"xyz", nil}

+	fakeCSRF := &csrf.FakeCSRF{

+		Token: "xyz",

+		Err:   nil,

+	}

 	redirectingState := CSRFRedirectingState(fakeCSRF)

 	req, _ := http.NewRequest("GET", "http://www.example.com", nil)

@@ -65,7 +71,10 @@ func TestRedirectingStateInvalidCSRF(t *testing.T) {

 func TestRedirectingStateSuccess(t *testing.T) {

 	originalURL := "http://www.example.com"

-	fakeCSRF := &csrf.FakeCSRF{"xyz", nil}

+	fakeCSRF := &csrf.FakeCSRF{

+		Token: "xyz",

+		Err:   nil,

+	}

 	redirectingState := CSRFRedirectingState(fakeCSRF)

 	req, _ := http.NewRequest("GET", originalURL, nil)

@@ -94,7 +103,10 @@ func TestRedirectingStateOAuthError(t *testing.T) {

 	originalURL := "http://www.example.com"

 	expectedURL := "http://www.example.com?error=access_denied"

-	fakeCSRF := &csrf.FakeCSRF{"xyz", nil}

+	fakeCSRF := &csrf.FakeCSRF{

+		Token: "xyz",

+		Err:   nil,

+	}

 	redirectingState := CSRFRedirectingState(fakeCSRF)

 	req, _ := http.NewRequest("GET", originalURL, nil)

@@ -123,7 +135,10 @@ func TestRedirectingStateOAuthError(t *testing.T) {

 }

 func TestRedirectingStateError(t *testing.T) {

-	fakeCSRF := &csrf.FakeCSRF{"xyz", nil}

+	fakeCSRF := &csrf.FakeCSRF{

+		Token: "xyz",

+		Err:   nil,

+	}

 	redirectingState := CSRFRedirectingState(fakeCSRF)

 	req2, _ := http.NewRequest("GET", "http://www.example.com/callback", nil)

@@ -17,7 +17,12 @@ type ClusterRoleStorage struct {

 }

 func NewClusterRoleStorage(clusterPolicyRegistry clusterpolicyregistry.Registry) *ClusterRoleStorage {

-	return &ClusterRoleStorage{rolestorage.VirtualStorage{clusterpolicyregistry.NewSimulatedRegistry(clusterPolicyRegistry), roleregistry.ClusterStrategy, roleregistry.ClusterStrategy}}

+	return &ClusterRoleStorage{

+		roleStorage: rolestorage.VirtualStorage{

+			PolicyStorage:  clusterpolicyregistry.NewSimulatedRegistry(clusterPolicyRegistry),

+			CreateStrategy: roleregistry.ClusterStrategy,

+			UpdateStrategy: roleregistry.ClusterStrategy},

+	}

 }

 func (s *ClusterRoleStorage) New() runtime.Object {

@@ -28,7 +28,10 @@ func TestLimitedLogAndRetryFinish(t *testing.T) {

 	err := errors.New("funky error")

 	now := kutil.Now()

-	retry := controller.Retry{0, kutil.Date(now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute()-31, now.Second(), now.Nanosecond(), now.Location())}

+	retry := controller.Retry{

+		Count:          0,

+		StartTimestamp: kutil.Date(now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute()-31, now.Second(), now.Nanosecond(), now.Location()),

+	}

 	if limitedLogAndRetry(updater, 30*time.Minute)(&buildapi.Build{Status: buildapi.BuildStatus{Phase: buildapi.BuildPhaseNew}}, err, retry) {

 		t.Error("Expected no more retries after reaching timeout!")

 	}

@@ -51,7 +54,10 @@ func TestLimitedLogAndRetryProcessing(t *testing.T) {

 	err := errors.New("funky error")

 	now := kutil.Now()

-	retry := controller.Retry{0, kutil.Date(now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute()-10, now.Second(), now.Nanosecond(), now.Location())}

+	retry := controller.Retry{

+		Count:          0,

+		StartTimestamp: kutil.Date(now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute()-10, now.Second(), now.Nanosecond(), now.Location()),

+	}

 	if !limitedLogAndRetry(updater, 30*time.Minute)(&buildapi.Build{Status: buildapi.BuildStatus{Phase: buildapi.BuildPhaseNew}}, err, retry) {

 		t.Error("Expected more retries!")

 	}

@@ -124,7 +124,7 @@ func RunImportImage(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, arg

 	fmt.Fprint(cmd.Out(), "The import completed successfully.", "\n\n")

-	d := describe.ImageStreamDescriber{osClient}

+	d := describe.ImageStreamDescriber{Interface: osClient}

 	info, err := d.Describe(stream.Namespace, stream.Name)

 	if err != nil {

 		return err

@@ -68,7 +68,7 @@ func RunStatus(f *clientcmd.Factory, out io.Writer) error {

 		return err

 	}

-	describer := &describe.ProjectStatusDescriber{kclient, client}

+	describer := &describe.ProjectStatusDescriber{K: kclient, C: client}

 	s, err := describer.Describe(namespace, "")

 	if err != nil {

 		return err

@@ -90,7 +90,7 @@ func RunGraph(f *clientcmd.Factory, out io.Writer) error {

 		return err

 	}

-	describer := &describe.ProjectStatusDescriber{kclient, client}

+	describer := &describe.ProjectStatusDescriber{K: kclient, C: client}

 	g, _, err := describer.MakeGraph(namespace)

 	if err != nil {

 		return err

@@ -513,7 +513,7 @@ func (c *MasterConfig) GetServiceAccountClients(name string) (*osclient.Client,

 	}

 	return serviceaccounts.Clients(

 		c.PrivilegedLoopbackClientConfig,

-		&serviceaccounts.ClientLookupTokenRetriever{c.PrivilegedLoopbackKubernetesClient},

+		&serviceaccounts.ClientLookupTokenRetriever{Client: c.PrivilegedLoopbackKubernetesClient},

 		c.Options.PolicyConfig.OpenShiftInfrastructureNamespace,

 		name,

 	)

@@ -35,7 +35,7 @@ func TestAllocate(t *testing.T) {

 		t.Fatal(err)

 	}

-	released := uid.Block{2, 3}

+	released := uid.Block{Start: 2, End: 3}

 	if err := r.Release(released); err != nil {

 		t.Fatal(err)

 	}

@@ -53,10 +53,10 @@ func TestAllocate(t *testing.T) {

 	if err := r.Release(released); err != nil {

 		t.Fatal(err)

 	}

-	if err := r.Allocate(uid.Block{11, 11}); err != ErrNotInRange {

+	if err := r.Allocate(uid.Block{Start: 11, End: 11}); err != ErrNotInRange {

 		t.Fatal(err)

 	}

-	if err := r.Allocate(uid.Block{8, 11}); err != ErrNotInRange {

+	if err := r.Allocate(uid.Block{Start: 8, End: 11}); err != ErrNotInRange {

 		t.Fatal(err)

 	}

 	if f := r.Free(); f != 1 {

@@ -179,7 +179,7 @@ func TestSimpleAllocationPluginViaController(t *testing.T) {

 	}

 	plugin, _ := NewSimpleAllocationPlugin("www.example.org")

-	fac := &rac.RouteAllocationControllerFactory{nil, nil}

+	fac := &rac.RouteAllocationControllerFactory{OSClient: nil, KubeClient: nil}

 	sac := fac.Create(plugin)

 	for _, tc := range tests {

@@ -101,7 +101,7 @@ func TestLogin(t *testing.T) {

 	// 	t.Fatalf("unexpected error: %v", err)

 	// }

-	userWhoamiOptions := cmd.WhoAmIOptions{oClient.Users(), ioutil.Discard}

+	userWhoamiOptions := cmd.WhoAmIOptions{UserInterface: oClient.Users(), Out: ioutil.Discard}

 	retrievedUser, err := userWhoamiOptions.WhoAmI()

 	if err != nil {

 		t.Errorf("unexpected error: %v", err)

@@ -110,7 +110,7 @@ func TestLogin(t *testing.T) {

 		t.Errorf("expected %v, got %v", retrievedUser.Name, username)

 	}

-	adminWhoamiOptions := cmd.WhoAmIOptions{clusterAdminClient.Users(), ioutil.Discard}

+	adminWhoamiOptions := cmd.WhoAmIOptions{UserInterface: clusterAdminClient.Users(), Out: ioutil.Discard}

 	retrievedAdmin, err := adminWhoamiOptions.WhoAmI()

 	if err != nil {

 		t.Errorf("unexpected error: %v", err)