fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

internal/controller/gateway_controller.go

@@ -277,20 +277,22 @@ func (r *GatewayReconciler) listGatewaysForHTTPRoute(_ context.Context, obj clie
 
 func (r *GatewayReconciler) processInfrastructure(tctx *provider.TranslateContext, gateway *gatewayv1.Gateway, ns string) error {
 	infra := gateway.Spec.Infrastructure
-	if infra != nil && infra.ParametersRef != nil {
-		paramRef := infra.ParametersRef
-		if string(paramRef.Group) == v1alpha1.GroupVersion.Group && string(paramRef.Kind) == "GatewayProxy" {
-			gatewayProxy := &v1alpha1.GatewayProxy{}
-			if err := r.Get(context.Background(), client.ObjectKey{
-				Namespace: ns,
-				Name:      paramRef.Name,
-			}, gatewayProxy); err != nil {
-				log.Error(err, "failed to get GatewayProxy", "namespace", ns, "name", paramRef.Name)
-				return err
-			} else {
-				log.Info("found GatewayProxy for Gateway", "gateway", gateway.Name, "gatewayproxy", gatewayProxy.Name)
-				tctx.GatewayProxy = gatewayProxy
-			}
+	if infra == nil || infra.ParametersRef == nil {
+		return nil
+	}
+
+	paramRef := infra.ParametersRef
+	if string(paramRef.Group) == v1alpha1.GroupVersion.Group && string(paramRef.Kind) == "GatewayProxy" {
+		gatewayProxy := &v1alpha1.GatewayProxy{}
+		if err := r.Get(context.Background(), client.ObjectKey{
+			Namespace: ns,
+			Name:      paramRef.Name,
+		}, gatewayProxy); err != nil {
+			log.Error(err, "failed to get GatewayProxy", "namespace", ns, "name", paramRef.Name)
+			return err
+		} else {
+			log.Info("found GatewayProxy for Gateway", "gateway", gateway.Name, "gatewayproxy", gatewayProxy.Name)
+			tctx.GatewayProxy = gatewayProxy
 		}
 	}
 

internal/provider/adc/adc.go

@@ -46,7 +46,7 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 	var result *translator.TranslateResult
 	var err error
 
-	var task Task = Task{
+	var task = Task{
 		Name:   obj.GetName(),
 		Labels: label.GenLabel(obj),
 	}
@@ -102,7 +102,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 func (d *adcClient) sync(task Task, extraArgs ...string) error {
 	log.Debugw("syncing task", zap.Any("task", task))
 
-	yaml, err := yaml.Marshal(task.Resources)
+	data, err := yaml.Marshal(task.Resources)
 	if err != nil {
 		return err
 	}
@@ -116,20 +116,17 @@ func (d *adcClient) sync(task Task, extraArgs ...string) error {
 		_ = os.Remove(tmpFile.Name())
 	}()
 
-	log.Debugw("syncing resources", zap.String("file", tmpFile.Name()), zap.String("yaml", string(yaml)))
+	log.Debugw("syncing resources", zap.String("file", tmpFile.Name()), zap.String("yaml", string(data)))
 
-	if _, err := tmpFile.Write(yaml); err != nil {
+	if _, err := tmpFile.Write(data); err != nil {
 		return err
 	}
 	args := []string{
 		"sync",
 		"-f", tmpFile.Name(),
 		"--tls-skip-verify",
 	}
-
-	if len(extraArgs) > 0 {
-		args = append(args, extraArgs...)
-	}
+	args = append(args, extraArgs...)
 
 	for k, v := range task.Labels {
 		args = append(args, "--label-selector", k+"="+v)

test/e2e/gatewayapi/gatewayproxy.go

@@ -173,11 +173,7 @@ spec:
 				Status(200)
 
 			resp.Header("X-Proxy-Test").IsEqual("enabled")
-		})
-	})
 
-	Context("Test Gateway with disabled GatewayProxy plugin", func() {
-		It("Should not apply plugin configuration when disabled", func() {
 			By("Update GatewayProxy with disabled plugin")
 			err := s.CreateResourceFromString(gatewayProxyWithDisabledPlugin)
 			Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy with disabled plugin")
@@ -187,18 +183,28 @@ spec:
 			ResourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
 
 			By("Check if the plugin is not applied")
-			resp := s.NewAPISIXClient().
+			resp = s.NewAPISIXClient().
 				GET("/get").
 				WithHost("example.com").
 				Expect().
 				Status(200)
 
 			resp.Header("X-Proxy-Test").IsEmpty()
 		})
-	})
 
-	Context("Test Gateway without GatewayProxy", func() {
 		It("Should work normally without GatewayProxy", func() {
+			By("Create HTTPRoute for Gateway with GatewayProxy")
+			ResourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
+
+			By("Check if the plugin is applied")
+			resp := s.NewAPISIXClient().
+				GET("/get").
+				WithHost("example.com").
+				Expect().
+				Status(200)
+
+			resp.Header("X-Proxy-Test").IsEqual("enabled")
+
 			By("Update Gateway without GatewayProxy")
 			err := s.CreateResourceFromString(fmt.Sprintf(gatewayWithoutProxy, gatewayClassName))
 			Expect(err).NotTo(HaveOccurred(), "updating Gateway without GatewayProxy")
@@ -208,7 +214,7 @@ spec:
 			ResourceApplied("HTTPRoute", "test-route", fmt.Sprintf(httpRouteForTest, "api7"), 1)
 
 			By("Check if the route works without plugin")
-			resp := s.NewAPISIXClient().
+			resp = s.NewAPISIXClient().
 				GET("/get").
 				WithHost("example.com").
 				Expect().