fix: add test case

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

Author: ronething

.gitignore

@@ -33,4 +33,4 @@ api7-ingress-controller-conformance-report.yaml
 
 *.mdx
 .cursor/
-
+.env

Makefile

@@ -140,6 +140,15 @@ kind-load-images: pull-infra-images kind-load-ingress-image
 	@kind load docker-image kennethreitz/httpbin:latest --name $(KIND_NAME) 
 	@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
 
+.PHONY: kind-load-gateway-image
+kind-load-gateway-image:
+	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME) 
+
+.PHONY: kind-load-dashboard-images
+kind-load-dashboard-images:
+	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)  --name $(KIND_NAME)
+	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)  --name $(KIND_NAME)
+
 .PHONY: kind-load-ingress-image
 kind-load-ingress-image:
 	@kind load docker-image $(IMG) --name $(KIND_NAME)

internal/provider/adc/adc.go

@@ -32,10 +32,7 @@ type adcConfig struct {
 type adcClient struct {
 	sync.Mutex
 
-	translator   *translator.Translator
-	ServerAddr   string
-	Token        string
-	GatewayGroup string
+	translator *translator.Translator
 	// gateway/ingressclass -> adcConfig
 	configs map[provider.ResourceKind]adcConfig
 	// httproute/consumer/ingress/gateway -> gateway/ingressclass
@@ -164,6 +161,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 	}
 
 	configs := d.getConfigs(rk)
+	defer d.deleteConfigs(rk)
 
 	err := d.sync(ctx, Task{
 		Name:          obj.GetName(),
@@ -175,7 +173,6 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 		return err
 	}
 
-	d.deleteConfigs(rk)
 	return nil
 }
 
@@ -233,14 +230,8 @@ func (d *adcClient) execADC(ctx context.Context, config adcConfig, args []string
 	ctxWithTimeout, cancel := context.WithTimeout(ctx, d.syncTimeout)
 	defer cancel()
 	// todo: use adc config
-	serverAddr := d.ServerAddr
-	if config.ServerAddr != "" {
-		serverAddr = config.ServerAddr
-	}
-	token := d.Token
-	if config.Token != "" {
-		token = config.Token
-	}
+	serverAddr := config.ServerAddr
+	token := config.Token
 
 	adcEnv := []string{
 		"ADC_EXPERIMENTAL_FEATURE_FLAGS=remote-state-file,parallel-backend-request",

test/e2e/crds/consumer.go

@@ -1,11 +1,13 @@
 package gatewayapi
 
 import (
+	"fmt"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	"github.com/api7/api7-ingress-controller/test/e2e/framework"
 	"github.com/api7/api7-ingress-controller/test/e2e/scaffold"
 )
 
@@ -376,4 +378,89 @@ spec:
 				Status(401)
 		})
 	})
+
+	Context("Consumer with GatewayProxy Update", func() {
+		var additionalGatewayGroupID string
+
+		var defaultCredential = `
+apiVersion: apisix.apache.org/v1alpha1
+kind: Consumer
+metadata:
+  name: consumer-sample
+spec:
+  gatewayRef:
+    name: api7ee
+  credentials:
+    - type: basic-auth
+      name: basic-auth-sample
+      config:
+        username: sample-user
+        password: sample-password
+`
+		var updatedGatewayProxy = `
+apiVersion: apisix.apache.org/v1alpha1
+kind: GatewayProxy
+metadata:
+  name: api7-proxy-config
+spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+      - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
+`
+
+		BeforeEach(func() {
+			s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
+		})
+
+		It("Should sync consumer when GatewayProxy is updated", func() {
+			s.ResourceApplied("Consumer", "consumer-sample", defaultCredential, 1)
+
+			// verify basic-auth works
+			s.NewAPISIXClient().
+				GET("/get").
+				WithBasicAuth("sample-user", "sample-password").
+				WithHost("httpbin.org").
+				Expect().
+				Status(200)
+
+			By("create additional gateway group to get new admin key")
+			var err error
+			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
+
+			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			Expect(exists).To(BeTrue(), "additional gateway group should exist")
+
+			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
+
+			By("Consumer not found for additional gateway group")
+			client.
+				GET("/get").
+				WithBasicAuth("sample-user", "sample-password").
+				WithHost("httpbin.org").
+				Expect().
+				Status(404)
+
+			By("update GatewayProxy with new admin key")
+			updatedProxy := fmt.Sprintf(updatedGatewayProxy, framework.DashboardTLSEndpoint, resources.AdminAPIKey)
+			err = s.CreateResourceFromString(updatedProxy)
+			Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy")
+			time.Sleep(30 * time.Second)
+
+			By("verify Consumer works for additional gateway group")
+			client.
+				GET("/get").
+				WithBasicAuth("sample-user", "sample-password").
+				WithHost("httpbin.org").
+				Expect().
+				Status(200)
+		})
+	})
 })

test/e2e/framework/dashboard.go

@@ -367,6 +367,7 @@ func (f *Framework) GetDataplaneCertificates(gatewayGroupID string) *v1.Dataplan
 		POST("/api/gateway_groups/"+gatewayGroupID+"/dp_client_certificates").
 		WithBasicAuth("admin", "admin").
 		WithHeader("Content-Type", "application/json").
+		WithBytes([]byte(`{}`)).
 		Expect()
 
 	f.Logger.Logf(f.GinkgoT, "dataplane certificates issuer response: %s", respExp.Body().Raw())

