Lint fixes

Signed-off-by: Tero Saarni <[email protected]>

internal/dag/httpproxy_processor.go

@@ -918,7 +918,7 @@ func (p *HTTPProxyProcessor) computeRoutes(
 
 		healthPolicy, err := httpHealthCheckPolicy(route.HealthCheckPolicy)
 		if err != nil {
-			validCond.AddErrorf(contour_v1.ConditionTypeRouteError, "HealthCheckPolicyInvalid", err.Error())
+			validCond.AddError(contour_v1.ConditionTypeRouteError, "HealthCheckPolicyInvalid", err.Error())
 			return nil
 		}
 

internal/dag/status_test.go

@@ -5168,7 +5168,7 @@ func TestDAGStatus(t *testing.T) {
 	})
 }
 
-func validGatewayStatusUpdate(listenerName string, listenerProtocol gatewayapi_v1.ProtocolType, attachedRoutes int) []*status.GatewayStatusUpdate {
+func validGatewayStatusUpdate(listenerName string, listenerProtocol gatewayapi_v1.ProtocolType, attachedRoutes int32) []*status.GatewayStatusUpdate {
 	var supportedKinds []gatewayapi_v1.RouteGroupKind
 
 	switch listenerProtocol {
@@ -5218,7 +5218,7 @@ func validGatewayStatusUpdate(listenerName string, listenerProtocol gatewayapi_v
 			ListenerStatus: map[string]*gatewayapi_v1.ListenerStatus{
 				listenerName: {
 					Name:           gatewayapi_v1.SectionName(listenerName),
-					AttachedRoutes: int32(attachedRoutes),
+					AttachedRoutes: attachedRoutes,
 					SupportedKinds: supportedKinds,
 					Conditions:     listenerValidConditions(),
 				},

internal/featuretests/v3/featuretests.go

@@ -321,7 +321,7 @@ func (s *StatusResult) Equals(want contour_v1.HTTPProxyStatus) *Contour {
 	// We should never get an error fetching the status for an
 	// object, so make it fatal if we do.
 	if s.Err != nil {
-		s.T.Fatalf(s.Err.Error())
+		s.T.Fatal(s.Err.Error())
 	}
 
 	assert.Equal(s.T, want, *s.Have)
@@ -336,7 +336,7 @@ func (s *StatusResult) Like(want contour_v1.HTTPProxyStatus) *Contour {
 	// We should never get an error fetching the status for an
 	// object, so make it fatal if we do.
 	if s.Err != nil {
-		s.T.Fatalf(s.Err.Error())
+		s.T.Fatal(s.Err.Error())
 	}
 
 	if len(want.CurrentStatus) > 0 {

internal/provisioner/model/model.go

@@ -136,7 +136,7 @@ func (c *Contour) EnvoyTolerationsExist() bool {
 }
 
 func (c *Contour) WatchAllNamespaces() bool {
-	return c.Spec.WatchNamespaces == nil || len(c.Spec.WatchNamespaces) == 0
+	return len(c.Spec.WatchNamespaces) == 0
 }
 
 // ContourSpec defines the desired state of Contour.

internal/provisioner/objects/deployment/deployment.go

@@ -110,7 +110,7 @@ func DesiredDeployment(contour *model.Contour, image string) *apps_v1.Deployment
 		args = append(args, fmt.Sprintf("--watch-namespaces=%s", strings.Join(ns, ",")))
 	}
 
-	if contour.Spec.DisabledFeatures != nil && len(contour.Spec.DisabledFeatures) > 0 {
+	if len(contour.Spec.DisabledFeatures) > 0 {
 		for _, f := range contour.Spec.DisabledFeatures {
 			args = append(args, fmt.Sprintf("--disable-feature=%s", string(f)))
 		}

internal/xds/v3/callbacks_test.go

@@ -15,7 +15,6 @@ package v3
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
@@ -168,7 +167,7 @@ func TestLogDiscoveryRequestDetails(t *testing.T) {
 					break
 				}
 			}
-			assert.NotNil(t, logEntry, fmt.Sprintf("no log line with expected message %q", tc.expectedLogMsg))
+			assert.NotNil(t, logEntry, "no log line with expected message %q", tc.expectedLogMsg)
 			assert.Equal(t, tc.expectedLogData, logEntry.Data)
 			logHook.Reset()
 		})

test/e2e/upgrade/upgrade_test.go

@@ -130,9 +130,9 @@ var _ = Describe("When upgrading", func() {
 				poller.Stop()
 				totalRequests, successfulRequests := poller.Results()
 				f.T().Logf("Total requests: %d, successful requests: %d\n", totalRequests, successfulRequests)
-				require.Greater(f.T(), totalRequests, uint(0))
+				require.Positive(f.T(), totalRequests)
 				successPercentage := 100 * float64(successfulRequests) / float64(totalRequests)
-				require.Greaterf(f.T(), successPercentage, float64(90.0), "success rate of %.2f%% less than 90%", successPercentage)
+				require.Greaterf(f.T(), successPercentage, float64(90.0), "success rate of %.2f%% less than 90%%", successPercentage)
 			})
 		})
 	})
@@ -292,15 +292,15 @@ var _ = Describe("When upgrading", func() {
 				poller.Stop()
 				totalRequests, successfulRequests := poller.Results()
 				f.T().Logf("Total requests: %d, successful requests: %d\n", totalRequests, successfulRequests)
-				require.Greater(f.T(), totalRequests, uint(0))
+				require.Positive(f.T(), totalRequests)
 				successPercentage := 100 * float64(successfulRequests) / float64(totalRequests)
 				// Success threshold is somewhat arbitrary but less than the standalone
 				// Contour upgrade threshold because the Gateway provisioner does not
 				// currently fully upgrade the control plane before the data plane which
 				// can lead to additional downtime when both are upgrading at the same
 				// time.
 				// ref. https://github.com/projectcontour/contour/issues/5375.
-				require.Greaterf(f.T(), successPercentage, float64(80.0), "success rate of %.2f%% less than 80%", successPercentage)
+				require.Greaterf(f.T(), successPercentage, float64(80.0), "success rate of %.2f%% less than 80%%", successPercentage)
 			})
 		})
 	})