update code

Author: AlinsRan

internal/adc/client/client.go

@@ -226,12 +226,13 @@ func (c *Client) Sync(ctx context.Context) (map[string]types.ADCExecutionErrors,
 		}
 	}
 
+	var err error
 	if len(failedConfigs) > 0 {
-		return failedMap, fmt.Errorf("failed to sync %d configs: %s",
+		err = fmt.Errorf("failed to sync %d configs: %s",
 			len(failedConfigs),
 			strings.Join(failedConfigs, ", "))
 	}
-	return failedMap, nil
+	return failedMap, err
 }
 
 func (c *Client) sync(ctx context.Context, task Task) error {

internal/adc/translator/translator.go

@@ -40,5 +40,4 @@ type TranslateResult struct {
 	GlobalRules    adctypes.GlobalRule
 	PluginMetadata adctypes.PluginMetadata
 	Consumers      []*adctypes.Consumer
-	ResourceTypes  []string
 }

internal/provider/api7ee/provider.go

@@ -42,7 +42,7 @@ import (
 	pkgutils "github.com/apache/apisix-ingress-controller/pkg/utils"
 )
 
-const ProviderType = "api7ee"
+const ProviderTypeAPI7EE = "api7ee"
 
 type api7eeProvider struct {
 	translator *translator.Translator
@@ -63,7 +63,7 @@ func New(updater status.Updater, readier readiness.ReadinessManager, opts ...pro
 	o := provider.Options{}
 	o.ApplyOptions(opts)
 	if o.BackendMode == "" {
-		o.BackendMode = ProviderType
+		o.BackendMode = ProviderTypeAPI7EE
 	}
 
 	cli, err := adcclient.New(o.BackendMode)

test/e2e/crds/v1alpha1/gatewayproxy.go

@@ -207,7 +207,7 @@ spec:
 				keyword string
 			)
 
-			if framework.ProviderType == framework.ProviderTypeAPI7EE {
+			if framework.ProviderType == framework.ProviderTypeAPISIX {
 				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/status.go

@@ -157,7 +157,7 @@ spec:
 
 		It("dataplane unavailable", func() {
 			if os.Getenv("PROVIDER_TYPE") != framework.ProviderTypeAPISIXStandalone {
-				Skip("skip for api7ee mode because it use dashboard admin api")
+				Skip("only for apisix standalone mode")
 			}
 			By("apply ApisixRoute")
 			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apiv2.ApisixRoute{}, ar)

test/e2e/framework/api7_consts.go

@@ -18,7 +18,9 @@
 package framework
 
 import (
+	"cmp"
 	_ "embed"
+	"os"
 )
 
 const (
@@ -39,3 +41,7 @@ const (
 const (
 	ProviderTypeAPI7EE = "api7ee"
 )
+
+var (
+	IngressVersion = cmp.Or(os.Getenv("INGRESS_VERSION"), "v1")
+)

test/e2e/framework/apisix_consts.go

@@ -27,11 +27,12 @@ import (
 )
 
 var (
-	ProviderTypeAPISIX           = "aapisix"
-	ProviderTypeAPISIXStandalone = "apisix-standalone"
+	ProviderType = cmp.Or(os.Getenv("PROVIDER_TYPE"), ProviderTypeAPISIXStandalone)
+)
 
-	ProviderType   = cmp.Or(os.Getenv("PROVIDER_TYPE"), ProviderTypeAPISIXStandalone)
-	IngressVersion = cmp.Or(os.Getenv("INGRESS_VERSION"), "v1")
+const (
+	ProviderTypeAPISIX           = "apisix"
+	ProviderTypeAPISIXStandalone = "apisix-standalone"
 )
 
 var (

test/e2e/gatewayapi/status.go

@@ -109,7 +109,7 @@ spec:
 
 		It("dataplane unavailable", func() {
 			if os.Getenv("PROVIDER_TYPE") != framework.ProviderTypeAPISIXStandalone {
-				Skip("skip for api7ee mode because it use dashboard admin api")
+				Skip("only for apisix standalone mode")
 			}
 			By("Create HTTPRoute")
 			err := s.CreateResourceFromString(httproute)

test/e2e/scaffold/apisix_deployer.go

@@ -211,7 +211,7 @@ func (s *APISIXDeployer) deployDataplane(opts *APISIXDeployOptions) *corev1.Serv
 
 	kubectlOpts := k8s.NewKubectlOptions("", "", opts.Namespace)
 
-	if framework.ProviderType == "apisix" {
+	if framework.ProviderType == framework.ProviderTypeAPISIX {
 		opts.ConfigProvider = "etcd"
 		// deploy etcd
 		k8s.KubectlApplyFromString(s.GinkgoT, kubectlOpts, framework.EtcdSpec)