refactor

Author: AlinsRan

internal/adc/client/client.go

@@ -66,36 +66,6 @@ type Task struct {
 	Resources     *adctypes.Resources
 }
 
-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",
-				zap.String("name", config.Name),
-				zap.Error(err),
-			)
-			return err
-		}
-	}
-	return nil
-}
-
-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.Store.Delete(config.Name, args.ResourceTypes, args.Labels); err != nil {
-			log.Errorw("failed to delete resources from store",
-				zap.String("name", config.Name),
-				zap.Error(err),
-			)
-			return err
-		}
-	}
-	return nil
-}
-
 func (d *Client) Update(ctx context.Context, args Task) error {
 	d.mu.Lock()
 	defer d.mu.Unlock()
@@ -190,6 +160,7 @@ func (d *Client) Delete(ctx context.Context, args Task) error {
 	return d.sync(ctx, Task{
 		Labels:        args.Labels,
 		ResourceTypes: args.ResourceTypes,
+		Configs:       configs,
 	})
 }
 

internal/provider/common/configmanager.go

@@ -46,15 +46,15 @@ func (s *ConfigManager[K, T]) SetParentRefs(key K, refs []K) {
 	s.parentRefs[key] = refs
 }
 
-func (s *ConfigManager[K, T]) Get(key K) []T {
+func (s *ConfigManager[K, T]) Get(key K) map[K]T {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
 	parentRefs := s.parentRefs[key]
-	configs := make([]T, 0, len(parentRefs))
+	configs := make(map[K]T, len(parentRefs))
 	for _, parent := range parentRefs {
 		if cfg, ok := s.configs[parent]; ok {
-			configs = append(configs, cfg)
+			configs[parent] = cfg
 		}
 	}
 	return configs

test/e2e/crds/v1alpha1/consumer.go

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

test/e2e/crds/v1alpha1/gatewayproxy.go

@@ -132,7 +132,7 @@ spec:
 `
 	BeforeEach(func() {
 		By("create GatewayProxy")
-		if s.Deployer.Name() == "api7ee" {
+		if s.Deployer.Name() == framework.BackendModeAPI7EE {
 			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxySpecAPI7, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
 		} else {
 			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxySpec, framework.ProviderType, s.AdminKey()))
@@ -161,7 +161,7 @@ spec:
 
 	Context("Test GatewayProxy update configs", func() {
 		It("scaling apisix pods to test that the controller watches endpoints", func() {
-			if s.Deployer.Name() == "api7ee" {
+			if s.Deployer.Name() == framework.BackendModeAPI7EE {
 				Skip("this case only for apisix/apisix-standalone mode")
 			}
 
@@ -207,7 +207,7 @@ spec:
 				keyword string
 			)
 
-			if framework.ProviderType == "api7ee" {
+			if framework.ProviderType == framework.BackendModeAPI7EE {
 				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["%s"]}`, s.Deployer.GetAdminEndpoint())
 			} else {
 				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["http://%s:9180"]}`, s.GetPodIP(s.Namespace(), "app.kubernetes.io/name=apisix"))

test/e2e/crds/v2/globalrule.go

@@ -82,7 +82,7 @@ spec:
 				Should(Equal(http.StatusOK))
 		})
 
-		It("Test GlobalRule with response-rewrite plugin", func() {
+		FIt("Test GlobalRule with response-rewrite plugin", func() {
 			globalRuleYaml := `
 apiVersion: apisix.apache.org/v2
 kind: ApisixGlobalRule

test/e2e/crds/v2/route.go

@@ -239,7 +239,7 @@ spec:
 		})
 
 		It("Test ApisixRoute filterFunc", func() {
-			if s.Deployer.Name() == "api7ee" {
+			if s.Deployer.Name() == framework.BackendModeAPI7EE {
 				Skip("filterFunc is not supported in api7ee")
 			}
 			const apisixRouteSpec = `
@@ -726,7 +726,7 @@ spec:
       servicePort: 80
 `
 		It("Should sync ApisixRoute during startup", func() {
-			if s.Deployer.Name() == "api7ee" {
+			if s.Deployer.Name() == framework.BackendModeAPI7EE {
 				Skip("skipping test in API7EE mode")
 			}
 			By("apply ApisixRoute")

test/e2e/crds/v2/status.go

@@ -156,7 +156,7 @@ spec:
 		})
 
 		It("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") == "api7ee" {
+			if os.Getenv("PROVIDER_TYPE") == framework.BackendModeAPI7EE {
 				Skip("skip for api7ee mode because it use dashboard admin api")
 			}
 			By("apply ApisixRoute")

test/e2e/framework/api7_consts.go

@@ -35,3 +35,8 @@ const (
 	DashboardTLSEndpoint = "https://api7ee3-dashboard.api7-ee-e2e:7443"
 	DPManagerTLSEndpoint = "https://api7ee3-dp-manager.api7-ee-e2e:7943"
 )
+
+const (
+	ProviderAPISIX    = "apisix"
+	BackendModeAPI7EE = "api7ee"
+)

test/e2e/gatewayapi/status.go

@@ -111,7 +111,7 @@ spec:
 		})
 
 		It("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") == "api7ee" {
+			if os.Getenv("PROVIDER_TYPE") == framework.BackendModeAPI7EE {
 				Skip("skip for api7ee mode because it use dashboard admin api")
 			}
 			By("Create HTTPRoute")

test/e2e/scaffold/k8s.go

@@ -309,7 +309,7 @@ spec:
           value: "%s"
 `
 
-	if s.Deployer.Name() == "api7ee" {
+	if s.Deployer.Name() == framework.BackendModeAPI7EE {
 		return fmt.Sprintf(gatewayProxyYamlAPI7, s.Deployer.GetAdminEndpoint(), s.AdminKey())
 	}
 	return fmt.Sprintf(gatewayProxyYaml, framework.ProviderType, s.AdminKey())