fix: review

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

Author: ronething

internal/controller/gateway_controller.go

@@ -37,7 +37,7 @@ type GatewayReconciler struct { //nolint:revive
 
 func (r *GatewayReconciler) setupIndexer(mgr ctrl.Manager) error {
 	if err := mgr.GetFieldIndexer().IndexField(
-		context.TODO(),
+		context.Background(),
 		&gatewayv1.Gateway{},
 		indexer.ParametersRef,
 		indexer.GatewayParametersRefIndexFunc,
@@ -121,7 +121,7 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		Secrets: make(map[types.NamespacedName]*corev1.Secret),
 	}
 	r.processListenerConfig(tctx, gateway, ns)
-	if err := r.processGatewayProxy(tctx, gateway, ns); err != nil {
+	if err := r.processInfrastructure(tctx, gateway, ns); err != nil {
 		acceptStatus = status{
 			status: false,
 			msg:    err.Error(),
@@ -275,7 +275,7 @@ func (r *GatewayReconciler) listGatewaysForHTTPRoute(_ context.Context, obj clie
 	return recs
 }
 
-func (r *GatewayReconciler) processGatewayProxy(tctx *provider.TranslateContext, gateway *gatewayv1.Gateway, ns string) error {
+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

internal/controller/httproute_controller.go

@@ -140,15 +140,15 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 // SetupWithManager sets up the controller with the Manager.
 func (r *HTTPRouteReconciler) setupIndexer(mgr ctrl.Manager) error {
 	if err := mgr.GetFieldIndexer().IndexField(
-		context.TODO(),
+		context.Background(),
 		&gatewayv1.HTTPRoute{},
 		indexer.ExtensionRef,
 		indexer.HTTPRouteExtensionIndexFunc,
 	); err != nil {
 		return err
 	}
 	if err := mgr.GetFieldIndexer().IndexField(
-		context.TODO(),
+		context.Background(),
 		&gatewayv1.HTTPRoute{},
 		indexer.ServiceIndexRef,
 		indexer.HTTPRouteServiceIndexFunc,

internal/controller/indexer/indexer.go

@@ -54,12 +54,12 @@ func HTTPRouteExtensionIndexFunc(rawObj client.Object) []string {
 
 func GatewayParametersRefIndexFunc(rawObj client.Object) []string {
 	gw := rawObj.(*gatewayv1.Gateway)
-	var keys []string
 	if gw.Spec.Infrastructure != nil && gw.Spec.Infrastructure.ParametersRef != nil {
 		// now we only care about kind: GatewayProxy
 		if gw.Spec.Infrastructure.ParametersRef.Kind == "GatewayProxy" {
-			keys = append(keys, GenIndexKey(gw.GetNamespace(), gw.Spec.Infrastructure.ParametersRef.Name))
+			name := gw.Spec.Infrastructure.ParametersRef.Name
+			return []string{GenIndexKey(gw.GetNamespace(), name)}
 		}
 	}
-	return keys
+	return nil
 }

internal/provider/adc/translator/gateway.go

@@ -11,8 +11,8 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
-// FillPluginsFromGatewayProxy fill plugins from GatewayProxy to given plugins
-func (t *Translator) FillPluginsFromGatewayProxy(plugins adctypes.Plugins, gatewayProxy *v1alpha1.GatewayProxy) {
+// fillPluginsFromGatewayProxy fill plugins from GatewayProxy to given plugins
+func (t *Translator) fillPluginsFromGatewayProxy(plugins adctypes.Plugins, gatewayProxy *v1alpha1.GatewayProxy) {
 	if gatewayProxy == nil {
 		return
 	}
@@ -43,7 +43,7 @@ func (t *Translator) TranslateGateway(tctx *provider.TranslateContext, gateway *
 	if tctx.GatewayProxy != nil {
 		globalRules := adctypes.Plugins{}
 		// apply plugins from GatewayProxy to global rules
-		t.FillPluginsFromGatewayProxy(globalRules, tctx.GatewayProxy)
+		t.fillPluginsFromGatewayProxy(globalRules, tctx.GatewayProxy)
 		result.GlobalRules = globalRules
 	}
 

test/e2e/gatewayapi/gatewayproxy.go

@@ -101,23 +101,22 @@ spec:
       port: 80
 `
 
-	var ResourceApplied = func(resourType, resourceName, resourceRaw string, observedGeneration int) {
+	var ResourceApplied = func(resourceType, resourceName, resourceRaw string, observedGeneration int) {
 		Expect(s.CreateResourceFromString(resourceRaw)).
-			NotTo(HaveOccurred(), fmt.Sprintf("creating %s", resourType))
+			NotTo(HaveOccurred(), fmt.Sprintf("creating %s", resourceType))
 
 		Eventually(func() string {
-			hryaml, err := s.GetResourceYaml(resourType, resourceName)
-			Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("getting %s yaml", resourType))
+			hryaml, err := s.GetResourceYaml(resourceType, resourceName)
+			Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("getting %s yaml", resourceType))
 			return hryaml
 		}, "8s", "2s").
 			Should(
 				SatisfyAll(
 					ContainSubstring(`status: "True"`),
 					ContainSubstring(fmt.Sprintf("observedGeneration: %d", observedGeneration)),
 				),
-				fmt.Sprintf("checking %s condition status", resourType),
+				fmt.Sprintf("checking %s condition status", resourceType),
 			)
-		time.Sleep(1 * time.Second)
 	}
 
 	var (