test/e2e/gatewayapi/httproute.go

@@ -1394,6 +1394,92 @@ spec:
 		})
 	})
 
+	Context("HTTPRoute with GatewayProxy Update", func() {
+		var additionalGatewayGroupID string
+
+		var exactRouteByGet = `
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: httpbin
+spec:
+  parentRefs:
+  - name: api7ee
+  hostnames:
+  - httpbin.example
+  rules:
+  - matches: 
+    - path:
+        type: Exact
+        value: /get
+    backendRefs:
+    - name: httpbin-service-e2e-test
+      port: 80
+`
+
+		var updatedGatewayProxy = `
+apiVersion: apisix.apache.org/v1alpha1
+kind: GatewayProxy
+metadata:
+  name: api7-proxy-config
+spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+      - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
+`
+
+		BeforeEach(beforeEachHTTP)
+
+		It("Should sync HTTPRoute when GatewayProxy is updated", func() {
+			By("create HTTPRoute")
+			ResourceApplied("HTTPRoute", "httpbin", exactRouteByGet, 1)
+
+			By("verify HTTPRoute works")
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin.example").
+				Expect().
+				Status(200)
+
+			By("create additional gateway group to get new admin key")
+			var err error
+			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
+
+			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			Expect(exists).To(BeTrue(), "additional gateway group should exist")
+
+			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
+
+			By("HTTPRoute not found for additional gateway group")
+			client.
+				GET("/get").
+				WithHost("httpbin.example").
+				Expect().
+				Status(404)
+
+			By("update GatewayProxy with new admin key")
+			updatedProxy := fmt.Sprintf(updatedGatewayProxy, framework.DashboardTLSEndpoint, resources.AdminAPIKey)
+			err = s.CreateResourceFromString(updatedProxy)
+			Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy")
+			time.Sleep(5 * time.Second)
+
+			By("verify HTTPRoute works for additional gateway group")
+			client.
+				GET("/get").
+				WithHost("httpbin.example").
+				Expect().
+				Status(200)
+		})
+	})
+
 	/*
 		Context("HTTPRoute Status Updated", func() {
 		})

test/e2e/ingress/ingress.go

@@ -638,4 +638,116 @@ spec:
 				WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))
 		})
 	})
+
+	Context("Ingress with GatewayProxy Update", func() {
+		var additionalGatewayGroupID string
+
+		var ingressClass = `
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  name: api7-ingress-class
+spec:
+  controller: "apisix.apache.org/api7-ingress-controller"
+  parameters:
+    apiGroup: "apisix.apache.org"
+    kind: "GatewayProxy"
+    name: "api7-proxy-config"
+    namespace: "default"
+    scope: "Namespace"
+`
+		var ingress = `
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: api7-ingress
+spec:
+  ingressClassName: api7-ingress-class
+  rules:
+  - host: ingress.example.com
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: httpbin-service-e2e-test
+            port:
+              number: 80
+`
+		var updatedGatewayProxy = `
+apiVersion: apisix.apache.org/v1alpha1
+kind: GatewayProxy
+metadata:
+  name: api7-proxy-config
+  namespace: default
+spec:
+  provider:
+    type: ControlPlane
+    controlPlane:
+      endpoints:
+      - %s
+      auth:
+        type: AdminKey
+        adminKey:
+          value: "%s"
+`
+
+		BeforeEach(func() {
+			By("create GatewayProxy")
+			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, framework.DashboardTLSEndpoint, s.AdminKey())
+			err := s.CreateResourceFromStringWithNamespace(gatewayProxy, "default")
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(5 * time.Second)
+
+			By("create IngressClass")
+			err = s.CreateResourceFromStringWithNamespace(ingressClass, "")
+			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
+			time.Sleep(5 * time.Second)
+		})
+
+		It("Should sync Ingress when GatewayProxy is updated", func() {
+			By("create Ingress")
+			err := s.CreateResourceFromString(ingress)
+			Expect(err).NotTo(HaveOccurred(), "creating Ingress")
+			time.Sleep(5 * time.Second)
+
+			By("verify Ingress works")
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("ingress.example.com").
+				Expect().
+				Status(200)
+
+			By("create additional gateway group to get new admin key")
+			additionalGatewayGroupID, _, err = s.CreateAdditionalGatewayGroup("gateway-proxy-update")
+			Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
+
+			client, err := s.NewAPISIXClientForGatewayGroup(additionalGatewayGroupID)
+			Expect(err).NotTo(HaveOccurred(), "creating APISIX client for additional gateway group")
+
+			By("Ingress not found for additional gateway group")
+			client.
+				GET("/get").
+				WithHost("ingress.example.com").
+				Expect().
+				Status(404)
+
+			resources, exists := s.GetAdditionalGatewayGroup(additionalGatewayGroupID)
+			Expect(exists).To(BeTrue(), "additional gateway group should exist")
+
+			By("update GatewayProxy with new admin key")
+			updatedProxy := fmt.Sprintf(updatedGatewayProxy, framework.DashboardTLSEndpoint, resources.AdminAPIKey)
+			err = s.CreateResourceFromStringWithNamespace(updatedProxy, "default")
+			Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy")
+			time.Sleep(5 * time.Second)
+
+			By("verify Ingress works for additional gateway group")
+			client.
+				GET("/get").
+				WithHost("ingress.example.com").
+				Expect().
+				Status(200)
+		})
+	})
 })