go vet pkg

pkg/assets/handlers_test.go

@@ -109,7 +109,7 @@ func TestWithGzipReal(t *testing.T) {
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
 	if string(body) != raw {
-		t.Fatalf(`did not find expected "%s" but got "%s" instead`, raw, resp)
+		t.Fatalf(`did not find expected "%s" but got "%s" instead`, raw, string(body))
 	}
 	vary := resp.Header["Vary"]
 	if !reflect.DeepEqual(vary, []string{"Accept-Encoding"}) {
@@ -132,7 +132,7 @@ func TestWithGzipRealAndMultipleVaryHeaders(t *testing.T) {
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
 	if string(body) != raw {
-		t.Fatalf(`did not find expected "%s" but got "%s" instead`, raw, resp)
+		t.Fatalf(`did not find expected "%s" but got "%s" instead`, raw, string(body))
 	}
 	vary := resp.Header["Vary"]
 	if !reflect.DeepEqual(vary, []string{"Accept-Encoding", "Foo"}) {

pkg/auth/authenticator/request/headerrequest/requestheader_test.go

@@ -73,7 +73,7 @@ func TestRequestHeader(t *testing.T) {
 		}
 		if testcase.ExpectedUsername != "" {
 			if err != nil {
-				t.Errorf("%s: Expected user, got error: ", k, err)
+				t.Errorf("%s: Expected user, got error: %v", k, err)
 				continue
 			}
 			if !ok {

pkg/auth/authenticator/request/x509request/x509_test.go

@@ -634,7 +634,7 @@ func TestX509Verifier(t *testing.T) {
 
 		if testCase.ExpectOK {
 			if !authCall {
-				t.Errorf("%s: Expected inner auth called, wasn't")
+				t.Errorf("%s: Expected inner auth called, wasn't", k)
 				continue
 			}
 			if "innerauth" != user.GetName() {
@@ -643,7 +643,7 @@ func TestX509Verifier(t *testing.T) {
 			}
 		} else {
 			if authCall {
-				t.Errorf("%s: Expected inner auth not to be called, was")
+				t.Errorf("%s: Expected inner auth not to be called, was", k)
 				continue
 			}
 		}

pkg/auth/oauth/handlers/authenticator_test.go

@@ -37,7 +37,7 @@ func TestAuthenticator(t *testing.T) {
 			t.Fatalf("%s: Unexpected error: %s", requestType, err)
 		}
 		if req.Authorized != testCase.ExpectedAuthorized {
-			t.Fatalf("%s: Expected Authorized=%b, got Authorized=%b", requestType, testCase.ExpectedAuthorized, req.Authorized)
+			t.Fatalf("%s: Expected Authorized=%t, got Authorized=%t", requestType, testCase.ExpectedAuthorized, req.Authorized)
 		}
 	}
 }

pkg/auth/oauth/registry/registry_test.go

@@ -258,7 +258,7 @@ func TestAuthenticateTokenNotFound(t *testing.T) {
 		t.Error("Expected not found error")
 	}
 	if userInfo != nil {
-		t.Error("Unexpected user: %v", userInfo)
+		t.Errorf("Unexpected user: %v", userInfo)
 	}
 }
 func TestAuthenticateTokenOtherGetError(t *testing.T) {
@@ -273,10 +273,10 @@ func TestAuthenticateTokenOtherGetError(t *testing.T) {
 		t.Error("Expected error is missing!")
 	}
 	if err.Error() != tokenRegistry.Err.Error() {
-		t.Error("Expected error %v, but got error %v", tokenRegistry.Err, err)
+		t.Errorf("Expected error %v, but got error %v", tokenRegistry.Err, err)
 	}
 	if userInfo != nil {
-		t.Error("Unexpected user: %v", userInfo)
+		t.Errorf("Unexpected user: %v", userInfo)
 	}
 }
 func TestAuthenticateTokenExpired(t *testing.T) {
@@ -294,10 +294,10 @@ func TestAuthenticateTokenExpired(t *testing.T) {
 		t.Error("Found token, but it should be missing!")
 	}
 	if err != ErrExpired {
-		t.Error("Unexpected error: %v", err)
+		t.Errorf("Unexpected error: %v", err)
 	}
 	if userInfo != nil {
-		t.Error("Unexpected user: %v", userInfo)
+		t.Errorf("Unexpected user: %v", userInfo)
 	}
 }
 func TestAuthenticateTokenValidated(t *testing.T) {
@@ -315,7 +315,7 @@ func TestAuthenticateTokenValidated(t *testing.T) {
 		t.Error("Did not find a token!")
 	}
 	if err != nil {
-		t.Error("Unexpected error: %v", err)
+		t.Errorf("Unexpected error: %v", err)
 	}
 	if userInfo == nil {
 		t.Error("Did not get a user!")

pkg/auth/server/csrf/cookie_test.go

@@ -75,7 +75,7 @@ func TestCookieGenerate(t *testing.T) {
 		setCookie := w.Header().Get("Set-Cookie")
 		if testCase.ExpectSetCookie {
 			if len(setCookie) == 0 {
-				t.Errorf("%s: Expected set-cookie header")
+				t.Errorf("%s: Expected set-cookie header", k)
 				continue
 			}
 

pkg/auth/server/login/implicit_test.go

@@ -48,7 +48,7 @@ func TestImplicit(t *testing.T) {
 		ExpectThen       string
 	}{
 		"display confirm form": {
-			CSRF:     &csrf.FakeCSRF{"test", nil},
+			CSRF:     &csrf.FakeCSRF{Token: "test", Err: nil},
 			Implicit: &testImplicit{Success: true, User: &user.DefaultInfo{Name: "user"}},
 			Path:     "/login",
 			ExpectContains: []string{
@@ -57,35 +57,35 @@ func TestImplicit(t *testing.T) {
 			},
 		},
 		"successful POST redirects": {
-			CSRF:       &csrf.FakeCSRF{"test", nil},
+			CSRF:       &csrf.FakeCSRF{Token: "test", Err: nil},
 			Implicit:   &testImplicit{Success: true, User: &user.DefaultInfo{Name: "user"}},
 			Path:       "/login?then=%2Ffoo",
 			PostValues: url.Values{"csrf": []string{"test"}},
 			ExpectThen: "/foo",
 		},
 		"redirect when POST fails CSRF": {
-			CSRF:           &csrf.FakeCSRF{"test", nil},
+			CSRF:           &csrf.FakeCSRF{Token: "test", Err: nil},
 			Implicit:       &testImplicit{Success: true, User: &user.DefaultInfo{Name: "user"}},
 			Path:           "/login",
 			PostValues:     url.Values{"csrf": []string{"wrong"}},
 			ExpectRedirect: "/login?reason=token+expired",
 		},
 		"redirect when not authenticated": {
-			CSRF:           &csrf.FakeCSRF{"test", nil},
+			CSRF:           &csrf.FakeCSRF{Token: "test", Err: nil},
 			Implicit:       &testImplicit{Success: false},
 			Path:           "/login",
 			PostValues:     url.Values{"csrf": []string{"test"}},
 			ExpectRedirect: "/login?reason=access+denied",
 		},
 		"redirect on auth failure": {
-			CSRF:           &csrf.FakeCSRF{"test", nil},
+			CSRF:           &csrf.FakeCSRF{Token: "test", Err: nil},
 			Implicit:       &testImplicit{Err: errors.New("failed")},
 			Path:           "/login",
 			PostValues:     url.Values{"csrf": []string{"test"}},
 			ExpectRedirect: "/login?reason=access+denied",
 		},
 		"expect GET error": {
-			CSRF:           &csrf.FakeCSRF{"test", nil},
+			CSRF:           &csrf.FakeCSRF{Token: "test", Err: nil},
 			Implicit:       &testImplicit{Err: errors.New("failed")},
 			ExpectContains: []string{`"message">An unknown error has occurred. Contact your administrator`},
 		},

pkg/authorization/registry/etcd/etcd.go

@@ -81,7 +81,7 @@ func (r *Etcd) GetPolicy(ctx kapi.Context, name string) (policy *authorizationap
 }
 
 func (r *Etcd) ListPolicies(ctx kapi.Context, label labels.Selector, field fields.Selector) (*authorizationapi.PolicyList, error) {
-	result, err := r.policyRegistry.ListPredicate(ctx, &generic.SelectionPredicate{label, field, getAttrs})
+	result, err := r.policyRegistry.ListPredicate(ctx, &generic.SelectionPredicate{Label: label, Field: field, GetAttrs: getAttrs})
 	if err != nil {
 		return nil, err
 	}
@@ -107,7 +107,7 @@ func (r *Etcd) DeletePolicy(ctx kapi.Context, name string) error {
 }
 
 func (r *Etcd) WatchPolicies(ctx kapi.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
-	return r.policyRegistry.WatchPredicate(ctx, &generic.SelectionPredicate{label, field, getAttrs}, resourceVersion)
+	return r.policyRegistry.WatchPredicate(ctx, &generic.SelectionPredicate{Label: label, Field: field, GetAttrs: getAttrs}, resourceVersion)
 }
 
 func makePolicyBindingListKey(ctx kapi.Context) string {
@@ -132,7 +132,7 @@ func (r *Etcd) GetPolicyBinding(ctx kapi.Context, name string) (policyBinding *a
 }
 
 func (r *Etcd) ListPolicyBindings(ctx kapi.Context, label labels.Selector, field fields.Selector) (*authorizationapi.PolicyBindingList, error) {
-	result, err := r.policyBindingRegistry.ListPredicate(ctx, &generic.SelectionPredicate{label, field, getAttrs})
+	result, err := r.policyBindingRegistry.ListPredicate(ctx, &generic.SelectionPredicate{Label: label, Field: field, GetAttrs: getAttrs})
 	if err != nil {
 		return nil, err
 	}
@@ -158,5 +158,5 @@ func (r *Etcd) DeletePolicyBinding(ctx kapi.Context, name string) error {
 }
 
 func (r *Etcd) WatchPolicyBindings(ctx kapi.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
-	return r.policyBindingRegistry.WatchPredicate(ctx, &generic.SelectionPredicate{label, field, getAttrs}, resourceVersion)
+	return r.policyBindingRegistry.WatchPredicate(ctx, &generic.SelectionPredicate{Label: label, Field: field, GetAttrs: getAttrs}, resourceVersion)
 }

pkg/authorization/registry/policy/rest_test.go

@@ -145,6 +145,6 @@ func TestDeleteValid(t *testing.T) {
 	}
 
 	if policy, _ := registry.GetPolicy(ctx, authorizationapi.PolicyName); policy != nil {
-		t.Error("Unexpected policy found: %v", policy)
+		t.Errorf("Unexpected policy found: %v", policy)
 	}
 }

pkg/authorization/registry/policybinding/rest_test.go

@@ -212,6 +212,6 @@ func TestDeleteValid(t *testing.T) {
 	}
 
 	if binding, _ := registry.GetPolicyBinding(ctx, "foo"); binding != nil {
-		t.Error("Unexpected binding found: %v", binding)
+		t.Errorf("Unexpected binding found: %v", binding)
 	}
 }

pkg/build/api/v1beta1/conversion_test.go

@@ -78,7 +78,7 @@ func TestImageChangeTriggerFromRename(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	if actual.From.Name != "bar" {
-		t.Error("expected %#v, actual %#v", old, actual)
+		t.Errorf("expected %#v, actual %#v", old, actual)
 	}
 
 	old = current.ImageChangeTrigger{
@@ -91,7 +91,7 @@ func TestImageChangeTriggerFromRename(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	if actual.From.Name != "foo" {
-		t.Error("expected %#v, actual %#v", old, actual)
+		t.Errorf("expected %#v, actual %#v", old, actual)
 	}
 
 	old = current.ImageChangeTrigger{

pkg/build/api/validation/validation_test.go

@@ -379,7 +379,7 @@ func TestValidateTrigger(t *testing.T) {
 		errors := validateTrigger(&test.trigger)
 		if len(test.expected) == 0 {
 			if len(errors) != 0 {
-				t.Errorf("%s: Got unexpected validation errors: %#v", errors)
+				t.Errorf("%s: Got unexpected validation errors: %#v", desc, errors)
 			}
 			continue
 		}

pkg/build/builder/cmd/dockercfg/cfg.go

@@ -77,8 +77,8 @@ func getDockercfgFile(path string) string {
 // authEntry is a single entry for a given server in a
 // .dockercfg file
 type authEntry struct {
-	Auth  string `json:auth`
-	Email string `json:email`
+	Auth  string `json:"auth"`
+	Email string `json:"email"`
 }
 
 // dockercfg represents the contents of a .dockercfg file

pkg/build/controller/controller.go

@@ -122,7 +122,7 @@ func (bc *BuildController) nextBuildStatus(build *buildapi.Build) error {
 			glog.V(4).Infof("Build pod already existed: %#v", podSpec)
 			return nil
 		}
-		return fmt.Errorf("failed to create pod for build %s/%s: s", build.Namespace, build.Name, err)
+		return fmt.Errorf("failed to create pod for build %s/%s: %v", build.Namespace, build.Name, err)
 	}
 
 	glog.V(4).Infof("Created pod for build: %#v", podSpec)

pkg/build/controller/controller_test.go

@@ -327,7 +327,7 @@ func TestHandleBuild(t *testing.T) {
 		}
 
 		if err != nil {
-			t.Errorf("(%d) Unexpected error %v", err)
+			t.Errorf("(%d) Unexpected error %v", i, err)
 		}
 		if build.Status != tc.outStatus {
 			t.Errorf("(%d) Expected %s, got %s!", i, tc.outStatus, build.Status)

pkg/build/controller/strategy/custom.go

@@ -41,7 +41,7 @@ func (bs *CustomBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod,
 
 	if strategy.ExposeDockerSocket {
 		glog.V(2).Infof("ExposeDockerSocket is enabled for %s build", build.PodName)
-		containerEnv = append(containerEnv, kapi.EnvVar{"DOCKER_SOCKET", dockerSocketPath})
+		containerEnv = append(containerEnv, kapi.EnvVar{Name: "DOCKER_SOCKET", Value: dockerSocketPath})
 	}
 
 	pod := &kapi.Pod{

pkg/build/controller/strategy/util.go

@@ -71,8 +71,8 @@ func setupBuildEnv(build *buildapi.Build, pod *kapi.Pod) error {
 
 	switch build.Parameters.Source.Type {
 	case buildapi.BuildSourceGit:
-		vars = append(vars, kapi.EnvVar{"SOURCE_URI", build.Parameters.Source.Git.URI})
-		vars = append(vars, kapi.EnvVar{"SOURCE_REF", build.Parameters.Source.Git.Ref})
+		vars = append(vars, kapi.EnvVar{Name: "SOURCE_URI", Value: build.Parameters.Source.Git.URI})
+		vars = append(vars, kapi.EnvVar{Name: "SOURCE_REF", Value: build.Parameters.Source.Git.Ref})
 	default:
 		// Do nothing for unknown source types
 	}
@@ -81,9 +81,9 @@ func setupBuildEnv(build *buildapi.Build, pod *kapi.Pod) error {
 	if err != nil {
 		return err
 	}
-	vars = append(vars, kapi.EnvVar{"OUTPUT_REGISTRY", ref.Registry})
+	vars = append(vars, kapi.EnvVar{Name: "OUTPUT_REGISTRY", Value: ref.Registry})
 	ref.Registry = ""
-	vars = append(vars, kapi.EnvVar{"OUTPUT_IMAGE", ref.String()})
+	vars = append(vars, kapi.EnvVar{Name: "OUTPUT_IMAGE", Value: ref.String()})
 
 	if len(pod.Spec.Containers) > 0 {
 		pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, vars...)

pkg/build/webhook/generic/generic_test.go

@@ -32,27 +32,27 @@ func TestVerifyRequestForMethod(t *testing.T) {
 	req := GivenRequest("GET")
 	err := verifyRequest(req)
 	if err == nil || !strings.Contains(err.Error(), "method") {
-		t.Errorf("Expected anything but POST to be an invalid method %s")
+		t.Errorf("Expected anything but POST to be an invalid method %v", err)
 	}
 }
 
 func TestVerifyRequestForUserAgent(t *testing.T) {
 	req := GivenRequest("POST")
 	err := verifyRequest(req)
 	if err == nil || !strings.Contains(err.Error(), "User-Agent") {
-		t.Errorf("Exp. User-Agent to be required %s", err)
+		t.Errorf("Exp. User-Agent to be required %v", err)
 	}
 
 	req.Header.Add("User-Agent", "")
 	err = verifyRequest(req)
 	if err == nil || !strings.Contains(err.Error(), "User-Agent") {
-		t.Errorf("Exp. User-Agent to not empty %s", err)
+		t.Errorf("Exp. User-Agent to not empty %v", err)
 	}
 
 	req.Header.Set("User-Agent", "foobar")
 	err = verifyRequest(req)
 	if err != nil && strings.Contains(err.Error(), "User-Agent") {
-		t.Errorf("Exp. non-empty User-Agent to be valid %s", err)
+		t.Errorf("Exp. non-empty User-Agent to be valid %v", err)
 	}
 
 }
@@ -70,19 +70,19 @@ func TestVerifyRequestForContentType(t *testing.T) {
 	req.Header.Add("Content-Length", "1")
 	err = verifyRequest(req)
 	if err == nil || !strings.Contains(err.Error(), "Content-Type") {
-		t.Errorf("Exp. ContentType to be required if a payload is posted %s", err)
+		t.Errorf("Exp. ContentType to be required if a payload is posted %v", err)
 	}
 
 	req.Header.Add("Content-Type", "X-Whatever")
 	err = verifyRequest(req)
 	if err == nil || !strings.Contains(err.Error(), "Unsupported Content-Type") {
-		t.Errorf("Exp. to only support json payloads %s", err)
+		t.Errorf("Exp. to only support json payloads %v", err)
 	}
 
 	req.Header.Set("Content-Type", "application/json")
 	err = verifyRequest(req)
 	if err != nil && !strings.Contains(err.Error(), "Unsupported Content-Type") {
-		t.Errorf("Exp. to allow json payloads %s", err)
+		t.Errorf("Exp. to allow json payloads %v", err)
 	}
 }
 
@@ -112,7 +112,7 @@ func TestExtractWithEmptyPayload(t *testing.T) {
 	plugin := New()
 	revision, proceed, err := plugin.Extract(buildConfig, "secret100", "", req)
 	if err != nil {
-		t.Errorf("Expected to be able to trigger a build without a payload error: %s", err)
+		t.Errorf("Expected to be able to trigger a build without a payload error: %v", err)
 	}
 	if !proceed {
 		t.Error("Expected 'proceed' return value to be 'true'")
@@ -147,7 +147,7 @@ func TestExtractWithUnmatchedRefGitPayload(t *testing.T) {
 	build, proceed, err := plugin.Extract(buildConfig, "secret100", "", req)
 
 	if err != nil {
-		t.Errorf("Unexpected error when triggering build: %s", err)
+		t.Errorf("Unexpected error when triggering build: %v", err)
 	}
 	if proceed {
 		t.Error("Expected 'proceed' return value to be 'false' for unmatched refs")
@@ -183,7 +183,7 @@ func TestExtractWithGitPayload(t *testing.T) {
 	revision, proceed, err := plugin.Extract(buildConfig, "secret100", "", req)
 
 	if err != nil {
-		t.Errorf("Expected to be able to trigger a build without a payload error: %s", err)
+		t.Errorf("Expected to be able to trigger a build without a payload error: %v", err)
 	}
 	if !proceed {
 		t.Error("Expected 'proceed' return value to be 'true'")
@@ -217,7 +217,7 @@ func TestExtractWithUnmarshalError(t *testing.T) {
 	plugin := New()
 	revision, proceed, err := plugin.Extract(buildConfig, "secret100", "", req)
 	if err != nil {
-		t.Errorf("Expected to be able to trigger a build without a payload error: %s", err)
+		t.Errorf("Expected to be able to trigger a build without a payload error: %v", err)
 	}
 	if !proceed {
 		t.Error("Expected 'proceed' return value to be 'true'")