update test

Author: AlinsRan

internal/provider/api7ee/provider.go

@@ -254,14 +254,13 @@ func (d *api7eeProvider) updateConfigForGatewayProxy(tctx *provider.TranslateCon
 		return err
 	}
 
-	referrers := tctx.GatewayProxyReferrers[utils.NamespacedName(gp)]
-
+	nnk := utils.NamespacedNameKind(gp)
 	if config == nil {
-		d.client.ConfigManager.DeleteConfig(referrers...)
+		d.client.ConfigManager.DeleteConfig(nnk)
 		return nil
 	}
 
-	d.client.ConfigManager.UpdateConfig(*config, referrers...)
+	d.client.ConfigManager.UpdateConfig(nnk, *config)
 	return nil
 }
 

internal/provider/apisix/provider.go

@@ -263,7 +263,10 @@ func (d *apisixProvider) Start(ctx context.Context) error {
 func (d *apisixProvider) sync(ctx context.Context) error {
 	statusesMap, err := d.client.Sync(ctx)
 	d.handleADCExecutionErrors(statusesMap)
-	return err
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 func (d *apisixProvider) syncNotify() {
@@ -289,14 +292,13 @@ func (d *apisixProvider) updateConfigForGatewayProxy(tctx *provider.TranslateCon
 		return err
 	}
 
-	referrers := tctx.GatewayProxyReferrers[utils.NamespacedName(gp)]
-
+	nnk := utils.NamespacedNameKind(gp)
 	if config == nil {
-		d.client.ConfigManager.DeleteConfig(referrers...)
+		d.client.ConfigManager.DeleteConfig(nnk)
 		return nil
 	}
 
-	d.client.ConfigManager.UpdateConfig(*config, referrers...)
+	d.client.ConfigManager.UpdateConfig(nnk, *config)
 	d.syncNotify()
 	return nil
 }

internal/provider/common/configmanager.go

@@ -71,12 +71,10 @@ func (s *ConfigManager[K, T]) List() map[K]T {
 	return configs
 }
 
-func (s *ConfigManager[K, T]) UpdateConfig(cfg T, parents ...K) {
+func (s *ConfigManager[K, T]) UpdateConfig(key K, cfg T) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
-	for _, parent := range parents {
-		s.configs[parent] = cfg
-	}
+	s.configs[key] = cfg
 }
 
 func (s *ConfigManager[K, T]) Update(
@@ -121,10 +119,8 @@ func (s *ConfigManager[K, T]) Delete(key K) {
 	delete(s.configs, key)
 }
 
-func (s *ConfigManager[K, T]) DeleteConfig(keys ...K) {
+func (s *ConfigManager[K, T]) DeleteConfig(key K) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
-	for _, key := range keys {
-		delete(s.configs, key)
-	}
+	delete(s.parentRefs, key)
 }

test/e2e/crds/v1alpha1/consumer.go

@@ -19,6 +19,7 @@ package v1alpha1
 
 import (
 	"fmt"
+	"os"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -600,7 +601,7 @@ spec:
 		})
 
 		It("Should sync Consumer during startup", func() {
-			if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
+			if os.Getenv("PROVIDER_TYPE") == framework.ProviderTypeAPI7EE {
 				Skip("skipping test in API7EE mode")
 			}
 			Expect(s.CreateResourceFromString(consumer2)).NotTo(HaveOccurred(), "creating unused consumer")

test/e2e/crds/v1alpha1/gatewayproxy.go

@@ -160,7 +160,7 @@ spec:
 	})
 
 	Context("Test GatewayProxy update configs", func() {
-		FIt("scaling apisix pods to test that the controller watches endpoints", func() {
+		It("scaling apisix pods to test that the controller watches endpoints", func() {
 			if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
 				Skip("this case only for apisix/apisix-standalone mode")
 			}

test/e2e/crds/v2/status.go

@@ -155,7 +155,7 @@ spec:
 			})
 		})
 
-		FIt("dataplane unavailable", func() {
+		It("dataplane unavailable", func() {
 			if os.Getenv("PROVIDER_TYPE") != framework.ProviderTypeAPISIXStandalone {
 				Skip("skip for api7ee mode because it use dashboard admin api")
 			}

test/e2e/gatewayapi/status.go

@@ -110,8 +110,8 @@ spec:
 			_ = s.DeleteResource("Gateway", "apisix")
 		})
 
-		FIt("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") != framework.ProviderTypeAPI7EE {
+		It("dataplane unavailable", func() {
+			if os.Getenv("PROVIDER_TYPE") == framework.ProviderTypeAPI7EE {
 				Skip("skip for api7ee mode because it use dashboard admin api")
 			}
 			By("Create HTTPRoute")

test/e2e/scaffold/apisix_deployer.go

@@ -109,6 +109,8 @@ func (s *APISIXDeployer) BeforeEach() {
 	e.Wait()
 }
 
+var skip = true
+
 func (s *APISIXDeployer) AfterEach() {
 	if CurrentSpecReport().Failed() {
 		if os.Getenv("TEST_ENV") == "CI" {
@@ -122,6 +124,9 @@ func (s *APISIXDeployer) AfterEach() {
 			_, _ = fmt.Fprintln(GinkgoWriter, output)
 		}
 	}
+	if skip {
+		return
+	}
 
 	// Delete all additional gateways
 	for identifier := range s.additionalGateways {