chore: Refactor Vars and StringOrSlice types into adc package

Moved the `Vars` and `StringOrSlice` types from the `common` package to the `adc` package to better encapsulate related functionality. Updated import paths and references accordingly to reflect this change.

Author: dspo

api/adc/types.go

@@ -10,8 +10,6 @@ import (
 	"time"
 
 	"github.com/incubator4/go-resty-expr/expr"
-
-	"github.com/api7/api7-ingress-controller/api/common"
 )
 
 const (
@@ -115,16 +113,16 @@ type Service struct {
 type Route struct {
 	Metadata `json:",inline" yaml:",inline"`
 
-	EnableWebsocket *bool       `json:"enable_websocket,omitempty" yaml:"enable_websocket,omitempty"`
-	FilterFunc      string      `json:"filter_func,omitempty" yaml:"filter_func,omitempty"`
-	Hosts           []string    `json:"hosts,omitempty" yaml:"hosts,omitempty"`
-	Methods         []string    `json:"methods,omitempty" yaml:"methods,omitempty"`
-	Plugins         Plugins     `json:"plugins,omitempty" yaml:"plugins,omitempty"`
-	Priority        *int64      `json:"priority,omitempty" yaml:"priority,omitempty"`
-	RemoteAddrs     []string    `json:"remote_addrs,omitempty" yaml:"remote_addrs,omitempty"`
-	Timeout         *Timeout    `json:"timeout,omitempty" yaml:"timeout,omitempty"`
-	Uris            []string    `json:"uris" yaml:"uris"`
-	Vars            common.Vars `json:"vars,omitempty" yaml:"vars,omitempty"`
+	EnableWebsocket *bool    `json:"enable_websocket,omitempty" yaml:"enable_websocket,omitempty"`
+	FilterFunc      string   `json:"filter_func,omitempty" yaml:"filter_func,omitempty"`
+	Hosts           []string `json:"hosts,omitempty" yaml:"hosts,omitempty"`
+	Methods         []string `json:"methods,omitempty" yaml:"methods,omitempty"`
+	Plugins         Plugins  `json:"plugins,omitempty" yaml:"plugins,omitempty"`
+	Priority        *int64   `json:"priority,omitempty" yaml:"priority,omitempty"`
+	RemoteAddrs     []string `json:"remote_addrs,omitempty" yaml:"remote_addrs,omitempty"`
+	Timeout         *Timeout `json:"timeout,omitempty" yaml:"timeout,omitempty"`
+	Uris            []string `json:"uris" yaml:"uris"`
+	Vars            Vars     `json:"vars,omitempty" yaml:"vars,omitempty"`
 }
 
 type Timeout struct {
@@ -502,3 +500,49 @@ type ResponseData struct {
 	Value    map[string]any `json:"value"`
 	ErrorMsg string         `json:"error_msg"`
 }
+
+// Vars represents the route match expressions of APISIX.
+type Vars [][]StringOrSlice
+
+// UnmarshalJSON implements json.Unmarshaler interface.
+// lua-cjson doesn't distinguish empty array and table,
+// and by default empty array will be encoded as '{}'.
+// We have to maintain the compatibility.
+func (vars *Vars) UnmarshalJSON(p []byte) error {
+	if p[0] == '{' {
+		if len(p) != 2 {
+			return errors.New("unexpected non-empty object")
+		}
+		return nil
+	}
+	var data [][]StringOrSlice
+	if err := json.Unmarshal(p, &data); err != nil {
+		return err
+	}
+	*vars = data
+	return nil
+}
+
+// StringOrSlice represents a string or a string slice.
+// TODO Do not use interface{} to avoid the reflection overheads.
+type StringOrSlice struct {
+	StrVal   string          `json:"-"`
+	SliceVal []StringOrSlice `json:"-"`
+}
+
+func (s *StringOrSlice) MarshalJSON() ([]byte, error) {
+	if s.SliceVal != nil {
+		return json.Marshal(s.SliceVal)
+	}
+	return json.Marshal(s.StrVal)
+}
+
+func (s *StringOrSlice) UnmarshalJSON(p []byte) error {
+	if len(p) == 0 {
+		return errors.New("empty object")
+	}
+	if p[0] == '[' {
+		return json.Unmarshal(p, &s.SliceVal)
+	}
+	return json.Unmarshal(p, &s.StrVal)
+}

api/common/types.go

@@ -11,7 +11,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
-	"github.com/api7/api7-ingress-controller/api/common"
 	"github.com/api7/gopkg/pkg/log"
 
 	adctypes "github.com/api7/api7-ingress-controller/api/adc"
@@ -356,14 +355,14 @@ func (t *Translator) translateGatewayHTTPRouteMatch(match *gatewayv1.HTTPRouteMa
 		case gatewayv1.PathMatchPathPrefix:
 			route.Uris = []string{*match.Path.Value + "*"}
 		case gatewayv1.PathMatchRegularExpression:
-			var this []common.StringOrSlice
-			this = append(this, common.StringOrSlice{
+			var this []adctypes.StringOrSlice
+			this = append(this, adctypes.StringOrSlice{
 				StrVal: "uri",
 			})
-			this = append(this, common.StringOrSlice{
+			this = append(this, adctypes.StringOrSlice{
 				StrVal: "~~",
 			})
-			this = append(this, common.StringOrSlice{
+			this = append(this, adctypes.StringOrSlice{
 				StrVal: *match.Path.Value,
 			})
 
@@ -378,25 +377,25 @@ func (t *Translator) translateGatewayHTTPRouteMatch(match *gatewayv1.HTTPRouteMa
 			name := strings.ToLower(string(header.Name))
 			name = strings.ReplaceAll(name, "-", "_")
 
-			var this []common.StringOrSlice
-			this = append(this, common.StringOrSlice{
+			var this []adctypes.StringOrSlice
+			this = append(this, adctypes.StringOrSlice{
 				StrVal: "http_" + name,
 			})
 
 			switch *header.Type {
 			case gatewayv1.HeaderMatchExact:
-				this = append(this, common.StringOrSlice{
+				this = append(this, adctypes.StringOrSlice{
 					StrVal: "==",
 				})
 			case gatewayv1.HeaderMatchRegularExpression:
-				this = append(this, common.StringOrSlice{
+				this = append(this, adctypes.StringOrSlice{
 					StrVal: "~~",
 				})
 			default:
 				return nil, errors.New("unknown header match type " + string(*header.Type))
 			}
 
-			this = append(this, common.StringOrSlice{
+			this = append(this, adctypes.StringOrSlice{
 				StrVal: header.Value,
 			})
 
@@ -406,25 +405,25 @@ func (t *Translator) translateGatewayHTTPRouteMatch(match *gatewayv1.HTTPRouteMa
 
 	if len(match.QueryParams) > 0 {
 		for _, query := range match.QueryParams {
-			var this []common.StringOrSlice
-			this = append(this, common.StringOrSlice{
+			var this []adctypes.StringOrSlice
+			this = append(this, adctypes.StringOrSlice{
 				StrVal: "arg_" + strings.ToLower(fmt.Sprintf("%v", query.Name)),
 			})
 
 			switch *query.Type {
 			case gatewayv1.QueryParamMatchExact:
-				this = append(this, common.StringOrSlice{
+				this = append(this, adctypes.StringOrSlice{
 					StrVal: "==",
 				})
 			case gatewayv1.QueryParamMatchRegularExpression:
-				this = append(this, common.StringOrSlice{
+				this = append(this, adctypes.StringOrSlice{
 					StrVal: "~~",
 				})
 			default:
 				return nil, errors.New("unknown query match type " + string(*query.Type))
 			}
 
-			this = append(this, common.StringOrSlice{
+			this = append(this, adctypes.StringOrSlice{
 				StrVal: query.Value,
 			})
 

api/common/zz_generated.deepcopy.go

@@ -35,7 +35,7 @@ func (d *TimeDuration) MarshalJSON() ([]byte, error) {
 }
 
 func (d *TimeDuration) UnmarshalJSON(data []byte) error {
-	var value interface{}
+	var value any
 	if err := json.Unmarshal(data, &value); err != nil {
 		return err
 	}
@@ -54,11 +54,11 @@ func (d *TimeDuration) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-func (d *TimeDuration) MarshalYAML() (interface{}, error) {
+func (d *TimeDuration) MarshalYAML() (any, error) {
 	return d.Duration.String(), nil
 }
 
-func (d *TimeDuration) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (d *TimeDuration) UnmarshalYAML(unmarshal func(any) error) error {
 	var s string
 	if err := unmarshal(&s); err != nil {
 		return err