fix test

Author: AlinsRan

internal/provider/api7ee/provider.go

@@ -262,7 +262,7 @@ func (d *api7eeProvider) NeedLeaderElection() bool {
 
 // updateConfigForGatewayProxy update config for all referrers of the GatewayProxy
 func (d *api7eeProvider) updateConfigForGatewayProxy(tctx *provider.TranslateContext, gp *v1alpha1.GatewayProxy) error {
-	config, err := d.translator.TranslateGatewayProxyToConfig(tctx, gp, "")
+	config, err := d.translator.TranslateGatewayProxyToConfig(tctx, gp, d.ResolveEndpoints)
 	if err != nil {
 		return err
 	}
@@ -282,7 +282,7 @@ func (d *api7eeProvider) updateConfigForGatewayProxy(tctx *provider.TranslateCon
 func (d *api7eeProvider) buildConfig(tctx *provider.TranslateContext, nnk types.NamespacedNameKind) (map[types.NamespacedNameKind]adctypes.Config, error) {
 	configs := make(map[types.NamespacedNameKind]adctypes.Config, len(tctx.ResourceParentRefs[nnk]))
 	for _, gp := range tctx.GatewayProxies {
-		config, err := d.translator.TranslateGatewayProxyToConfig(tctx, &gp, "")
+		config, err := d.translator.TranslateGatewayProxyToConfig(tctx, &gp, d.ResolveEndpoints)
 		if err != nil {
 			return nil, err
 		}

internal/provider/apisix/provider.go

@@ -43,8 +43,7 @@ import (
 	pkgutils "github.com/apache/apisix-ingress-controller/pkg/utils"
 )
 
-const ProviderType = "apisix"
-const ProviderTypeAPISIXStandalone = "apisix-standalone"
+const ProviderTypeAPISIX = "apisix"
 
 type apisixProvider struct {
 	provider.Options
@@ -66,7 +65,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 = ProviderTypeAPISIX
 	}
 
 	cli, err := adcclient.New(o.BackendMode)
@@ -215,12 +214,8 @@ func (d *apisixProvider) Delete(ctx context.Context, obj client.Object) error {
 
 func (d *apisixProvider) buildConfig(tctx *provider.TranslateContext, nnk types.NamespacedNameKind) (map[types.NamespacedNameKind]adctypes.Config, error) {
 	configs := make(map[types.NamespacedNameKind]adctypes.Config, len(tctx.ResourceParentRefs[nnk]))
-	var mode string
-	if d.BackendMode == ProviderTypeAPISIXStandalone {
-		mode = "endpoints"
-	}
 	for _, gp := range tctx.GatewayProxies {
-		config, err := d.translator.TranslateGatewayProxyToConfig(tctx, &gp, mode)
+		config, err := d.translator.TranslateGatewayProxyToConfig(tctx, &gp, d.ResolveEndpoints)
 		if err != nil {
 			return nil, err
 		}
@@ -290,11 +285,7 @@ func (d *apisixProvider) NeedLeaderElection() bool {
 
 // updateConfigForGatewayProxy update config for all referrers of the GatewayProxy
 func (d *apisixProvider) updateConfigForGatewayProxy(tctx *provider.TranslateContext, gp *v1alpha1.GatewayProxy) error {
-	var mode string
-	if d.BackendMode == ProviderTypeAPISIXStandalone {
-		mode = "endpoints"
-	}
-	config, err := d.translator.TranslateGatewayProxyToConfig(tctx, gp, mode)
+	config, err := d.translator.TranslateGatewayProxyToConfig(tctx, gp, d.ResolveEndpoints)
 	if err != nil {
 		return err
 	}

internal/provider/init/init.go

@@ -29,6 +29,7 @@ func init() {
 	provider.Register("apisix", apisix.New)
 	provider.Register("apisix-standalone", func(statusUpdater status.Updater, readinessManager readiness.ReadinessManager, opts ...provider.Option) (provider.Provider, error) {
 		opts = append(opts, provider.WithBackendMode("apisix-standalone"))
+		opts = append(opts, provider.WithResolveEndpoints())
 		return apisix.New(statusUpdater, readinessManager, opts...)
 	})
 	provider.Register("api7ee", api7ee.New)

internal/provider/options.go

@@ -24,10 +24,11 @@ type Option interface {
 }
 
 type Options struct {
-	SyncTimeout   time.Duration
-	SyncPeriod    time.Duration
-	InitSyncDelay time.Duration
-	BackendMode   string
+	SyncTimeout      time.Duration
+	SyncPeriod       time.Duration
+	InitSyncDelay    time.Duration
+	BackendMode      string
+	ResolveEndpoints bool
 }
 
 func (o *Options) ApplyToList(lo *Options) {
@@ -43,6 +44,9 @@ func (o *Options) ApplyToList(lo *Options) {
 	if o.BackendMode != "" {
 		lo.BackendMode = o.BackendMode
 	}
+	if o.ResolveEndpoints {
+		lo.ResolveEndpoints = o.ResolveEndpoints
+	}
 }
 
 func (o *Options) ApplyOptions(opts []Option) *Options {
@@ -61,3 +65,13 @@ func (b backendModeOption) ApplyToList(o *Options) {
 func WithBackendMode(mode string) Option {
 	return backendModeOption(mode)
 }
+
+type resolveEndpointsOption bool
+
+func (r resolveEndpointsOption) ApplyToList(o *Options) {
+	o.ResolveEndpoints = bool(r)
+}
+
+func WithResolveEndpoints() Option {
+	return resolveEndpointsOption(true)
+}