fix api7 etest

Author: AlinsRan

internal/adc/client/client.go

@@ -24,6 +24,7 @@ import (
 	"os"
 	"slices"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/api7/gopkg/pkg/log"
@@ -37,6 +38,7 @@ import (
 )
 
 type Client struct {
+	mu sync.Mutex
 	*cache.Store
 
 	executor    ADCExecutor
@@ -60,6 +62,8 @@ type Task struct {
 }
 
 func (d *Client) Insert(ctx context.Context, args Task) error {
+	d.mu.Lock()
+	defer d.mu.Unlock()
 	for _, config := range args.Configs {
 		if err := d.Store.Insert(config.Name, args.ResourceTypes, args.Resources, args.Labels); err != nil {
 			log.Errorw("failed to insert resources into store",
@@ -73,6 +77,8 @@ func (d *Client) Insert(ctx context.Context, args Task) error {
 }
 
 func (d *Client) Remove(ctx context.Context, args Task) error {
+	d.mu.Lock()
+	defer d.mu.Unlock()
 	for _, config := range args.Configs {
 		if err := d.Delete(config.Name, args.ResourceTypes, args.Labels); err != nil {
 			log.Errorw("failed to delete resources from store",
@@ -86,10 +92,14 @@ func (d *Client) Remove(ctx context.Context, args Task) error {
 }
 
 func (d *Client) Update(ctx context.Context, args Task) error {
+	d.mu.Lock()
+	defer d.mu.Unlock()
 	return d.sync(ctx, args)
 }
 
 func (c *Client) Sync(ctx context.Context, cfg map[string]adctypes.Config) (map[string]types.ADCExecutionErrors, error) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
 	log.Debug("syncing all resources")
 
 	if len(cfg) == 0 {

internal/provider/api7ee/provider.go

@@ -160,7 +160,7 @@ func (d *api7eeProvider) Update(ctx context.Context, tctx *provider.TranslateCon
 		Configs: deleteConfigs,
 	})
 
-	d.client.Insert(ctx, adcclient.Task{
+	task := adcclient.Task{
 		Name:          obj.GetName(),
 		Labels:        label.GenLabel(obj),
 		Configs:       configs,
@@ -172,9 +172,10 @@ func (d *api7eeProvider) Update(ctx context.Context, tctx *provider.TranslateCon
 			SSLs:           result.SSL,
 			Consumers:      result.Consumers,
 		},
-	})
-	d.syncNotify()
-	return nil
+	}
+
+	d.client.Insert(ctx, task)
+	return d.client.Update(ctx, task)
 }
 
 func (d *api7eeProvider) Delete(ctx context.Context, obj client.Object) error {
@@ -220,18 +221,12 @@ func (d *api7eeProvider) Delete(ctx context.Context, obj client.Object) error {
 	})
 
 	log.Debugw("successfully deleted resources from store", zap.Any("object", obj))
-	// Full synchronization is performed on a gateway by gateway basis
-	// and it is not possible to perform scheduled synchronization
-	// on deleted gateway level resources
-	if len(resourceTypes) == 0 {
-		return d.client.Update(ctx, adcclient.Task{
-			Name:    obj.GetName(),
-			Configs: configs,
-		})
-	} else {
-		d.syncNotify()
-	}
-	return nil
+	return d.client.Update(ctx, adcclient.Task{
+		Name:          obj.GetName(),
+		Labels:        labels,
+		ResourceTypes: resourceTypes,
+		Configs:       configs,
+	})
 }
 
 func (d *api7eeProvider) Start(ctx context.Context) error {

test/e2e/crds/v1alpha1/consumer.go

@@ -24,7 +24,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/apache/apisix-ingress-controller/internal/provider/adc"
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
@@ -600,7 +599,7 @@ spec:
 		})
 
 		It("Should sync Consumer during startup", func() {
-			if s.Deployer.Name() == adc.BackendModeAPI7EE {
+			if s.Deployer.Name() == "api7ee" {
 				Skip("skipping test in API7EE mode")
 			}
 			Expect(s.CreateResourceFromString(consumer2)).NotTo(HaveOccurred(), "creating unused consumer")

test/e2e/crds/v2/route.go

@@ -72,7 +72,7 @@ spec:
 
 	Context("Test ApisixRoute", func() {
 
-		It("Basic tests", func() {
+		FIt("Basic tests", func() {
 			const apisixRouteSpec = `
 apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
@@ -726,7 +726,7 @@ spec:
       servicePort: 80
 `
 		It("Should sync ApisixRoute during startup", func() {
-			if s.Deployer.Name() == adc.BackendModeAPI7EE {
+			if s.Deployer.Name() == "api7ee" {
 				Skip("skipping test in API7EE mode")
 			}
 			By("apply ApisixRoute")

test/e2e/scaffold/k8s.go

@@ -39,7 +39,6 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	"github.com/apache/apisix-ingress-controller/internal/provider/adc"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 )
 
@@ -310,7 +309,7 @@ spec:
           value: "%s"
 `
 
-	if s.Deployer.Name() == adc.BackendModeAPI7EE {
+	if s.Deployer.Name() == "api7ee" {
 		return fmt.Sprintf(gatewayProxyYamlAPI7, s.Deployer.GetAdminEndpoint(), s.AdminKey())
 	}
 	return fmt.Sprintf(gatewayProxyYaml, framework.ProviderType, s.AdminKey())