Enable ginkgolinter and fix finding (#1689)

Enable ginkgolinter in .golangci.yaml, and fix its findings.

Author: nunnatsa

.golangci.yml

@@ -1,4 +1,6 @@
 linters-settings:
+  ginkgolinter:
+    forbid-focus-container: true
   goimports:
     local-prefixes: github.com/nginxinc/nginx-gateway-fabric
   misspell:
@@ -41,6 +43,7 @@ linters:
     - asciicheck
     - errcheck
     - errorlint
+    - ginkgolinter
     - gocyclo
     - gofmt
     - gofumpt

internal/framework/controller/register_test.go

@@ -150,7 +150,7 @@ func TestRegister(t *testing.T) {
 			} else {
 				err := register()
 				if test.expectedErr == nil {
-					g.Expect(err).To(BeNil())
+					g.Expect(err).ToNot(HaveOccurred())
 				} else {
 					g.Expect(err).To(MatchError(test.expectedErr))
 				}

internal/framework/events/events_test.go

@@ -28,8 +28,8 @@ func TestEventLoop_SwapBatches(t *testing.T) {
 
 	eventLoop.swapBatches()
 
-	g.Expect(len(eventLoop.currentBatch)).To(Equal(len(nextBatch)))
+	g.Expect(eventLoop.currentBatch).To(HaveLen(len(nextBatch)))
 	g.Expect(eventLoop.currentBatch).To(Equal(nextBatch))
-	g.Expect(len(eventLoop.nextBatch)).To(Equal(0))
+	g.Expect(eventLoop.nextBatch).To(BeEmpty())
 	g.Expect(cap(eventLoop.nextBatch)).To(Equal(3))
 }

internal/framework/events/first_eventbatch_preparer_test.go

@@ -58,7 +58,7 @@ var _ = Describe("FirstEventBatchPreparer", func() {
 			batch, err := preparer.Prepare(context.Background())
 
 			Expect(batch).Should(BeEmpty())
-			Expect(err).Should(BeNil())
+			Expect(err).ToNot(HaveOccurred())
 		})
 
 		It("should prepare one event for each resource type", func() {
@@ -97,7 +97,7 @@ var _ = Describe("FirstEventBatchPreparer", func() {
 			batch, err := preparer.Prepare(context.Background())
 
 			Expect(batch).Should(Equal(expectedBatch))
-			Expect(err).Should(BeNil())
+			Expect(err).ToNot(HaveOccurred())
 		})
 	})
 

internal/framework/events/loop_test.go

@@ -59,7 +59,7 @@ var _ = Describe("EventLoop", func() {
 
 			var err error
 			Eventually(errorCh).Should(Receive(&err))
-			Expect(err).To(BeNil())
+			Expect(err).ToNot(HaveOccurred())
 		})
 
 		// Because BeforeEach() creates the first batch and waits for it to be handled, in the tests below
@@ -138,7 +138,7 @@ var _ = Describe("EventLoop", func() {
 			cancel()
 			err := eventLoop.Start(ctx)
 
-			Expect(err).Should(BeNil())
+			Expect(err).ToNot(HaveOccurred())
 		})
 	})
 })

internal/framework/runnables/runnables_test.go

@@ -32,7 +32,7 @@ func TestEnableAfterBecameLeader(t *testing.T) {
 	g.Expect(enabled).To(BeFalse())
 
 	err := enableAfterBecameLeader.Start(context.Background())
-	g.Expect(err).To(BeNil())
+	g.Expect(err).ToNot(HaveOccurred())
 
 	g.Expect(enabled).To(BeTrue())
 }

internal/mode/provisioner/handler_test.go

@@ -342,7 +342,7 @@ var _ = Describe("handler", func() {
 				err := k8sclient.List(context.Background(), deps)
 
 				Expect(err).ToNot(HaveOccurred())
-				Expect(deps.Items).To(HaveLen(0))
+				Expect(deps.Items).To(BeEmpty())
 			})
 		})
 
@@ -370,7 +370,7 @@ var _ = Describe("handler", func() {
 				err := k8sclient.List(context.Background(), deps)
 
 				Expect(err).ToNot(HaveOccurred())
-				Expect(deps.Items).To(HaveLen(0))
+				Expect(deps.Items).To(BeEmpty())
 			})
 		})
 

internal/mode/static/handler_test.go

@@ -229,7 +229,7 @@ var _ = Describe("eventHandler", func() {
 				"Failed to update control plane configuration: logging.level: Unsupported value: " +
 					"\"invalid\": supported values: \"info\", \"debug\", \"error\"")
 			Expect(statuses).To(Equal(expStatuses(cond)))
-			Expect(len(fakeEventRecorder.Events)).To(Equal(1))
+			Expect(fakeEventRecorder.Events).To(HaveLen(1))
 			event := <-fakeEventRecorder.Events
 			Expect(event).To(Equal(
 				"Warning UpdateFailed Failed to update control plane configuration: logging.level: Unsupported value: " +
@@ -252,7 +252,7 @@ var _ = Describe("eventHandler", func() {
 
 			Expect(handler.GetLatestConfiguration()).To(BeNil())
 
-			Expect(len(fakeEventRecorder.Events)).To(Equal(1))
+			Expect(fakeEventRecorder.Events).To(HaveLen(1))
 			event := <-fakeEventRecorder.Events
 			Expect(event).To(Equal("Warning ResourceDeleted NginxGateway configuration was deleted; using defaults"))
 			Expect(zapLogLevelSetter.Enabled(zap.InfoLevel)).To(BeTrue())

internal/mode/static/sort/sort_test.go

@@ -85,7 +85,7 @@ func TestLessObjectMeta(t *testing.T) {
 			invertedResult := LessObjectMeta(test.meta2, test.meta1)
 
 			g.Expect(result).To(Equal(test.expected))
-			g.Expect(invertedResult).To(Equal(false))
+			g.Expect(invertedResult).To(BeFalse())
 		})
 	}
 }

internal/mode/static/state/graph/backend_tls_policy_test.go

@@ -405,7 +405,7 @@ func TestValidateBackendTLSPolicy(t *testing.T) {
 			if !test.isValid && !test.ignored {
 				g.Expect(conds).To(HaveLen(1))
 			} else {
-				g.Expect(conds).To(HaveLen(0))
+				g.Expect(conds).To(BeEmpty())
 			}
 		})
 	}