add test case

Author: AlinsRan

internal/controller/consumer_controller.go

@@ -75,7 +75,7 @@ func (r *ConsumerReconciler) listConsumersForGateway(ctx context.Context, obj cl
 		r.Log.Error(err, "failed to list consumers")
 		return nil
 	}
-	var requests []reconcile.Request
+	requests := make([]reconcile.Request, 0, len(consumerList.Items))
 	for _, consumer := range consumerList.Items {
 		requests = append(requests, reconcile.Request{
 			NamespacedName: client.ObjectKey{
@@ -100,12 +100,10 @@ func (r *ConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 			}
 
 			if err := r.Provider.Delete(ctx, consumer); err != nil {
-				r.Log.Error(err, "failed to delete consumer", "consumer", consumer)
 				return ctrl.Result{}, err
 			}
 			return ctrl.Result{}, nil
 		}
-		r.Log.Error(err, "failed to get consumer", "consumer", consumer)
 		return ctrl.Result{}, err
 	}
 
@@ -123,23 +121,20 @@ func (r *ConsumerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 	}
 
 	if err := r.updateStatus(ctx, consumer, statusErr); err != nil {
-		r.Log.Error(err, "failed to update consumer status", "consumer", consumer)
 		return ctrl.Result{}, err
 	}
 
 	return ctrl.Result{}, nil
 }
 
 func (r *ConsumerReconciler) processSepc(ctx context.Context, tctx *provider.TranslateContext, consumer *v1alpha1.Consumer) error {
-	r.Log.Info("Processing consumer", "name", consumer.Name, "namespace", consumer.Namespace)
-
 	for _, credential := range consumer.Spec.Credentials {
 		if credential.SecretRef == nil {
 			continue
 		}
 		ns := consumer.GetNamespace()
 		if credential.SecretRef.Namespace != nil {
-			ns = string(*credential.SecretRef.Namespace)
+			ns = *credential.SecretRef.Namespace
 		}
 		secret := corev1.Secret{}
 		if err := r.Get(ctx, client.ObjectKey{
@@ -194,7 +189,7 @@ func (r *ConsumerReconciler) checkGatewayRef(object client.Object) bool {
 	}
 	ns := consumer.GetNamespace()
 	if consumer.Spec.GatewayRef.Namespace != nil {
-		ns = string(*consumer.Spec.GatewayRef.Namespace)
+		ns = *consumer.Spec.GatewayRef.Namespace
 	}
 	gateway := &gatewayv1.Gateway{}
 	if err := r.Get(context.TODO(), client.ObjectKey{
@@ -204,5 +199,10 @@ func (r *ConsumerReconciler) checkGatewayRef(object client.Object) bool {
 		r.Log.Error(err, "failed to get gateway", "gateway", consumer.Spec.GatewayRef.Name)
 		return false
 	}
-	return true
+	gatewayClass := &gatewayv1.GatewayClass{}
+	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
+		r.Log.Error(err, "failed to get gateway class", "gateway", gateway.GetName(), "gatewayclass", gateway.Spec.GatewayClassName)
+		return false
+	}
+	return matchesController(string(gatewayClass.Spec.ControllerName))
 }

internal/controller/indexer/indexer.go

@@ -69,7 +69,7 @@ func ConsumerGatewayRefIndexFunc(rawObj client.Object) []string {
 
 	ns := consumer.GetNamespace()
 	if consumer.Spec.GatewayRef.Namespace != nil {
-		ns = string(*consumer.Spec.GatewayRef.Namespace)
+		ns = *consumer.Spec.GatewayRef.Namespace
 	}
 	return []string{GenIndexKey(ns, consumer.Spec.GatewayRef.Name)}
 }

internal/controller/status.go

@@ -10,17 +10,20 @@ const (
 	ConditionTypeProgressing string = "Progressing"
 	ConditionTypeDegraded    string = "Degraded"
 
-	ConditionReasonSynced string = "ResourceSynced"
+	ConditionReasonSynced    string = "ResourceSynced"
+	ConditionReasonSyncAbort string = "ResourceSyncAbort"
 )
 
 func NewCondition(observedGeneration int64, status bool, message string) metav1.Condition {
 	condition := metav1.ConditionTrue
+	reason := ConditionReasonSynced
 	if !status {
 		condition = metav1.ConditionFalse
+		reason = ConditionReasonSyncAbort
 	}
 	return metav1.Condition{
 		Type:               ConditionTypeAvailable,
-		Reason:             ConditionReasonSynced,
+		Reason:             reason,
 		Status:             condition,
 		Message:            message,
 		ObservedGeneration: observedGeneration,

internal/provider/adc/translator/plugins.go

@@ -78,15 +78,19 @@ spec:
 	var beforeEachHTTP = func() {
 		By("create GatewayClass")
 		gatewayClassName := fmt.Sprintf("api7-%d", time.Now().Unix())
-		err := s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGatewayClass, gatewayClassName, s.GetControllerName()), "")
+		gatewayString := fmt.Sprintf(defautlGatewayClass, gatewayClassName, s.GetControllerName())
+		err := s.CreateResourceFromStringWithNamespace(gatewayString, "")
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
 		time.Sleep(5 * time.Second)
 
 		By("check GatewayClass condition")
 		gcyaml, err := s.GetResourceYaml("GatewayClass", gatewayClassName)
 		Expect(err).NotTo(HaveOccurred(), "getting GatewayClass yaml")
 		Expect(gcyaml).To(ContainSubstring(`status: "True"`), "checking GatewayClass condition status")
-		Expect(gcyaml).To(ContainSubstring("message: the gatewayclass has been accepted by the api7-ingress-controller"), "checking GatewayClass condition message")
+		Expect(gcyaml).To(
+			ContainSubstring("message: the gatewayclass has been accepted by the api7-ingress-controller"),
+			"checking GatewayClass condition message",
+		)
 
 		By("create Gateway")
 		err = s.CreateResourceFromString(fmt.Sprintf(defautlGateway, gatewayClassName))
@@ -97,7 +101,10 @@ spec:
 		gwyaml, err := s.GetResourceYaml("Gateway", "api7ee")
 		Expect(err).NotTo(HaveOccurred(), "getting Gateway yaml")
 		Expect(gwyaml).To(ContainSubstring(`status: "True"`), "checking Gateway condition status")
-		Expect(gwyaml).To(ContainSubstring("message: the gateway has been accepted by the api7-ingress-controller"), "checking Gateway condition message")
+		Expect(gwyaml).To(
+			ContainSubstring("message: the gateway has been accepted by the api7-ingress-controller"),
+			"checking Gateway condition message",
+		)
 
 		s.ResourceApplied("httproute", "httpbin", defaultHTTPRoute, 1)
 	}