fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

go.mod

@@ -29,7 +29,6 @@ require (
 	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/net v0.28.0
-	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.15.4
 	k8s.io/api v0.31.1
@@ -207,6 +206,7 @@ require (
 	gopkg.in/fsnotify.v1 v1.4.7 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apiserver v0.31.1 // indirect
 	k8s.io/cli-runtime v0.30.3 // indirect
 	k8s.io/component-base v0.31.1 // indirect

internal/controller/gatewayproxy_controller.go

@@ -193,18 +193,15 @@ func (r *GatewayProxyController) Reconcile(ctx context.Context, req ctrl.Request
 }
 
 func (r *GatewayProxyController) listGatewayProxiesForProviderService(ctx context.Context, obj client.Object) (requests []reconcile.Request) {
-	r.Log.Info("listGatewayProxiesForProviderService", "obj", obj.GetName())
 	service, ok := obj.(*corev1.Service)
 	if !ok {
 		r.Log.Error(errors.New("unexpected object type"), "failed to convert object to Service")
 		return nil
 	}
 
-	requests = ListRequests(ctx, r.Client, r.Log, &v1alpha1.GatewayProxyList{}, client.MatchingFields{
+	return ListRequests(ctx, r.Client, r.Log, &v1alpha1.GatewayProxyList{}, client.MatchingFields{
 		indexer.ServiceIndexRef: indexer.GenIndexKey(service.GetNamespace(), service.GetName()),
 	})
-	r.Log.Info("listGatewayProxiesForProviderService", "requests", requests)
-	return requests
 }
 
 func (r *GatewayProxyController) listGatewayProxiesForProviderEndpointSlice(ctx context.Context, obj client.Object) (requests []reconcile.Request) {

test/e2e/gatewayapi/status.go

@@ -24,7 +24,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 
 	"github.com/apache/apisix-ingress-controller/internal/provider/adc"

test/e2e/scaffold/assertion.go

@@ -188,18 +188,7 @@ func (s *Scaffold) RequestAssert(r *RequestAssert) bool {
 		if r.BasicAuth != nil {
 			req = req.WithBasicAuth(r.BasicAuth.Username, r.BasicAuth.Password)
 		}
-		var err error
-		expResp, err := func() (*httpexpect.Response, error) {
-			defer func() {
-				if rec := recover(); rec != nil {
-					err = fmt.Errorf("panic in Expect(): %v", rec)
-				}
-			}()
-			return req.Expect(), nil
-		}()
-		if err != nil {
-			return err
-		}
+		expResp := req.Expect()
 
 		resp := &HTTPResponse{
 			Response: expResp.Raw(),