fix lint issues

projectcontour · Aug 15, 2023 · 3672d63 · 3672d63
1 parent 4c7c76a
commit 3672d63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/internal/featuretests/v3/featuretests.go b/internal/featuretests/v3/featuretests.go
@@ -153,7 +153,7 @@ func setup(t *testing.T, opts ...any) (ResourceEventHandlerWrapper, *Contour, fu
 			dag.ComposeObservers(xdscache.ObserversOf(resources)...),
 		),
 		Builder: builder,
-	})
+	}, func() bool { return true })
 
 	l, err := net.Listen("tcp", "127.0.0.1:0")
 	require.NoError(t, err)

diff --git a/internal/xdscache/v3/server_test.go b/internal/xdscache/v3/server_test.go
@@ -27,12 +27,6 @@ import (
 	envoy_service_runtime_v3 "github.com/envoyproxy/go-control-plane/envoy/service/runtime/v3"
 	envoy_service_secret_v3 "github.com/envoyproxy/go-control-plane/envoy/service/secret/v3"
 	resource "github.com/envoyproxy/go-control-plane/pkg/resource/v3"
-	"github.com/projectcontour/contour/internal/contour"
-	"github.com/projectcontour/contour/internal/dag"
-	"github.com/projectcontour/contour/internal/fixture"
-	"github.com/projectcontour/contour/internal/xds"
-	contour_xds_v3 "github.com/projectcontour/contour/internal/xds/v3"
-	"github.com/projectcontour/contour/internal/xdscache"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -42,6 +36,13 @@ import (
 	networking_v1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/projectcontour/contour/internal/contour"
+	"github.com/projectcontour/contour/internal/dag"
+	"github.com/projectcontour/contour/internal/fixture"
+	"github.com/projectcontour/contour/internal/xds"
+	contour_xds_v3 "github.com/projectcontour/contour/internal/xds/v3"
+	"github.com/projectcontour/contour/internal/xdscache"
 )
 
 func TestGRPC(t *testing.T) {
@@ -214,7 +215,7 @@ func TestGRPC(t *testing.T) {
 				Logger:   log,
 				Builder:  new(dag.Builder),
 				Observer: dag.ComposeObservers(xdscache.ObserversOf(resources)...),
-			})
+			}, func() bool { return true })
 
 			srv := xds.NewServer(nil)
 			contour_xds_v3.RegisterServer(contour_xds_v3.NewContourServer(log, xdscache.ResourcesOf(resources)...), srv)