Enable govet fieldalignment linter (#284)

Enable fieldalignment and fix errors

Author: kate-osborn

.golangci.yml

@@ -32,6 +32,9 @@ linters-settings:
       - name: var-naming
   gocyclo:
     min-complexity: 15
+  govet:
+    enable:
+    - fieldalignment
 
 linters:
     enable:

cmd/gateway/setup.go

@@ -22,16 +22,16 @@ const (
 type (
 	Validator        func(*flag.FlagSet) error
 	ValidatorContext struct {
-		Key string
 		V   Validator
+		Key string
 	}
 )
 
 func GatewayControllerParam(domain string) ValidatorContext {
 	name := "gateway-ctlr-name"
 	return ValidatorContext{
-		name,
-		func(flagset *flag.FlagSet) error {
+		Key: name,
+		V: func(flagset *flag.FlagSet) error {
 			param, err := flagset.GetString(name)
 			if err != nil {
 				return err
@@ -68,8 +68,8 @@ func validateControllerName(name string) error {
 func GatewayClassParam() ValidatorContext {
 	name := "gatewayclass"
 	return ValidatorContext{
-		name,
-		func(flagset *flag.FlagSet) error {
+		Key: name,
+		V: func(flagset *flag.FlagSet) error {
 			param, err := flagset.GetString(name)
 			if err != nil {
 				return err

cmd/gateway/setup_test.go

@@ -12,8 +12,8 @@ import (
 
 func MockValidator(name string, called *int, succeed bool) ValidatorContext {
 	return ValidatorContext{
-		name,
-		func(_ *flag.FlagSet) error {
+		Key: name,
+		V: func(_ *flag.FlagSet) error {
 			*called++
 
 			if !succeed {
@@ -41,71 +41,71 @@ var _ = Describe("Main", func() {
 		It("should call all validators", func() {
 			var called int
 			table := []struct {
+				Contexts      []ValidatorContext
 				ExpectedCalls int
 				Success       bool
-				Contexts      []ValidatorContext
 			}{
 				{
-					0,
-					true,
-					[]ValidatorContext{},
+					Contexts:      []ValidatorContext{},
+					ExpectedCalls: 0,
+					Success:       true,
 				},
 				{
-					0,
-					true,
-					[]ValidatorContext{
+					Contexts: []ValidatorContext{
 						MockValidator("no-flag-set", &called, true),
 					},
+					ExpectedCalls: 0,
+					Success:       true,
 				},
 				{
-					1,
-					true,
-					[]ValidatorContext{
+					Contexts: []ValidatorContext{
 						MockValidator("validator-1", &called, true),
 					},
+					ExpectedCalls: 1,
+					Success:       true,
 				},
 				{
-					1,
-					true,
-					[]ValidatorContext{
+					Contexts: []ValidatorContext{
 						MockValidator("no-flag-set", &called, true),
 						MockValidator("validator-1", &called, true),
 					},
+					ExpectedCalls: 1,
+					Success:       true,
 				},
 				{
-					2,
-					true,
-					[]ValidatorContext{
+					Contexts: []ValidatorContext{
 						MockValidator("validator-1", &called, true),
 						MockValidator("validator-2", &called, true),
 					},
+					ExpectedCalls: 2,
+					Success:       true,
 				},
 				{
-					3,
-					true,
-					[]ValidatorContext{
+					Contexts: []ValidatorContext{
 						MockValidator("validator-1", &called, true),
 						MockValidator("validator-2", &called, true),
 						MockValidator("validator-3", &called, true),
 					},
+					ExpectedCalls: 3,
+					Success:       true,
 				},
 				{
-					3,
-					false,
-					[]ValidatorContext{
+					Contexts: []ValidatorContext{
 						MockValidator("validator-1", &called, false),
 						MockValidator("validator-2", &called, true),
 						MockValidator("validator-3", &called, true),
 					},
+					ExpectedCalls: 3,
+					Success:       false,
 				},
 				{
-					3,
-					false,
-					[]ValidatorContext{
+					Contexts: []ValidatorContext{
 						MockValidator("validator-1", &called, true),
 						MockValidator("validator-2", &called, true),
 						MockValidator("validator-3", &called, false),
 					},
+					ExpectedCalls: 3,
+					Success:       false,
 				},
 			}
 
@@ -120,9 +120,9 @@ var _ = Describe("Main", func() {
 
 	Describe("CLI argument validation", func() {
 		type testCase struct {
+			ValidatorContext ValidatorContext
 			Flag             string
 			Value            string
-			ValidatorContext ValidatorContext
 			ExpError         bool
 		}
 

internal/events/event.go

@@ -17,8 +17,8 @@ type UpsertEvent struct {
 
 // DeleteEvent representing deleting a resource.
 type DeleteEvent struct {
-	// NamespacedName is the namespace & name of the deleted resource.
-	NamespacedName types.NamespacedName
 	// Type is the resource type. For example, if the event is for *v1beta1.HTTPRoute, pass &v1beta1.HTTPRoute{} as Type.
 	Type client.Object
+	// NamespacedName is the namespace & name of the deleted resource.
+	NamespacedName types.NamespacedName
 }

internal/events/first_eventbatch_preparer.go

@@ -36,9 +36,9 @@ type EachListItemFunc func(obj runtime.Object, fn func(runtime.Object) error) er
 // FirstEventBatchPreparerImpl is an implementation of FirstEventBatchPreparer.
 type FirstEventBatchPreparerImpl struct {
 	reader       Reader
+	eachListItem EachListItemFunc
 	objects      []client.Object
 	objectLists  []client.ObjectList
-	eachListItem EachListItemFunc
 }
 
 // NewFirstEventBatchPreparerImpl creates a new FirstEventBatchPreparerImpl.

internal/events/handler.go

@@ -35,14 +35,14 @@ type EventHandlerConfig struct {
 	SecretMemoryManager state.SecretDiskMemoryManager
 	// Generator is the nginx config Generator.
 	Generator config.Generator
-	// Logger is the logger to be used by the EventHandler.
-	Logger logr.Logger
 	// NginxFileMgr is the file Manager for nginx.
 	NginxFileMgr file.Manager
 	// NginxRuntimeMgr manages nginx runtime.
 	NginxRuntimeMgr runtime.Manager
 	// StatusUpdater updates statuses on Kubernetes resources.
 	StatusUpdater status.Updater
+	// Logger is the logger to be used by the EventHandler.
+	Logger logr.Logger
 }
 
 // EventHandlerImpl implements EventHandler.

internal/events/loop.go

@@ -22,11 +22,10 @@ import (
 // FIXME(pleshakov): better document the side effects and how to prevent and mitigate them.
 // So when the EventLoop have 100 saved events, it is better to process them at once rather than one by one.
 type EventLoop struct {
-	eventCh <-chan interface{}
-	logger  logr.Logger
-	handler EventHandler
-
+	handler  EventHandler
 	preparer FirstEventBatchPreparer
+	eventCh  <-chan interface{}
+	logger   logr.Logger
 }
 
 // NewEventLoop creates a new EventLoop.

internal/manager/controllers_test.go

@@ -48,8 +48,8 @@ func TestRegisterController(t *testing.T) {
 	tests := []struct {
 		fakes                   fakes
 		expectedErr             error
-		expectedMgrAddCallCount int
 		msg                     string
+		expectedMgrAddCallCount int
 	}{
 		{
 			fakes:                   getDefaultFakes(),

internal/manager/predicate/service.go

@@ -15,8 +15,8 @@ type ServicePortsChangedPredicate struct {
 
 // ports contains the ports that the Gateway cares about.
 type ports struct {
-	servicePort int32
 	targetPort  intstr.IntOrString
+	servicePort int32
 }
 
 // Update implements default UpdateEvent filter for validating Service port changes.

internal/manager/predicate/service_test.go

@@ -11,9 +11,9 @@ import (
 
 func TestServicePortsChangedPredicate_Update(t *testing.T) {
 	testcases := []struct {
-		msg       string
 		objectOld client.Object
 		objectNew client.Object
+		msg       string
 		expUpdate bool
 	}{
 		{