chore(deps): bump github.com/golangci/golangci-lint from 1.55.2 to 1.…

…56.1 in /third_party (#5601) * chore(deps): bump github.com/golangci/golangci-lint in /third_party Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.55.2 to 1.56.1. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](golangci/golangci-lint@v1.55.2...v1.56.1) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore(lint): fix issues reported by golangci-lint --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jakub Warczarek <[email protected]>
Kong · Feb 9, 2024 · 447b3ae · 447b3ae
1 parent 6e79723
commit 447b3ae
Show file tree

Hide file tree

Showing 36 changed files with 194 additions and 252 deletions.
diff --git a/hack/cleanup/konnect_runtime_groups.go b/hack/cleanup/konnect_runtime_groups.go
@@ -26,7 +26,7 @@ const (
 // cleanupKonnectControlPlanes deletes orphaned control planes created by the tests and their roles.
 func cleanupKonnectControlPlanes(ctx context.Context, log logr.Logger) error {
 	cpClient, err := cp.NewClientWithResponses(konnectControlPlanesBaseURL, cp.WithRequestEditorFn(
-		func(ctx context.Context, req *http.Request) error {
+		func(_ context.Context, req *http.Request) error {
 			req.Header.Set("Authorization", "Bearer "+konnectAccessToken)
 			return nil
 		}),

diff --git a/internal/admission/validator_test.go b/internal/admission/validator_test.go
@@ -994,7 +994,7 @@ func TestValidator_ValidateIngress(t *testing.T) {
 				ingressClassMatcher: func(*metav1.ObjectMeta, string, annotations.ClassMatching) bool {
 					return false // Always return false, we'll use Spec.IngressClassName matcher.
 				},
-				ingressV1ClassMatcher: func(ingress *netv1.Ingress, matching annotations.ClassMatching) bool {
+				ingressV1ClassMatcher: func(ingress *netv1.Ingress, _ annotations.ClassMatching) bool {
 					return *ingress.Spec.IngressClassName == annotations.DefaultIngressClass
 				},
 				Logger: logr.Discard(),

diff --git a/internal/cmd/rootcmd/env_test.go b/internal/cmd/rootcmd/env_test.go
@@ -15,7 +15,7 @@ func TestBindEnvVars(t *testing.T) {
 	commandHasRun := false
 	cmd := &cobra.Command{
 		PreRunE: bindEnvVars,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			got1, _ := cmd.Flags().GetString("flag-1")
 			got2, _ := cmd.Flags().GetString("flag-2")
 			got3, _ := cmd.Flags().GetString("flag-3")
@@ -50,7 +50,7 @@ func TestBindEnvVarsSlice(t *testing.T) {
 	t.Run("set by flags", func(t *testing.T) {
 		cmd := &cobra.Command{
 			PreRunE: bindEnvVars,
-			Run:     func(cmd *cobra.Command, args []string) {},
+			Run:     func(_ *cobra.Command, _ []string) {},
 		}
 
 		ss := cmd.Flags().StringSlice("flag-string-slice", []string{"default"}, "No description")
@@ -69,7 +69,7 @@ func TestBindEnvVarsSlice(t *testing.T) {
 	t.Run("set by env", func(t *testing.T) {
 		cmd := &cobra.Command{
 			PreRunE: bindEnvVars,
-			Run:     func(cmd *cobra.Command, args []string) {},
+			Run:     func(_ *cobra.Command, _ []string) {},
 		}
 
 		ss := cmd.Flags().StringSlice("flag-string-slice", []string{"default"}, "No description")
@@ -85,7 +85,7 @@ func TestBindEnvVarsSlice(t *testing.T) {
 func TestBindEnvVarsValidation(t *testing.T) {
 	cmd := &cobra.Command{
 		PreRunE: bindEnvVars,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return cmd.Flags().Parse(nil)
 		},
 	}

diff --git a/internal/cmd/rootcmd/rootcmd.go b/internal/cmd/rootcmd/rootcmd.go
@@ -26,7 +26,7 @@ func Execute() {
 func GetRootCmd(cfg *manager.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		PersistentPreRunE: bindEnvVars,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			return Run(cmd.Context(), cfg, os.Stderr)
 		},
 		SilenceUsage: true,
@@ -42,7 +42,7 @@ func GetVersionCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:   "version",
 		Short: "Show JSON version information",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			type Version struct {
 				Release string `json:"release"`
 				Repo    string `json:"repo"`

diff --git a/internal/controllers/configuration/secret_controller.go b/internal/controllers/configuration/secret_controller.go
@@ -59,7 +59,7 @@ func (r *CoreV1SecretReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	predicateFuncs := predicate.NewPredicateFuncs(r.shouldReconcileSecret)
 	// we should always try to delete secrets in caches when they are deleted in cluster.
-	predicateFuncs.DeleteFunc = func(event event.DeleteEvent) bool { return true }
+	predicateFuncs.DeleteFunc = func(_ event.DeleteEvent) bool { return true }
 	return c.Watch(
 		source.Kind(mgr.GetCache(), &corev1.Secret{}),
 		&handler.EnqueueRequestForObject{},

diff --git a/internal/controllers/gateway/grpcroute_controller.go b/internal/controllers/gateway/grpcroute_controller.go
@@ -74,7 +74,7 @@ func (r *GRPCRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		source.Kind(mgr.GetCache(), &gatewayapi.GatewayClass{}),
 		handler.EnqueueRequestsFromMapFunc(r.listGRPCRoutesForGatewayClass),
 		predicate.Funcs{
-			GenericFunc: func(e event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
+			GenericFunc: func(_ event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
 			CreateFunc:  func(e event.CreateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			UpdateFunc:  func(e event.UpdateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			DeleteFunc:  func(e event.DeleteEvent) bool { return isGatewayClassEventInClass(r.Log, e) },

diff --git a/internal/controllers/gateway/httproute_controller.go b/internal/controllers/gateway/httproute_controller.go
@@ -92,7 +92,7 @@ func (r *HTTPRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		source.Kind(mgr.GetCache(), &gatewayapi.GatewayClass{}),
 		handler.EnqueueRequestsFromMapFunc(r.listHTTPRoutesForGatewayClass),
 		predicate.Funcs{
-			GenericFunc: func(e event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
+			GenericFunc: func(_ event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
 			CreateFunc:  func(e event.CreateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			UpdateFunc:  func(e event.UpdateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			DeleteFunc:  func(e event.DeleteEvent) bool { return isGatewayClassEventInClass(r.Log, e) },

diff --git a/internal/controllers/gateway/tcproute_controller.go b/internal/controllers/gateway/tcproute_controller.go
@@ -71,7 +71,7 @@ func (r *TCPRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		source.Kind(mgr.GetCache(), &gatewayapi.GatewayClass{}),
 		handler.EnqueueRequestsFromMapFunc(r.listTCPRoutesForGatewayClass),
 		predicate.Funcs{
-			GenericFunc: func(e event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
+			GenericFunc: func(_ event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
 			CreateFunc:  func(e event.CreateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			UpdateFunc:  func(e event.UpdateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			DeleteFunc:  func(e event.DeleteEvent) bool { return isGatewayClassEventInClass(r.Log, e) },

diff --git a/internal/controllers/gateway/tlsroute_controller.go b/internal/controllers/gateway/tlsroute_controller.go
@@ -70,7 +70,7 @@ func (r *TLSRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		source.Kind(mgr.GetCache(), &gatewayapi.GatewayClass{}),
 		handler.EnqueueRequestsFromMapFunc(r.listTLSRoutesForGatewayClass),
 		predicate.Funcs{
-			GenericFunc: func(e event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
+			GenericFunc: func(_ event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
 			CreateFunc:  func(e event.CreateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			UpdateFunc:  func(e event.UpdateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			DeleteFunc:  func(e event.DeleteEvent) bool { return isGatewayClassEventInClass(r.Log, e) },

diff --git a/internal/controllers/gateway/udproute_controller.go b/internal/controllers/gateway/udproute_controller.go
@@ -70,7 +70,7 @@ func (r *UDPRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		source.Kind(mgr.GetCache(), &gatewayapi.GatewayClass{}),
 		handler.EnqueueRequestsFromMapFunc(r.listUDPRoutesForGatewayClass),
 		predicate.Funcs{
-			GenericFunc: func(e event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
+			GenericFunc: func(_ event.GenericEvent) bool { return false }, // we don't need to enqueue from generic
 			CreateFunc:  func(e event.CreateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			UpdateFunc:  func(e event.UpdateEvent) bool { return isGatewayClassEventInClass(r.Log, e) },
 			DeleteFunc:  func(e event.DeleteEvent) bool { return isGatewayClassEventInClass(r.Log, e) },

diff --git a/internal/dataplane/address_finder_test.go b/internal/dataplane/address_finder_test.go
@@ -25,7 +25,7 @@ func TestAddressFinder(t *testing.T) {
 	t.Log("generating a fake AddressGetter")
 	defaultAddrs := []string{"127.0.0.1", "127.0.0.2"}
 	overrideAddrs := []string{"192.168.1.1", "192.168.1.2", "192.168.1.3"}
-	fakeGetter := func(ctx context.Context) ([]string, error) { return defaultAddrs, nil }
+	fakeGetter := func(_ context.Context) ([]string, error) { return defaultAddrs, nil }
 
 	t.Log("verifying getting a list of addresses from the finder after a getter function is provided")
 	finder.SetGetter(fakeGetter)

diff --git a/internal/dataplane/translator/translate_httproute_test.go b/internal/dataplane/translator/translate_httproute_test.go
@@ -159,7 +159,7 @@ func TestIngressRulesFromHTTPRoutes(t *testing.T) {
 	testCases := []testCaseIngressRulesFromHTTPRoutes{
 		{
 			msg: "an empty list of HTTPRoutes should produce no ingress rules",
-			expected: func(routes []*gatewayapi.HTTPRoute) ingressRules {
+			expected: func(_ []*gatewayapi.HTTPRoute) ingressRules {
 				return ingressRules{
 					SecretNameToSNIs:      newSecretNameToSNIs(),
 					ServiceNameToParent:   map[string]client.Object{},

diff --git a/internal/manager/flags/validated_test.go b/internal/manager/flags/validated_test.go
@@ -131,7 +131,7 @@ func TestValidatedValue_WithDefault(t *testing.T) {
 		flagSet := createFlagSet()
 
 		var cs customStringer
-		flagSet.Var(flags.NewValidatedValue(&cs, func(s string) (customStringer, error) {
+		flagSet.Var(flags.NewValidatedValue(&cs, func(_ string) (customStringer, error) {
 			return customStringer{}, nil
 		}, flags.WithDefault(customStringer{})), "flag-with-default", "")
 
@@ -154,7 +154,7 @@ func TestValidatedValue_Type(t *testing.T) {
 	t.Run("struct", func(t *testing.T) {
 		type customType struct{}
 		var customTypeVar customType
-		vv := flags.NewValidatedValue(&customTypeVar, func(s string) (customType, error) {
+		vv := flags.NewValidatedValue(&customTypeVar, func(_ string) (customType, error) {
 			return customType{}, nil
 		})
 		require.Equal(t, "flags_test.customType", vv.Type())
@@ -163,7 +163,7 @@ func TestValidatedValue_Type(t *testing.T) {
 	t.Run("overridden type name", func(t *testing.T) {
 		type customType struct{}
 		var customTypeVar customType
-		vv := flags.NewValidatedValue(&customTypeVar, func(s string) (customType, error) {
+		vv := flags.NewValidatedValue(&customTypeVar, func(_ string) (customType, error) {
 			return customType{}, nil
 		}, flags.WithTypeNameOverride[customType]("custom-type-override"))
 		require.Equal(t, "custom-type-override", vv.Type())

diff --git a/internal/manager/health_check_test.go b/internal/manager/health_check_test.go
@@ -18,10 +18,10 @@ import (
 )
 
 func TestHealthCheckServer(t *testing.T) {
-	passChecker := func(req *http.Request) error {
+	passChecker := func(_ *http.Request) error {
 		return nil
 	}
-	failChecker := func(req *http.Request) error {
+	failChecker := func(_ *http.Request) error {
 		return errors.New("you shall not pass")
 	}
 

diff --git a/internal/manager/run.go b/internal/manager/run.go
@@ -375,7 +375,7 @@ func waitForKubernetesAPIReadiness(ctx context.Context, logger logr.Logger, mgr
 		retry.DelayType(retry.FixedDelay),
 		retry.Attempts(0), // We're using a context with timeout, so we don't need to limit the number of attempts.
 		retry.LastErrorOnly(true),
-		retry.OnRetry(func(n uint, err error) {
+		retry.OnRetry(func(_ uint, err error) {
 			logger.Info("Retrying Kubernetes API readiness check after error", "error", err.Error())
 		}),
 	)

diff --git a/test/e2e/all_in_one_test.go b/test/e2e/all_in_one_test.go
@@ -311,7 +311,7 @@ func TestDeployAllInOneDBLESS(t *testing.T) {
 	scaleDeployment(ctx, t, env, deployments.ProxyNN, 1)
 
 	t.Log("misconfigure the ingress")
-	reconfigureExistingIngress(ctx, t, env, ingress, func(i *netv1.Ingress) {
+	reconfigureExistingIngress(ctx, t, env, ingress, func(_ *netv1.Ingress) {
 		ingress.Spec.Rules[0].HTTP.Paths[0].Path = badEchoPath
 	})
 

diff --git a/test/envtest/metrics_envtest_test.go b/test/envtest/metrics_envtest_test.go
@@ -80,7 +80,7 @@ func TestMetricsAreServed(t *testing.T) {
 					retry.DelayType(retry.BackOffDelay),
 					retry.Attempts(0), // We're using a context with timeout, so we don't need to limit the number of attempts.
 					retry.LastErrorOnly(true),
-					retry.OnRetry(func(n uint, err error) {
+					retry.OnRetry(func(_ uint, err error) {
 						t.Logf("metric %s not present yet, err: %v", metric, err.Error())
 					}),
 				),

diff --git a/test/integration/ingress_https_test.go b/test/integration/ingress_https_test.go
@@ -61,7 +61,7 @@ func TestHTTPSRedirect(t *testing.T) {
 
 	t.Log("waiting for Ingress to be operational and properly redirect")
 	client := &http.Client{
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+		CheckRedirect: func(_ *http.Request, _ []*http.Request) error {
 			return http.ErrUseLastResponse
 		},
 		Timeout: time.Second * 3,

diff --git a/test/integration/isolated/examples_grpc_test.go b/test/integration/isolated/examples_grpc_test.go
@@ -56,11 +56,11 @@ func TestGRPCRouteExample(t *testing.T) {
 				"PROXY_LISTEN": `0.0.0.0:8000 http2\, 0.0.0.0:8443 http2 ssl`,
 			}),
 		)).
-		Assess("deploying to cluster works and deployed GRPC via HTTP responds", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		Assess("deploying to cluster works and deployed GRPC via HTTP responds", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			testGRPC(ctx, t, "gateway-grpcroute-via-http.yaml", ktfkong.DefaultProxyHTTPPort, "example-grpc-via-http.com", false)
 			return ctx
 		}).
-		Assess("deploying to cluster works and deployed GRPC via HTTPS responds", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		Assess("deploying to cluster works and deployed GRPC via HTTPS responds", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			testGRPC(ctx, t, "gateway-grpcroute-via-https.yaml", ktfkong.DefaultProxyTLSServicePort, "example.com", true)
 			return ctx
 		}).

diff --git a/test/integration/isolated/examples_kong_service_facade_test.go b/test/integration/isolated/examples_kong_service_facade_test.go
@@ -31,7 +31,7 @@ func TestKongServiceFacadeExample(t *testing.T) {
 		WithSetup("deploy kong addon into cluster", featureSetup(
 			withControllerManagerOpts(helpers.ControllerManagerOptAdditionalWatchNamespace("default")),
 		)).
-		WithSetup("deploy example manifest", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		WithSetup("deploy example manifest", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			manifestPath := examplesManifestPath("kong-service-facade.yaml")
 
 			b, err := os.ReadFile(manifestPath)
@@ -65,7 +65,7 @@ func TestKongServiceFacadeExample(t *testing.T) {
 			helpers.WaitForDeploymentRollout(ctx, t, cluster, "default", "httpbin-deployment")
 			return ctx
 		}).
-		Assess("basic-auth and key-auth plugins are applied to KongServiceFacades as expected", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		Assess("basic-auth and key-auth plugins are applied to KongServiceFacades as expected", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			var (
 				proxyURL = GetProxyURLFromCtx(ctx)
 

diff --git a/test/integration/isolated/examples_udproute_test.go b/test/integration/isolated/examples_udproute_test.go
@@ -33,7 +33,7 @@ func TestExampleUDPRoute(t *testing.T) {
 			withControllerManagerOpts(helpers.ControllerManagerOptAdditionalWatchNamespace("default")),
 		)).
 		Assess("deploying to cluster works and deployed coredns responds to UDP queries",
-			func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
+			func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 				cleaner := GetFromCtxForT[*clusters.Cleaner](ctx, t)
 				cluster := GetClusterFromCtx(ctx)
 				proxyUDPURL := GetUDPURLFromCtx(ctx)

diff --git a/test/integration/isolated/grpc_test.go b/test/integration/isolated/grpc_test.go
@@ -44,7 +44,7 @@ func TestGRPCRouteEssentials(t *testing.T) {
 		WithLabel(testlabels.NetworkingFamily, testlabels.NetworkingFamilyGatewayAPI).
 		WithLabel(testlabels.Kind, testlabels.KindGRPCRoute).
 		WithSetup("deploy kong addon into cluster", featureSetup()).
-		Assess("deploying Gateway and example GRPC service (without konghq.com/protocol annotation) exposed via GRPCRoute over HTTPS", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		Assess("deploying Gateway and example GRPC service (without konghq.com/protocol annotation) exposed via GRPCRoute over HTTPS", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			// On purpose omit protocol annotation to test defaulting to "grpcs" that is preserved to not break users' configs.
 			cleaner := GetFromCtxForT[*clusters.Cleaner](ctx, t)
 			cluster := GetClusterFromCtx(ctx)
@@ -167,7 +167,7 @@ func TestGRPCRouteEssentials(t *testing.T) {
 
 			return ctx
 		}).
-		Assess("checking if GRPCRoute is linked correctly and client can connect properly to the exposed service", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		Assess("checking if GRPCRoute is linked correctly and client can connect properly to the exposed service", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			proxyURL := GetProxyURLFromCtx(ctx)
 			namespace := GetNamespaceForT(ctx, t)
 			gatewayClient := GetFromCtxForT[*gatewayclient.Clientset](ctx, t)

diff --git a/test/integration/isolated/ingress_test.go b/test/integration/isolated/ingress_test.go
@@ -45,7 +45,7 @@ func TestIngressGRPC(t *testing.T) {
 				"PROXY_LISTEN": `0.0.0.0:8000 http2\, 0.0.0.0:8443 http2 ssl`,
 			}),
 		)).
-		WithSetup("deploying gRPC service exposed via Ingress", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		WithSetup("deploying gRPC service exposed via Ingress", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			cleaner := GetFromCtxForT[*clusters.Cleaner](ctx, t)
 			cluster := GetClusterFromCtx(ctx)
 			namespace := GetNamespaceForT(ctx, t)
@@ -159,7 +159,7 @@ func TestIngressGRPC(t *testing.T) {
 
 			return ctx
 		}).
-		Assess("checking whether Ingress status is updated and gRPC traffic is properly routed", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		Assess("checking whether Ingress status is updated and gRPC traffic is properly routed", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			t.Log("waiting for updated ingress status to include IP")
 			assert.Eventually(t, func() bool {
 				cluster := GetClusterFromCtx(ctx)
@@ -214,13 +214,13 @@ func TestIngress_KongServiceFacadeAsBackend(t *testing.T) {
 		WithLabel(testlabels.NetworkingFamily, testlabels.NetworkingFamilyIngress).
 		WithLabel(testlabels.Kind, testlabels.KindIngress).
 		WithSetup("deploy kong addon into cluster", featureSetup()).
-		WithSetup("prepare Kong clients", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		WithSetup("prepare Kong clients", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			cluster := GetClusterFromCtx(ctx)
 			kongClients, err := clientset.NewForConfig(cluster.Config())
 			require.NoError(t, err)
 			return SetInCtxForT(ctx, t, kongClients)
 		}).
-		WithSetup("deploying KongServiceFacade exposed via Ingress", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		WithSetup("deploying KongServiceFacade exposed via Ingress", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			cleaner := GetFromCtxForT[*clusters.Cleaner](ctx, t)
 			cluster := GetClusterFromCtx(ctx)
 			namespace := GetNamespaceForT(ctx, t)
@@ -351,7 +351,7 @@ func TestIngress_KongServiceFacadeAsBackend(t *testing.T) {
 
 			return ctx
 		}).
-		Assess("KongServiceFacades annotations work", func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
+		Assess("KongServiceFacades annotations work", func(ctx context.Context, t *testing.T, _ *envconf.Config) context.Context {
 			proxyURL := GetProxyURLFromCtx(ctx)
 			expectContent := func(path, expectedMagicNumber string) {
 				t.Logf("asserting %s path returns expected image", path)