Merge branch 'release-v2-dev' into chore/add-consumer-plugins-test

Author: AlinsRan

internal/controller/consumer_controller.go

@@ -59,9 +59,37 @@ func (r *ConsumerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				},
 			),
 		).
+		Watches(&corev1.Secret{},
+			handler.EnqueueRequestsFromMapFunc(r.listConsumersForSecret),
+		).
 		Complete(r)
 }
 
+func (r *ConsumerReconciler) listConsumersForSecret(ctx context.Context, obj client.Object) []reconcile.Request {
+	secret, ok := obj.(*corev1.Secret)
+	if !ok {
+		r.Log.Error(nil, "failed to convert to Secret", "object", obj)
+		return nil
+	}
+	consumerList := &v1alpha1.ConsumerList{}
+	if err := r.List(ctx, consumerList, client.MatchingFields{
+		indexer.SecretIndexRef: indexer.GenIndexKey(secret.GetNamespace(), secret.GetName()),
+	}); err != nil {
+		r.Log.Error(err, "failed to list consumers")
+		return nil
+	}
+	requests := make([]reconcile.Request, 0, len(consumerList.Items))
+	for _, consumer := range consumerList.Items {
+		requests = append(requests, reconcile.Request{
+			NamespacedName: client.ObjectKey{
+				Name:      consumer.Name,
+				Namespace: consumer.Namespace,
+			},
+		})
+	}
+	return requests
+}
+
 func (r *ConsumerReconciler) listConsumersForGateway(ctx context.Context, obj client.Object) []reconcile.Request {
 	gateway, ok := obj.(*gatewayv1.Gateway)
 	if !ok {
@@ -70,7 +98,7 @@ func (r *ConsumerReconciler) listConsumersForGateway(ctx context.Context, obj cl
 	}
 	consumerList := &v1alpha1.ConsumerList{}
 	if err := r.List(ctx, consumerList, client.MatchingFields{
-		indexer.ConsumerGatewayRef: indexer.GenIndexKey(gateway.Name, gateway.GetNamespace()),
+		indexer.ConsumerGatewayRef: indexer.GenIndexKey(gateway.GetNamespace(), gateway.GetName()),
 	}); err != nil {
 		r.Log.Error(err, "failed to list consumers")
 		return nil

internal/controller/gateway_controller.go

@@ -42,7 +42,10 @@ func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
 				predicate.NewPredicateFuncs(r.checkGatewayClass),
 			),
 		).
-		WithEventFilter(predicate.GenerationChangedPredicate{}).
+		WithEventFilter(predicate.Or(
+			predicate.GenerationChangedPredicate{},
+			predicate.AnnotationChangedPredicate{},
+		)).
 		Watches(
 			&gatewayv1.GatewayClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewayForGatewayClass),

internal/controller/indexer/indexer.go

@@ -58,8 +58,35 @@ func setupConsumerIndexer(mgr ctrl.Manager) error {
 	); err != nil {
 		return err
 	}
+	if err := mgr.GetFieldIndexer().IndexField(
+		context.Background(),
+		&v1alpha1.Consumer{},
+		SecretIndexRef,
+		ConsumerSecretIndexFunc,
+	); err != nil {
+		return err
+	}
 	return nil
 }
+
+func ConsumerSecretIndexFunc(rawObj client.Object) []string {
+	consumer := rawObj.(*v1alpha1.Consumer)
+	secretKeys := make([]string, 0)
+
+	for _, credential := range consumer.Spec.Credentials {
+		if credential.SecretRef == nil {
+			continue
+		}
+		ns := consumer.GetNamespace()
+		if credential.SecretRef.Namespace != nil {
+			ns = *credential.SecretRef.Namespace
+		}
+		key := GenIndexKey(ns, credential.SecretRef.Name)
+		secretKeys = append(secretKeys, key)
+	}
+	return secretKeys
+}
+
 func ConsumerGatewayRefIndexFunc(rawObj client.Object) []string {
 	consumer := rawObj.(*v1alpha1.Consumer)
 

internal/provider/adc/translator/consumer.go

@@ -39,7 +39,7 @@ func (t *Translator) TranslateConsumerV1alpha1(tctx *provider.TranslateContext,
 			}
 			authConfig := make(map[string]any)
 			for k, v := range secret.Data {
-				authConfig[k] = v
+				authConfig[k] = string(v)
 			}
 			credential.Config = authConfig
 		} else {

test/e2e/crds/consumer.go

@@ -298,6 +298,87 @@ spec:
 		})
 	})
 
-	PContext("SecretRef", func() {
+	Context("SecretRef", func() {
+		var keyAuthSecret = `
+apiVersion: v1
+kind: Secret
+metadata:
+  name: key-auth-secret
+data:
+  key: c2FtcGxlLWtleQ==
+`
+		var basicAuthSecret = `
+apiVersion: v1
+kind: Secret
+metadata:
+  name: basic-auth-secret
+data:
+  username: c2FtcGxlLXVzZXI=
+  password: c2FtcGxlLXBhc3N3b3Jk
+`
+		var defaultConsumer = `
+apiVersion: gateway.apisix.io/v1alpha1
+kind: Consumer
+metadata:
+  name: consumer-sample
+spec:
+  gatewayRef:
+    name: api7ee
+  credentials:
+    - type: basic-auth
+      name: basic-auth-sample
+      secretRef:
+        name: basic-auth-secret
+    - type: key-auth
+      name: key-auth-sample
+      secretRef:
+        name: key-auth-secret
+    - type: key-auth
+      name: key-auth-sample2
+      config:
+        key: sample-key2
+`
+		BeforeEach(beforeEachHTTP)
+
+		It("Create/Update/Delete", func() {
+			err := s.CreateResourceFromString(keyAuthSecret)
+			Expect(err).NotTo(HaveOccurred(), "creating key-auth secret")
+			err = s.CreateResourceFromString(basicAuthSecret)
+			Expect(err).NotTo(HaveOccurred(), "creating basic-auth secret")
+			s.ResourceApplied("Consumer", "consumer-sample", defaultConsumer, 1)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHeader("apikey", "sample-key").
+				WithHost("httpbin.org").
+				Expect().
+				Status(200)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithBasicAuth("sample-user", "sample-password").
+				WithHost("httpbin.org").
+				Expect().
+				Status(200)
+
+			By("delete consumer")
+			err = s.DeleteResourceFromString(defaultConsumer)
+			Expect(err).NotTo(HaveOccurred(), "deleting consumer")
+			time.Sleep(5 * time.Second)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHeader("apikey", "sample-key").
+				WithHost("httpbin.org").
+				Expect().
+				Status(401)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithBasicAuth("sample-user", "sample-password").
+				WithHost("httpbin.org").
+				Expect().
+				Status(401)
+		})
 	})
 })

test/e2e/scaffold/scaffold.go

@@ -512,7 +512,6 @@ func (s *Scaffold) GetDeploymentLogs(name string) string {
 			Resource("pods").
 			Namespace(s.namespace).
 			Name(pod.Name).SubResource("log").
-			Param("container", name).
 			Do(context.TODO()).
 			Raw()
 		if err == nil {