[testing-framework] Make golangci happy

pkg/builder/builder_suite_test.go

@@ -28,11 +28,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-	"sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/addr"
 )
 
 func TestBuilder(t *testing.T) {

pkg/internal/testing/integration/apiserver.go

@@ -34,7 +34,7 @@ type APIServer struct {
 	// APIServer struct (e.g. "--cert-dir={{ .Dir }}").
 	// Those templates will be evaluated after the defaulting of the APIServer's
 	// fields has already happened and just before the binary actually gets
-	// started. Thus you have access to caluclated fields like `URL` and others.
+	// started. Thus you have access to calculated fields like `URL` and others.
 	//
 	// If not specified, the minimal set of arguments to run the APIServer will
 	// be used.
@@ -131,6 +131,6 @@ func (s *APIServer) Stop() error {
 // APIServerDefaultArgs exposes the default args for the APIServer so that you
 // can use those to append your own additional arguments.
 //
-// The internal default arguments are explicitely copied here, we don't want to
+// The internal default arguments are explicitly copied here, we don't want to
 // allow users to change the internal ones.
 var APIServerDefaultArgs = append([]string{}, internal.APIServerDefaultArgs...)

pkg/internal/testing/integration/etcd.go

@@ -30,7 +30,7 @@ type Etcd struct {
 	// struct (e.g. "--data-dir={{ .Dir }}").
 	// Those templates will be evaluated after the defaulting of the Etcd's
 	// fields has already happened and just before the binary actually gets
-	// started. Thus you have access to caluclated fields like `URL` and others.
+	// started. Thus you have access to calculated fields like `URL` and others.
 	//
 	// If not specified, the minimal set of arguments to run the Etcd will be
 	// used.
@@ -109,6 +109,6 @@ func (e *Etcd) Stop() error {
 // EtcdDefaultArgs exposes the default args for Etcd so that you
 // can use those to append your own additional arguments.
 //
-// The internal default arguments are explicitely copied here, we don't want to
+// The internal default arguments are explicitly copied here, we don't want to
 // allow users to change the internal ones.
 var EtcdDefaultArgs = append([]string{}, internal.EtcdDefaultArgs...)

pkg/internal/testing/integration/internal/etcd.go

@@ -27,8 +27,8 @@ func isSecureScheme(scheme string) bool {
 	return false
 }
 
-func GetEtcdStartMessage(listenUrl url.URL) string {
-	if isSecureScheme(listenUrl.Scheme) {
+func GetEtcdStartMessage(listenURL url.URL) string {
+	if isSecureScheme(listenURL.Scheme) {
 		// https://github.com/coreos/etcd/blob/a7f1fbe00ec216fcb3a1919397a103b41dca8413/embed/serve.go#L167
 		return "serving client requests on "
 	}

pkg/internal/testing/integration/internal/integration_tests/apiserver_integration_test.go

@@ -1,4 +1,4 @@
-package integration_tests
+package integrationtests
 
 import (
 	. "github.com/onsi/ginkgo"

pkg/internal/testing/integration/internal/integration_tests/doc.go

@@ -4,4 +4,4 @@ framework.
 
 This file's only purpose is to make godep happy.
 */
-package integration_tests
+package integrationtests

pkg/internal/testing/integration/internal/integration_tests/etcd_integration_test.go

@@ -1,4 +1,4 @@
-package integration_tests
+package integrationtests
 
 import (
 	"bytes"

pkg/internal/testing/integration/internal/integration_tests/integration_suite_test.go

@@ -1,4 +1,4 @@
-package integration_tests
+package integrationtests
 
 import (
 	. "github.com/onsi/ginkgo"

pkg/internal/testing/integration/internal/integration_tests/integration_test.go

@@ -1,4 +1,4 @@
-package integration_tests
+package integrationtests
 
 import (
 	"fmt"
@@ -132,8 +132,8 @@ var _ = Describe("The Testing Framework", func() {
 		b.Time("lifecycle", func() {
 			controlPlane = &integration.ControlPlane{}
 
-			controlPlane.Start()
-			controlPlane.Stop()
+			Expect(controlPlane.Start()).To(Succeed())
+			Expect(controlPlane.Stop()).To(Succeed())
 		})
 	}, 10)
 })

pkg/internal/testing/integration/internal/process.go

@@ -30,7 +30,7 @@ type ProcessState struct {
 	// HealthCheckEndpoint.
 	// If left empty it will default to 100 Milliseconds.
 	HealthCheckPollInterval time.Duration
-	// StartMessage is the message to wait for on stderr. If we recieve this
+	// StartMessage is the message to wait for on stderr. If we receive this
 	// message, we assume the process is ready to operate. Ignored if
 	// HealthCheckEndpoint is specified.
 	//
@@ -57,7 +57,7 @@ type DefaultedProcessInput struct {
 
 func DoDefaulting(
 	name string,
-	listenUrl *url.URL,
+	listenURL *url.URL,
 	dir string,
 	path string,
 	startTimeout time.Duration,
@@ -70,7 +70,7 @@ func DoDefaulting(
 		StopTimeout:  stopTimeout,
 	}
 
-	if listenUrl == nil {
+	if listenURL == nil {
 		port, host, err := addr.Suggest()
 		if err != nil {
 			return DefaultedProcessInput{}, err
@@ -80,7 +80,7 @@ func DoDefaulting(
 			Host:   net.JoinHostPort(host, strconv.Itoa(port)),
 		}
 	} else {
-		defaults.URL = *listenUrl
+		defaults.URL = *listenURL
 	}
 
 	if dir == "" {

pkg/internal/testing/integration/internal/process_test.go

@@ -19,6 +19,10 @@ import (
 	. "sigs.k8s.io/controller-runtime/pkg/internal/testing/integration/internal"
 )
 
+const (
+	healthURLPath = "/healthz"
+)
+
 var _ = Describe("Start method", func() {
 	var (
 		processState *ProcessState
@@ -50,11 +54,11 @@ var _ = Describe("Start method", func() {
 
 		Context("when the healthcheck returns ok", func() {
 			BeforeEach(func() {
-				server.RouteToHandler("GET", "/healthz", ghttp.RespondWith(http.StatusOK, ""))
+				server.RouteToHandler("GET", healthURLPath, ghttp.RespondWith(http.StatusOK, ""))
 			})
 
 			It("hits the endpoint, and successfully starts", func() {
-				processState.HealthCheckEndpoint = "/healthz"
+				processState.HealthCheckEndpoint = healthURLPath
 				processState.StartTimeout = 100 * time.Millisecond
 				processState.URL = getServerURL(server)
 
@@ -67,10 +71,10 @@ var _ = Describe("Start method", func() {
 
 		Context("when the healthcheck always returns failure", func() {
 			BeforeEach(func() {
-				server.RouteToHandler("GET", "/healthz", ghttp.RespondWith(http.StatusInternalServerError, ""))
+				server.RouteToHandler("GET", healthURLPath, ghttp.RespondWith(http.StatusInternalServerError, ""))
 			})
 			It("returns a timeout error and stops health API checker", func() {
-				processState.HealthCheckEndpoint = "/healthz"
+				processState.HealthCheckEndpoint = healthURLPath
 				processState.StartTimeout = 500 * time.Millisecond
 				processState.URL = getServerURL(server)
 
@@ -90,7 +94,7 @@ var _ = Describe("Start method", func() {
 			})
 
 			It("returns a timeout error", func() {
-				processState.HealthCheckEndpoint = "/healthz"
+				processState.HealthCheckEndpoint = healthURLPath
 				processState.StartTimeout = 500 * time.Millisecond
 
 				port, host, err := addr.Suggest()
@@ -117,7 +121,7 @@ var _ = Describe("Start method", func() {
 			})
 
 			It("hits the endpoint repeatedly, and successfully starts", func() {
-				processState.HealthCheckEndpoint = "/healthz"
+				processState.HealthCheckEndpoint = healthURLPath
 				processState.StartTimeout = 20 * time.Second
 				processState.URL = getServerURL(server)
 
@@ -144,7 +148,7 @@ var _ = Describe("Start method", func() {
 				})
 
 				It("hits the endpoint in the configured interval", func() {
-					processState.HealthCheckEndpoint = "/healthz"
+					processState.HealthCheckEndpoint = healthURLPath
 					processState.StartTimeout = 3 * processState.HealthCheckPollInterval
 					processState.URL = getServerURL(server)
 
@@ -170,21 +174,21 @@ var _ = Describe("Start method", func() {
 		})
 
 		Context("when the command cannot be started", func() {
+			var err error
+
 			BeforeEach(func() {
 				processState = &ProcessState{}
 				processState.Path = "/nonexistent"
+
+				err = processState.Start(nil, nil)
 			})
 
 			It("propagates the error", func() {
-				err := processState.Start(nil, nil)
-
 				Expect(os.IsNotExist(err)).To(BeTrue())
 			})
 
 			Context("but Stop() is called on it", func() {
 				It("does not panic", func() {
-					processState.Start(nil, nil)
-
 					stoppingFailedProcess := func() {
 						Expect(processState.Stop()).To(Succeed())
 					}