Merge pull request kubernetes#71022 from emwalker/68026-golint-fixes-5

k8s-ci-robot · web-flow · commit 222dd0af4c7d · 2019-03-01T14:08:33.000-08:00
Remove test/integration/* from hack/.golint_failures
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -669,12 +669,4 @@ test/e2e_node/environment
 test/e2e_node/remote
 test/e2e_node/runner/remote
 test/e2e_node/services
-test/integration
-test/integration/auth
-test/integration/evictions
-test/integration/framework
-test/integration/master
-test/integration/replicaset
-test/integration/replicationcontroller
-test/integration/scheduler
 test/utils
diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go
@@ -228,7 +228,7 @@ var aBinding string = `
 }
 `
 
-var emptyEndpoints string = `
+var emptyEndpoints = `
 {
   "kind": "Endpoints",
   "apiVersion": "v1",
@@ -493,10 +493,10 @@ func parseResourceVersion(response []byte) (string, float64, error) {
 }
 
 func getPreviousResourceVersionKey(url, id string) string {
-	baseUrl := strings.Split(url, "?")[0]
-	key := baseUrl
+	baseURL := strings.Split(url, "?")[0]
+	key := baseURL
 	if id != "" {
-		key = fmt.Sprintf("%s/%v", baseUrl, id)
+		key = fmt.Sprintf("%s/%v", baseURL, id)
 	}
 	return key
 }
@@ -1075,8 +1075,8 @@ func TestKindAuthorization(t *testing.T) {
 			if r.verb == "PUT" && r.body != "" {
 				// For update operations, insert previous resource version
 				if resVersion := previousResourceVersion[getPreviousResourceVersionKey(r.URL, "")]; resVersion != 0 {
-					resourceVersionJson := fmt.Sprintf(",\r\n\"resourceVersion\": \"%v\"", resVersion)
-					bodyStr = fmt.Sprintf(r.body, resourceVersionJson)
+					resourceVersionJSON := fmt.Sprintf(",\r\n\"resourceVersion\": \"%v\"", resVersion)
+					bodyStr = fmt.Sprintf(r.body, resourceVersionJSON)
 				}
 			}
 		}
diff --git a/test/integration/auth/bootstraptoken_test.go b/test/integration/auth/bootstraptoken_test.go
@@ -47,7 +47,7 @@ func (b bootstrapSecrets) Get(name string) (*corev1.Secret, error) {
 
 // TestBootstrapTokenAuth tests the bootstrap token auth provider
 func TestBootstrapTokenAuth(t *testing.T) {
-	tokenId, err := bootstraputil.GenerateTokenId()
+	tokenID, err := bootstraputil.GenerateTokenId()
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -62,7 +62,7 @@ func TestBootstrapTokenAuth(t *testing.T) {
 		},
 		Type: corev1.SecretTypeBootstrapToken,
 		Data: map[string][]byte{
-			bootstrapapi.BootstrapTokenIDKey:               []byte(tokenId),
+			bootstrapapi.BootstrapTokenIDKey:               []byte(tokenID),
 			bootstrapapi.BootstrapTokenSecretKey:           []byte(secret),
 			bootstrapapi.BootstrapTokenUsageAuthentication: []byte("true"),
 		},
@@ -74,7 +74,7 @@ func TestBootstrapTokenAuth(t *testing.T) {
 		},
 		Type: corev1.SecretTypeBootstrapToken,
 		Data: map[string][]byte{
-			bootstrapapi.BootstrapTokenIDKey:               []byte(tokenId),
+			bootstrapapi.BootstrapTokenIDKey:               []byte(tokenID),
 			bootstrapapi.BootstrapTokenSecretKey:           []byte("invalid"),
 			bootstrapapi.BootstrapTokenUsageAuthentication: []byte("true"),
 		},
@@ -86,7 +86,7 @@ func TestBootstrapTokenAuth(t *testing.T) {
 		},
 		Type: corev1.SecretTypeBootstrapToken,
 		Data: map[string][]byte{
-			bootstrapapi.BootstrapTokenIDKey:               []byte(tokenId),
+			bootstrapapi.BootstrapTokenIDKey:               []byte(tokenID),
 			bootstrapapi.BootstrapTokenSecretKey:           []byte("invalid"),
 			bootstrapapi.BootstrapTokenUsageAuthentication: []byte("true"),
 			bootstrapapi.BootstrapTokenExpirationKey:       []byte(bootstraputil.TimeStringFromNow(-time.Hour)),
@@ -134,7 +134,7 @@ func TestBootstrapTokenAuth(t *testing.T) {
 		previousResourceVersion := make(map[string]float64)
 		transport := http.DefaultTransport
 
-		token := tokenId + "." + secret
+		token := tokenID + "." + secret
 		var bodyStr string
 		if test.request.body != "" {
 			sub := ""
diff --git a/test/integration/evictions/evictions_test.go b/test/integration/evictions/evictions_test.go
@@ -95,7 +95,7 @@ func TestConcurrentEvictionRequests(t *testing.T) {
 
 	waitPDBStable(t, clientSet, numOfEvictions, ns.Name, pdb.Name)
 
-	var numberPodsEvicted uint32 = 0
+	var numberPodsEvicted uint32
 	errCh := make(chan error, 3*numOfEvictions)
 	var wg sync.WaitGroup
 	// spawn numOfEvictions goroutines to concurrently evict the pods
diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go
@@ -103,11 +103,13 @@ type MasterHolder struct {
 	M           *master.Master
 }
 
+// SetMaster assigns the current master.
 func (h *MasterHolder) SetMaster(m *master.Master) {
 	h.M = m
 	close(h.Initialized)
 }
 
+// DefaultOpenAPIConfig returns an openapicommon.Config initialized to default values.
 func DefaultOpenAPIConfig() *openapicommon.Config {
 	openAPIConfig := genericapiserver.DefaultOpenAPIConfig(openapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(legacyscheme.Scheme))
 	openAPIConfig.Info = &spec.Info{
@@ -237,7 +239,7 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
 	return m, s, closeFn
 }
 
-// Returns the master config appropriate for most integration tests.
+// NewIntegrationTestMasterConfig returns the master config appropriate for most integration tests.
 func NewIntegrationTestMasterConfig() *master.Config {
 	masterConfig := NewMasterConfig()
 	masterConfig.GenericConfig.PublicAddress = net.ParseIP("192.168.10.4")
@@ -249,7 +251,7 @@ func NewIntegrationTestMasterConfig() *master.Config {
 	return masterConfig
 }
 
-// Returns a basic master config.
+// NewMasterConfig returns a basic master config.
 func NewMasterConfig() *master.Config {
 	// This causes the integration tests to exercise the etcd
 	// prefix code, so please don't change without ensuring
@@ -336,6 +338,7 @@ func NewMasterConfig() *master.Config {
 // CloseFunc can be called to cleanup the master
 type CloseFunc func()
 
+// RunAMaster starts a master with the provided config.
 func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server, CloseFunc) {
 	if masterConfig == nil {
 		masterConfig = NewMasterConfig()
@@ -344,6 +347,7 @@ func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server,
 	return startMasterOrDie(masterConfig, nil, nil)
 }
 
+// RunAMasterUsingServer starts up a master using the provided config on the specified server.
 func RunAMasterUsingServer(masterConfig *master.Config, s *httptest.Server, masterReceiver MasterReceiver) (*master.Master, *httptest.Server, CloseFunc) {
 	return startMasterOrDie(masterConfig, s, masterReceiver)
 }
diff --git a/test/integration/framework/perf_utils.go b/test/integration/framework/perf_utils.go
@@ -31,12 +31,14 @@ const (
 	retries = 5
 )
 
+// IntegrationTestNodePreparer holds configuration information for the test node preparer.
 type IntegrationTestNodePreparer struct {
 	client          clientset.Interface
 	countToStrategy []testutils.CountToStrategy
 	nodeNamePrefix  string
 }
 
+// NewIntegrationTestNodePreparer creates an IntegrationTestNodePreparer configured with defaults.
 func NewIntegrationTestNodePreparer(client clientset.Interface, countToStrategy []testutils.CountToStrategy, nodeNamePrefix string) testutils.TestNodePreparer {
 	return &IntegrationTestNodePreparer{
 		client:          client,
@@ -45,6 +47,7 @@ func NewIntegrationTestNodePreparer(client clientset.Interface, countToStrategy
 	}
 }
 
+// PrepareNodes prepares countToStrategy test nodes.
 func (p *IntegrationTestNodePreparer) PrepareNodes() error {
 	numNodes := 0
 	for _, v := range p.countToStrategy {
@@ -96,6 +99,7 @@ func (p *IntegrationTestNodePreparer) PrepareNodes() error {
 	return nil
 }
 
+// CleanupNodes deletes existing test nodes.
 func (p *IntegrationTestNodePreparer) CleanupNodes() error {
 	nodes := e2eframework.GetReadySchedulableNodesOrDie(p.client)
 	for i := range nodes.Items {
diff --git a/test/integration/framework/test_server.go b/test/integration/framework/test_server.go
@@ -39,6 +39,7 @@ import (
 	"k8s.io/kubernetes/pkg/master"
 )
 
+// TestServerSetup holds configuration information for a kube-apiserver test server.
 type TestServerSetup struct {
 	ModifyServerRunOptions func(*options.ServerRunOptions)
 	ModifyServerConfig     func(*master.Config)
diff --git a/test/integration/framework/util.go b/test/integration/framework/util.go
@@ -33,6 +33,7 @@ const (
 	currentPodInfraContainerImageVersion = "3.1"
 )
 
+// CreateTestingNamespace creates a namespace for testing.
 func CreateTestingNamespace(baseName string, apiserver *httptest.Server, t *testing.T) *v1.Namespace {
 	// TODO: Create a namespace with a given basename.
 	// Currently we neither create the namespace nor delete all of its contents at the end.
@@ -45,6 +46,7 @@ func CreateTestingNamespace(baseName string, apiserver *httptest.Server, t *test
 	}
 }
 
+// DeleteTestingNamespace is currently a no-op function.
 func DeleteTestingNamespace(ns *v1.Namespace, apiserver *httptest.Server, t *testing.T) {
 	// TODO: Remove all resources from a given namespace once we implement CreateTestingNamespace.
 }
diff --git a/test/integration/master/kms_plugin_mock.go b/test/integration/master/kms_plugin_mock.go
@@ -46,7 +46,7 @@ type base64Plugin struct {
 	encryptRequest chan *kmsapi.EncryptRequest
 }
 
-func NewBase64Plugin() (*base64Plugin, error) {
+func newBase64Plugin() (*base64Plugin, error) {
 	listener, err := net.Listen(unixProtocol, sockFile)
 	if err != nil {
 		return nil, fmt.Errorf("failed to listen on the unix socket, error: %v", err)
diff --git a/test/integration/master/kms_transformation_test.go b/test/integration/master/kms_transformation_test.go
@@ -80,7 +80,7 @@ func (r rawDEKKEKSecret) getPayload() []byte {
 // 4. The payload (ex. Secret) should be encrypted via AES CBC transform
 // 5. Prefix-EncryptedDEK-EncryptedPayload structure should be deposited to ETCD
 func TestKMSProvider(t *testing.T) {
-	pluginMock, err := NewBase64Plugin()
+	pluginMock, err := newBase64Plugin()
 	if err != nil {
 		t.Fatalf("failed to create mock of KMS Plugin: %v", err)
 	}
diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go
@@ -353,7 +353,7 @@ func TestWatchSucceedsWithoutArgs(t *testing.T) {
 	resp.Body.Close()
 }
 
-var hpaV1 string = `
+var hpaV1 = `
 {
   "apiVersion": "autoscaling/v1",
   "kind": "HorizontalPodAutoscaler",
@@ -374,7 +374,7 @@ var hpaV1 string = `
 }
 `
 
-var deploymentExtensions string = `
+var deploymentExtensions = `
 {
   "apiVersion": "extensions/v1beta1",
   "kind": "Deployment",
@@ -401,7 +401,7 @@ var deploymentExtensions string = `
 }
 `
 
-var deploymentApps string = `
+var deploymentApps = `
 {
   "apiVersion": "apps/v1",
   "kind": "Deployment",
diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go
@@ -448,12 +448,14 @@ func TestAdoption(t *testing.T) {
 				if err != nil {
 					return false, err
 				}
-				if e, a := tc.expectedOwnerReferences(rs), updatedPod.OwnerReferences; reflect.DeepEqual(e, a) {
+
+				e, a := tc.expectedOwnerReferences(rs), updatedPod.OwnerReferences
+				if reflect.DeepEqual(e, a) {
 					return true, nil
-				} else {
-					t.Logf("ownerReferences don't match, expect %v, got %v", e, a)
-					return false, nil
 				}
+
+				t.Logf("ownerReferences don't match, expect %v, got %v", e, a)
+				return false, nil
 			}); err != nil {
 				t.Fatalf("test %q failed: %v", tc.name, err)
 			}
diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go
@@ -448,12 +448,14 @@ func TestAdoption(t *testing.T) {
 				if err != nil {
 					return false, err
 				}
-				if e, a := tc.expectedOwnerReferences(rc), updatedPod.OwnerReferences; reflect.DeepEqual(e, a) {
+
+				e, a := tc.expectedOwnerReferences(rc), updatedPod.OwnerReferences
+				if reflect.DeepEqual(e, a) {
 					return true, nil
-				} else {
-					t.Logf("ownerReferences don't match, expect %v, got %v", e, a)
-					return false, nil
 				}
+
+				t.Logf("ownerReferences don't match, expect %v, got %v", e, a)
+				return false, nil
 			}); err != nil {
 				t.Fatalf("test %q failed: %v", tc.name, err)
 			}
diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go
diff --git a/test/integration/scheduler/plugin_test.go b/test/integration/scheduler/plugin_test.go
diff --git a/test/integration/scheduler/preemption_test.go b/test/integration/scheduler/preemption_test.go
diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go
diff --git a/test/integration/scheduler/volume_binding_test.go b/test/integration/scheduler/volume_binding_test.go
diff --git a/test/integration/utils.go b/test/integration/utils.go

Original file line number	Diff line number	Diff line change
@@ -228,7 +228,7 @@ var aBinding string = `
`228`	`228`	`}`
`229`	`229`	`
`230`	`230`
`231`		-var emptyEndpoints string = `
	`231`	+var emptyEndpoints = `
`232`	`232`	`{`
`233`	`233`	`"kind": "Endpoints",`
`234`	`234`	`"apiVersion": "v1",`
`@@ -493,10 +493,10 @@ func parseResourceVersion(response []byte) (string, float64, error) {`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`func getPreviousResourceVersionKey(url, id string) string {`
`496`		`- baseUrl := strings.Split(url, "?")[0]`
`497`		`- key := baseUrl`
	`496`	`+ baseURL := strings.Split(url, "?")[0]`
	`497`	`+ key := baseURL`
`498`	`498`	`if id != "" {`
`499`		`- key = fmt.Sprintf("%s/%v", baseUrl, id)`
	`499`	`+ key = fmt.Sprintf("%s/%v", baseURL, id)`
`500`	`500`	`}`
`501`	`501`	`return key`
`502`	`502`	`}`
`@@ -1075,8 +1075,8 @@ func TestKindAuthorization(t *testing.T) {`
`1075`	`1075`	`if r.verb == "PUT" && r.body != "" {`
`1076`	`1076`	`// For update operations, insert previous resource version`
`1077`	`1077`	`if resVersion := previousResourceVersion[getPreviousResourceVersionKey(r.URL, "")]; resVersion != 0 {`
`1078`		`- resourceVersionJson := fmt.Sprintf(",\r\n\"resourceVersion\": \"%v\"", resVersion)`
`1079`		`- bodyStr = fmt.Sprintf(r.body, resourceVersionJson)`
	`1078`	`+ resourceVersionJSON := fmt.Sprintf(",\r\n\"resourceVersion\": \"%v\"", resVersion)`
	`1079`	`+ bodyStr = fmt.Sprintf(r.body, resourceVersionJSON)`
`1080`	`1080`	`}`
`1081`	`1081`	`}`
`1082`	`1082`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,12 +31,14 @@ const (`
`31`	`31`	`retries = 5`
`32`	`32`	`)`
`33`	`33`
	`34`	`+// IntegrationTestNodePreparer holds configuration information for the test node preparer.`
`34`	`35`	`type IntegrationTestNodePreparer struct {`
`35`	`36`	`client clientset.Interface`
`36`	`37`	`countToStrategy []testutils.CountToStrategy`
`37`	`38`	`nodeNamePrefix string`
`38`	`39`	`}`
`39`	`40`
	`41`	`+// NewIntegrationTestNodePreparer creates an IntegrationTestNodePreparer configured with defaults.`
`40`	`42`	`func NewIntegrationTestNodePreparer(client clientset.Interface, countToStrategy []testutils.CountToStrategy, nodeNamePrefix string) testutils.TestNodePreparer {`
`41`	`43`	`return &IntegrationTestNodePreparer{`
`42`	`44`	`client: client,`
`@@ -45,6 +47,7 @@ func NewIntegrationTestNodePreparer(client clientset.Interface, countToStrategy`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`
	`50`	`+// PrepareNodes prepares countToStrategy test nodes.`
`48`	`51`	`func (p *IntegrationTestNodePreparer) PrepareNodes() error {`
`49`	`52`	`numNodes := 0`
`50`	`53`	`for _, v := range p.countToStrategy {`
`@@ -96,6 +99,7 @@ func (p *IntegrationTestNodePreparer) PrepareNodes() error {`
`96`	`99`	`return nil`
`97`	`100`	`}`
`98`	`101`
	`102`	`+// CleanupNodes deletes existing test nodes.`
`99`	`103`	`func (p *IntegrationTestNodePreparer) CleanupNodes() error {`
`100`	`104`	`nodes := e2eframework.GetReadySchedulableNodesOrDie(p.client)`
`101`	`105`	`for i := range nodes.Items {`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ import (`
`39`	`39`	`"k8s.io/kubernetes/pkg/master"`
`40`	`40`	`)`
`41`	`41`
	`42`	`+// TestServerSetup holds configuration information for a kube-apiserver test server.`
`42`	`43`	`type TestServerSetup struct {`
`43`	`44`	`ModifyServerRunOptions func(*options.ServerRunOptions)`
`44`	`45`	`ModifyServerConfig func(*master.Config)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ const (`
`33`	`33`	`currentPodInfraContainerImageVersion = "3.1"`
`34`	`34`	`)`
`35`	`35`
	`36`	`+// CreateTestingNamespace creates a namespace for testing.`
`36`	`37`	`func CreateTestingNamespace(baseName string, apiserver httptest.Server, t testing.T) *v1.Namespace {`
`37`	`38`	`// TODO: Create a namespace with a given basename.`
`38`	`39`	`// Currently we neither create the namespace nor delete all of its contents at the end.`
`@@ -45,6 +46,7 @@ func CreateTestingNamespace(baseName string, apiserver httptest.Server, t test`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`
	`49`	`+// DeleteTestingNamespace is currently a no-op function.`
`48`	`50`	`func DeleteTestingNamespace(ns v1.Namespace, apiserver httptest.Server, t *testing.T) {`
`49`	`51`	`// TODO: Remove all resources from a given namespace once we implement CreateTestingNamespace.`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ type base64Plugin struct {`
`46`	`46`	`encryptRequest chan *kmsapi.EncryptRequest`
`47`	`47`	`}`
`48`	`48`
`49`		`-func NewBase64Plugin() (*base64Plugin, error) {`
	`49`	`+func newBase64Plugin() (*base64Plugin, error) {`
`50`	`50`	`listener, err := net.Listen(unixProtocol, sockFile)`
`51`	`51`	`if err != nil {`
`52`	`52`	`return nil, fmt.Errorf("failed to listen on the unix socket, error: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (r rawDEKKEKSecret) getPayload() []byte {`
`80`	`80`	`// 4. The payload (ex. Secret) should be encrypted via AES CBC transform`
`81`	`81`	`// 5. Prefix-EncryptedDEK-EncryptedPayload structure should be deposited to ETCD`
`82`	`82`	`func TestKMSProvider(t *testing.T) {`
`83`		`- pluginMock, err := NewBase64Plugin()`
	`83`	`+ pluginMock, err := newBase64Plugin()`
`84`	`84`	`if err != nil {`
`85`	`85`	`t.Fatalf("failed to create mock of KMS Plugin: %v", err)`
`86`	`86`	`}`