implement translator

Author: dspo

api/v2/apisixroute_types.go

@@ -13,10 +13,15 @@
 package v2
 
 import (
-	"encoding/json"
+	"slices"
+	"strings"
 
+	"github.com/pkg/errors"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+
+	"github.com/apache/apisix-ingress-controller/api/adc"
 )
 
 // ApisixRouteSpec is the spec definition for ApisixRouteSpec.
@@ -119,7 +124,7 @@ type ApisixRouteHTTPMatch struct {
 	//     value:
 	//       - "127.0.0.1"
 	//       - "10.0.5.11"
-	NginxVars []ApisixRouteHTTPMatchExpr `json:"exprs,omitempty" yaml:"exprs,omitempty"`
+	NginxVars ApisixRouteHTTPMatchExprs `json:"exprs,omitempty" yaml:"exprs,omitempty"`
 	// Matches based on a user-defined filtering function.
 	// These functions can accept an input parameter `vars`
 	// which can be used to access the Nginx variables.
@@ -220,24 +225,101 @@ type ApisixRouteHTTPMatchExpr struct {
 	Value *string `json:"value" yaml:"value"`
 }
 
-// ApisixRoutePluginConfig is the configuration for
-// any plugins.
-type ApisixRoutePluginConfig map[string]any
+type ApisixRouteHTTPMatchExprs []ApisixRouteHTTPMatchExpr
 
-func (p ApisixRoutePluginConfig) DeepCopyInto(out *ApisixRoutePluginConfig) {
-	b, _ := json.Marshal(&p)
-	_ = json.Unmarshal(b, out)
-}
+func (exprs ApisixRouteHTTPMatchExprs) ToVars() (result adc.Vars, err error) {
+	for _, expr := range exprs {
+		if expr.Subject.Name == "" && expr.Subject.Scope != ScopePath {
+			return result, errors.New("empty subject.name")
+		}
+
+		// process key
+		var (
+			subj string
+			this adc.StringOrSlice
+		)
+		switch expr.Subject.Scope {
+		case ScopeQuery:
+			subj = "arg_" + expr.Subject.Name
+		case ScopeHeader:
+			subj = "http_" + strings.ReplaceAll(strings.ToLower(expr.Subject.Name), "-", "_")
+		case ScopeCookie:
+			subj = "cookie_" + expr.Subject.Name
+		case ScopePath:
+			subj = "uri"
+		case ScopeVariable:
+			subj = expr.Subject.Name
+		default:
+			return result, errors.New("invalid http match expr: subject.scope should be one of [query, header, cookie, path, variable]")
+		}
+		this.SliceVal = append(this.SliceVal, adc.StringOrSlice{StrVal: subj})
+
+		// process operator
+		var (
+			op string
+		)
+		switch expr.Op {
+		case OpEqual:
+			op = "=="
+		case OpGreaterThan:
+			op = ">"
+		case OpGreaterThanEqual:
+			op = ">="
+		case OpIn:
+			op = "in"
+		case OpLessThan:
+			op = "<"
+		case OpLessThanEqual:
+			op = "<="
+		case OpNotEqual:
+			op = "~="
+		case OpNotIn:
+			op = "in"
+		case OpRegexMatch:
+			op = "~~"
+		case OpRegexMatchCaseInsensitive:
+			op = "~*"
+		case OpRegexNotMatch:
+			op = "~~"
+		case OpRegexNotMatchCaseInsensitive:
+			op = "~*"
+		default:
+			return result, errors.New("unknown operator")
+		}
+		if invert := slices.Contains([]string{OpNotIn, OpRegexNotMatch, OpRegexNotMatchCaseInsensitive}, op); invert {
+			this.SliceVal = append(this.SliceVal, adc.StringOrSlice{StrVal: "!"})
+		}
+		this.SliceVal = append(this.SliceVal, adc.StringOrSlice{StrVal: op})
 
-func (p *ApisixRoutePluginConfig) DeepCopy() *ApisixRoutePluginConfig {
-	if p == nil {
-		return nil
+		// process value
+		switch expr.Op {
+		case OpIn, OpNotIn:
+			if expr.Set == nil {
+				return result, errors.New("empty set value")
+			}
+			var value adc.StringOrSlice
+			for _, item := range expr.Set {
+				value.SliceVal = append(value.SliceVal, adc.StringOrSlice{StrVal: item})
+			}
+			this.SliceVal = append(this.SliceVal, value)
+		default:
+			if expr.Value == nil {
+				return result, errors.New("empty value")
+			}
+			this.SliceVal = append(this.SliceVal, adc.StringOrSlice{StrVal: *expr.Value})
+		}
+
+		// append to result
+		result = append(result, this.SliceVal)
 	}
-	out := new(ApisixRoutePluginConfig)
-	p.DeepCopyInto(out)
-	return out
+
+	return result, nil
 }
 
+// ApisixRoutePluginConfig is the configuration for
+// any plugins.
+type ApisixRoutePluginConfig map[string]apiextensionsv1.JSON
+
 // ApisixRouteAuthenticationKeyAuth is the keyAuth-related
 // configuration in ApisixRouteAuthentication.
 type ApisixRouteAuthenticationKeyAuth struct {

api/v2/shared_types.go

@@ -1,11 +1,3 @@
-package v2
-
-import (
-	"time"
-
-	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
-)
-
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -18,6 +10,14 @@ import (
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package v2
+
+import (
+	"time"
+
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+)
+
 type (
 	// ApisixRouteConditionType is a type of condition for a route.
 	ApisixRouteConditionType = gatewayv1.RouteConditionType
@@ -35,6 +35,8 @@ const (
 	// DefaultUpstreamTimeout represents the default connect,
 	// read and send timeout (in seconds) with upstreams.
 	DefaultUpstreamTimeout = 60 * time.Second
+
+	DefaultWeight = 100
 )
 
 const (

api/v2/zz_generated.deepcopy.go

@@ -1091,7 +1091,7 @@ ApisixRouteHTTPMatch represents the match condition for hitting this route.
 | `methods` _string array_ | HTTP request method predicates. |
 | `hosts` _string array_ | HTTP Host predicates, host can be a wildcard domain or an exact domain. For wildcard domain, only one generic level is allowed, for instance, "*.foo.com" is valid but "*.*.foo.com" is not. |
 | `remoteAddrs` _string array_ | Remote address predicates, items can be valid IPv4 address or IPv6 address or CIDR. |
-| `exprs` _[ApisixRouteHTTPMatchExpr](#apisixroutehttpmatchexpr) array_ | NginxVars represents generic match predicates, it uses Nginx variable systems, so any predicate like headers, querystring and etc can be leveraged here to match the route. For instance, it can be: nginxVars:   - subject: "$remote_addr"     op: in     value:       - "127.0.0.1"       - "10.0.5.11" |
+| `exprs` _[ApisixRouteHTTPMatchExprs](#apisixroutehttpmatchexprs)_ | NginxVars represents generic match predicates, it uses Nginx variable systems, so any predicate like headers, querystring and etc can be leveraged here to match the route. For instance, it can be: nginxVars:   - subject: "$remote_addr"     op: in     value:       - "127.0.0.1"       - "10.0.5.11" |
 | `filter_func` _string_ | Matches based on a user-defined filtering function. These functions can accept an input parameter `vars` which can be used to access the Nginx variables. |
 
 
@@ -1114,7 +1114,7 @@ ApisixRouteHTTPMatchExpr represents a binary route match expression .
 
 
 _Appears in:_
-- [ApisixRouteHTTPMatch](#apisixroutehttpmatch)
+- [ApisixRouteHTTPMatchExprs](#apisixroutehttpmatchexprs)
 
 #### ApisixRouteHTTPMatchExprSubject
 
@@ -1132,6 +1132,24 @@ ApisixRouteHTTPMatchExprSubject describes the route match expression subject.
 _Appears in:_
 - [ApisixRouteHTTPMatchExpr](#apisixroutehttpmatchexpr)
 
+#### ApisixRouteHTTPMatchExprs
+_Base type:_ `[ApisixRouteHTTPMatchExpr](#apisixroutehttpmatchexpr)`
+
+
+
+
+
+| Field | Description |
+| --- | --- |
+| `subject` _[ApisixRouteHTTPMatchExprSubject](#apisixroutehttpmatchexprsubject)_ | Subject is the expression subject, it can be any string composed by literals and nginx vars. |
+| `op` _string_ | Op is the operator. |
+| `set` _string array_ | Set is an array type object of the expression. It should be used when the Op is "in" or "not_in"; |
+| `value` _string_ | Value is the normal type object for the expression, it should be used when the Op is not "in" and "not_in". Set and Value are exclusive so only of them can be set in the same time. |
+
+
+_Appears in:_
+- [ApisixRouteHTTPMatch](#apisixroutehttpmatch)
+
 #### ApisixRoutePlugin
 
 
@@ -1634,6 +1652,10 @@ _Appears in:_
 
 
 
+
+
+
+
 #### UpstreamTimeout
 
 

docs/crd/api.md

@@ -367,7 +367,7 @@ func (r *ApisixGlobalRuleReconciler) processIngressClassParameters(ctx context.C
 // updateStatus updates the ApisixGlobalRule status with the given condition
 func (r *ApisixGlobalRuleReconciler) updateStatus(globalRule *apiv2.ApisixGlobalRule, condition metav1.Condition) {
 	r.Updater.Update(status.Update{
-		NamespacedName: NamespacedName(globalRule),
+		NamespacedName: utils.NamespacedName(globalRule),
 		Resource:       &apiv2.ApisixGlobalRule{},
 		Mutator: status.MutatorFunc(func(obj client.Object) client.Object {
 			gr, ok := obj.(*apiv2.ApisixGlobalRule)