fix: support sync global rule in api7ee mode (#191)

Signed-off-by: ashing <[email protected]>

Author: ronething

internal/provider/adc/adc.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	"encoding/json"
 	"os"
+	"slices"
 	"sync"
 	"time"
 
@@ -353,6 +354,34 @@ func (d *adcClient) sync(ctx context.Context, task Task) error {
 		return errors.New("no adc configs provided")
 	}
 
+	// for global rules, we need to list all global rules and set it to the task resources
+	if slices.Contains(task.ResourceTypes, "global_rule") {
+		for _, config := range task.configs {
+			globalRules, err := d.store.ListGlobalRules(config.Name)
+			if err != nil {
+				return err
+			}
+			task.Resources.GlobalRules = *globalRules
+			log.Debugw("syncing resources global rules", zap.Any("globalRules", task.Resources.GlobalRules))
+
+			syncFilePath, cleanup, err := prepareSyncFile(task.Resources)
+			if err != nil {
+				return err
+			}
+			defer cleanup()
+
+			args := BuildADCExecuteArgs(syncFilePath, task.Labels, task.ResourceTypes)
+
+			if err := d.executor.Execute(ctx, d.BackendMode, config, args); err != nil {
+				log.Errorw("failed to execute adc command", zap.Error(err), zap.Any("config", config))
+				return err
+			}
+		}
+
+		return nil
+	}
+
+	// every task resources is the same, so we can use the first config to prepare the sync file
 	syncFilePath, cleanup, err := prepareSyncFile(task.Resources)
 	if err != nil {
 		return err

internal/provider/adc/store.go

@@ -244,3 +244,28 @@ func (s *Store) GetResources(name string) (*adctypes.Resources, error) {
 		PluginMetadata: metadata,
 	}, nil
 }
+
+func (s *Store) ListGlobalRules(name string) (*adctypes.GlobalRule, error) {
+	s.Lock()
+	defer s.Unlock()
+
+	var globalrule adctypes.GlobalRule
+	targetCache, ok := s.cacheMap[name]
+	if !ok {
+		return &globalrule, nil
+	}
+	// Get all global rules from cache and merge them
+	globalRuleItems, _ := targetCache.ListGlobalRules()
+	if len(globalRuleItems) > 0 {
+		merged := make(adctypes.Plugins)
+		for _, item := range globalRuleItems {
+			for k, v := range item.Plugins {
+				merged[k] = v
+			}
+		}
+		globalrule = adctypes.GlobalRule(merged)
+	}
+	log.Debugw("get resources global rule items", zap.Any("globalRuleItems", globalRuleItems))
+
+	return &globalrule, nil
+}

test/e2e/crds/v2/globalrule.go

@@ -88,9 +88,6 @@ spec:
 
 	Context("ApisixGlobalRule Basic Operations", func() {
 		BeforeEach(func() {
-			if s.Deployer.Name() == "api7ee" {
-				Skip("GlobalRule is not supported in api7ee")
-			}
 			By("create GatewayProxy")
 			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
 			err := s.CreateResourceFromStringWithNamespace(gatewayProxy, "default")