Merge remote-tracking branch 'origin/release-v2-dev' into test/adc_test

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

api/adc/types.go

@@ -725,3 +725,24 @@ func (s *StringOrSlice) UnmarshalJSON(p []byte) error {
 	}
 	return json.Unmarshal(p, &s.StrVal)
 }
+
+type Config struct {
+	Name        string
+	ServerAddrs []string
+	Token       string
+	TlsVerify   bool
+}
+
+// MarshalJSON implements custom JSON marshaling for adcConfig
+// It excludes the Token field for security reasons
+func (c Config) MarshalJSON() ([]byte, error) {
+	return json.Marshal(struct {
+		Name        string   `json:"name"`
+		ServerAddrs []string `json:"serverAddrs"`
+		TlsVerify   bool     `json:"tlsVerify"`
+	}{
+		Name:        c.Name,
+		ServerAddrs: c.ServerAddrs,
+		TlsVerify:   c.TlsVerify,
+	})
+}

internal/provider/adc/cache/cache.go renamed to internal/adc/cache/cache.go

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package adc
+package cache
 
 import (
 	"fmt"
@@ -27,37 +27,36 @@ import (
 
 	adctypes "github.com/apache/apisix-ingress-controller/api/adc"
 	"github.com/apache/apisix-ingress-controller/internal/controller/label"
-	"github.com/apache/apisix-ingress-controller/internal/provider/adc/cache"
 )
 
 type Store struct {
-	cacheMap          map[string]cache.Cache
+	cacheMap          map[string]Cache
 	pluginMetadataMap map[string]adctypes.PluginMetadata
 
 	sync.Mutex
 }
 
 func NewStore() *Store {
 	return &Store{
-		cacheMap:          make(map[string]cache.Cache),
+		cacheMap:          make(map[string]Cache),
 		pluginMetadataMap: make(map[string]adctypes.PluginMetadata),
 	}
 }
 
-func (s *Store) Insert(name string, resourceTypes []string, resources adctypes.Resources, Labels map[string]string) error {
+func (s *Store) Insert(name string, resourceTypes []string, resources *adctypes.Resources, Labels map[string]string) error {
 	s.Lock()
 	defer s.Unlock()
 	targetCache, ok := s.cacheMap[name]
 	if !ok {
-		db, err := cache.NewMemDBCache()
+		db, err := NewMemDBCache()
 		if err != nil {
 			return err
 		}
 		s.cacheMap[name] = db
 		targetCache = s.cacheMap[name]
 	}
 	log.Debugw("Inserting resources into cache for", zap.String("name", name))
-	selector := &cache.KindLabelSelector{
+	selector := &KindLabelSelector{
 		Kind:      Labels[label.LabelKind],
 		Name:      Labels[label.LabelName],
 		Namespace: Labels[label.LabelNamespace],
@@ -153,7 +152,7 @@ func (s *Store) Delete(name string, resourceTypes []string, Labels map[string]st
 	if !ok {
 		return nil
 	}
-	selector := &cache.KindLabelSelector{
+	selector := &KindLabelSelector{
 		Kind:      Labels[label.LabelKind],
 		Name:      Labels[label.LabelName],
 		Namespace: Labels[label.LabelNamespace],