feat: support httproute filters (#45)

Author: AlinsRan

Makefile

@@ -116,13 +116,15 @@ kind-load-images: pull-infra-images
 	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)  --name $(KIND_NAME) 
 	@kind load docker-image kennethreitz/httpbin:latest --name $(KIND_NAME) 
 	@kind load docker-image $(IMG) --name $(KIND_NAME)
+	@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
 
 .PHONY: pull-infra-images
 pull-infra-images:
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) 
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) 
 	@docker pull kennethreitz/httpbin:latest
+	@docker pull jmalloc/echo-server:latest
 
 ##@ Build
 

api/dashboard/v1/plugin_types.go

@@ -15,13 +15,16 @@
 package v1
 
 import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
 	"github.com/incubator4/go-resty-expr/expr"
 )
 
+const (
+	PluginProxyRewrite    string = "proxy-rewrite"
+	PluginRedirect        string = "redirect"
+	PluginResponseRewrite string = "response-rewrite"
+	PluginProxyMirror     string = "proxy-mirror"
+)
+
 // TrafficSplitConfig is the config of traffic-split plugin.
 // +k8s:deepcopy-gen=true
 type TrafficSplitConfig struct {
@@ -148,7 +151,7 @@ type ResponseRewriteConfig struct {
 	StatusCode   int                 `json:"status_code,omitempty"`
 	Body         string              `json:"body,omitempty"`
 	BodyBase64   bool                `json:"body_base64,omitempty"`
-	Headers      Headers             `json:"headers,omitempty"`
+	Headers      ResponseHeaders     `json:"headers,omitempty"`
 	LuaRestyExpr []expr.Expr         `json:"vars,omitempty"`
 	Filters      []map[string]string `json:"filters,omitempty"`
 }
@@ -187,96 +190,16 @@ type RequestMirror struct {
 	Host string `json:"host"`
 }
 
-type Headers map[string]any
-
-func (p *Headers) DeepCopyInto(out *Headers) {
-	b, _ := json.Marshal(&p)
-	_ = json.Unmarshal(b, out)
-}
-
-func (p Headers) DeepCopy() Headers {
-	if p == nil {
-		return nil
-	}
-	out := make(Headers)
-	p.DeepCopyInto(&out)
-	return out
-}
-
-func (p *Headers) Add(headersToAdd []string) {
-	if p == nil {
-		return
-	}
-	if headersToAdd != nil {
-		addedHeader := make([]string, 0)
-		for _, h := range headersToAdd {
-			kv := strings.Split(h, ":")
-			if len(kv) < 2 {
-				continue
-			}
-			addedHeader = append(addedHeader, fmt.Sprintf("%s:%s", kv[0], kv[1]))
-		}
-		(*p)["add"] = addedHeader
-	}
-}
-
-func (p *Headers) GetAddedHeaders() []string {
-	if p == nil || (*p)["add"] == nil {
-		return nil
-	}
-	addedheaders, ok := (*p)["add"].([]string)
-	if ok {
-		return addedheaders
-	}
-	return nil
-}
-
-func (p *Headers) Set(headersToSet []string) {
-	if p == nil {
-		return
-	}
-	if headersToSet != nil {
-		setHeaders := make(map[string]string, 0)
-		for _, h := range headersToSet {
-			kv := strings.Split(h, ":")
-			if len(kv) < 2 {
-				continue
-			}
-			setHeaders[kv[0]] = kv[1]
-		}
-		(*p)["set"] = setHeaders
-	}
-}
-
-func (p *Headers) GetSetHeaders() map[string]string {
-	if p == nil || (*p)["set"] == nil {
-		return nil
-	}
-	addedheaders, ok := (*p)["set"].(map[string]string)
-	if ok {
-		return addedheaders
-	}
-	return nil
-}
-
-func (p *Headers) Remove(headersToRemove []string) {
-	if p == nil {
-		return
-	}
-	if headersToRemove != nil {
-		removeHeaders := make([]string, 0)
-		removeHeaders = append(removeHeaders, headersToRemove...)
-		(*p)["remove"] = removeHeaders
-	}
+// +k8s:deepcopy-gen=true
+type Headers struct {
+	Set    map[string]string `json:"set" yaml:"set"`
+	Add    map[string]string `json:"add" yaml:"add"`
+	Remove []string          `json:"remove" yaml:"remove"`
 }
 
-func (p *Headers) GetRemovedHeaders() []string {
-	if p == nil || (*p)["remove"] == nil {
-		return nil
-	}
-	removedHeaders, ok := (*p)["remove"].([]string)
-	if ok {
-		return removedHeaders
-	}
-	return nil
+// +k8s:deepcopy-gen=true
+type ResponseHeaders struct {
+	Set    map[string]string `json:"set" yaml:"set"`
+	Add    []string          `json:"add" yaml:"add"`
+	Remove []string          `json:"remove" yaml:"remove"`
 }

api/dashboard/v1/types.go

@@ -155,7 +155,7 @@ const (
 type Service struct {
 	Metadata `json:",inline" yaml:",inline"`
 	Type     ServiceType `json:"type,omitempty" yaml:"type,omitempty"`
-	Upstream Upstream    `json:"upstream,omitempty" yaml:"upstream,omitempty"`
+	Upstream *Upstream   `json:"upstream,omitempty" yaml:"upstream,omitempty"`
 	Hosts    []string    `json:"hosts,omitempty" yaml:"hosts,omitempty"`
 	Plugins  Plugins     `json:"plugins,omitempty" yaml:"plugins,omitempty"`
 }
@@ -557,18 +557,6 @@ func NewDefaultService() *Service {
 				"managed-by": "api7-ingress-controller",
 			},
 		},
-		Upstream: Upstream{
-			Type:   LbRoundRobin,
-			Key:    "",
-			Nodes:  make(UpstreamNodes, 0),
-			Scheme: SchemeHTTP,
-			Metadata: Metadata{
-				Desc: "Created by api7-ingress-controller, DO NOT modify it manually",
-				Labels: map[string]string{
-					"managed-by": "api7-ingress-controller",
-				},
-			},
-		},
 	}
 }
 
@@ -584,6 +572,21 @@ func NewDefaultRoute() *Route {
 	}
 }
 
+func NewDefaultUpstream() *Upstream {
+	return &Upstream{
+		Type:   LbRoundRobin,
+		Key:    "",
+		Nodes:  make(UpstreamNodes, 0),
+		Scheme: SchemeHTTP,
+		Metadata: Metadata{
+			Desc: "Created by apisix-ingress-controller, DO NOT modify it manually",
+			Labels: map[string]string{
+				"managed-by": "apisix-ingress-controller",
+			},
+		},
+	}
+}
+
 // NewDefaultStreamRoute returns an empty StreamRoute with default values.
 func NewDefaultStreamRoute() *StreamRoute {
 	return &StreamRoute{