feat: generate UUID for each filter instance (#335)

Signed-off-by: Lin Yang <[email protected]>
flomesh-io · Sep 11, 2024 · f27a3c8 · f27a3c8
1 parent d0dac23
commit f27a3c8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/pkg/gateway/fgw/config.go b/pkg/gateway/fgw/config.go
@@ -98,6 +98,7 @@ type Listener struct {
 type ListenerFilter struct {
 	Type            string            `json:"type"`
 	ExtensionConfig map[string]string `json:"extensionConfig,omitempty"`
+	Key             string            `json:"key,omitempty"`
 }
 
 type GatewayTLSConfig struct {
@@ -229,6 +230,7 @@ type HTTPRouteFilter struct {
 	RequestRedirect        *gwv1.HTTPRequestRedirectFilter `json:"requestRedirect,omitempty"`
 	URLRewrite             *gwv1.HTTPURLRewriteFilter      `json:"urlRewrite,omitempty"`
 	ExtensionConfig        map[string]string               `json:"extensionConfig,omitempty"`
+	Key                    string                          `json:"key,omitempty"`
 }
 
 // ---
@@ -262,6 +264,7 @@ type GRPCRouteFilter struct {
 	ResponseHeaderModifier *gwv1.HTTPHeaderFilter   `json:"responseHeaderModifier,omitempty"`
 	RequestMirror          *HTTPRequestMirrorFilter `json:"requestMirror,omitempty"`
 	ExtensionConfig        map[string]string        `json:"extensionConfig,omitempty"`
+	Key                    string                   `json:"key,omitempty"`
 }
 
 // ---

diff --git a/pkg/gateway/processor/v2/gateway.go b/pkg/gateway/processor/v2/gateway.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/google/uuid"
+
 	"k8s.io/utils/ptr"
 
 	"k8s.io/apimachinery/pkg/fields"
@@ -171,6 +173,7 @@ func (c *ConfigGenerator) processListenerFilters(l gwtypes.Listener, v2l *fgwv2.
 		v2l.Filters = append(v2l.Filters, fgwv2.ListenerFilter{
 			Type:            filterType,
 			ExtensionConfig: f.Spec.Config,
+			Key:             uuid.NewString(),
 		})
 
 		if c.filters[*protocol] == nil {

diff --git a/pkg/gateway/processor/v2/grpcroute.go b/pkg/gateway/processor/v2/grpcroute.go
@@ -3,6 +3,8 @@ package v2
 import (
 	"context"
 
+	"github.com/google/uuid"
+
 	extv1alpha1 "github.com/flomesh-io/fsm/pkg/apis/extension/v1alpha1"
 
 	fgwv2 "github.com/flomesh-io/fsm/pkg/gateway/fgw"
@@ -136,6 +138,7 @@ func (c *ConfigGenerator) toV2GRPCRouteFilters(grpcRoute *gwv1.GRPCRoute, routeF
 					RequestMirror: &fgwv2.HTTPRequestMirrorFilter{
 						BackendRef: fgwv2.NewBackendRefWithWeight(svcPort.String(), 1),
 					},
+					Key: uuid.NewString(),
 				})
 
 				// TODO: process backend level policies here??? TBD
@@ -161,14 +164,15 @@ func (c *ConfigGenerator) toV2GRPCRouteFilters(grpcRoute *gwv1.GRPCRoute, routeF
 			filters = append(filters, fgwv2.GRPCRouteFilter{
 				Type:            gwv1.GRPCRouteFilterType(filterType),
 				ExtensionConfig: filter.Spec.Config,
+				Key:             uuid.NewString(),
 			})
 
 			if c.filters[filterProtocol] == nil {
 				c.filters[filterProtocol] = map[string]string{}
 			}
 			c.filters[filterProtocol][filterType] = filter.Spec.Script
 		default:
-			f2 := fgwv2.GRPCRouteFilter{}
+			f2 := fgwv2.GRPCRouteFilter{Key: uuid.NewString()}
 			if err := gwutils.DeepCopy(&f2, &f); err != nil {
 				continue
 			}

diff --git a/pkg/gateway/processor/v2/httproute.go b/pkg/gateway/processor/v2/httproute.go
@@ -3,6 +3,8 @@ package v2
 import (
 	"context"
 
+	"github.com/google/uuid"
+
 	extv1alpha1 "github.com/flomesh-io/fsm/pkg/apis/extension/v1alpha1"
 
 	fgwv2 "github.com/flomesh-io/fsm/pkg/gateway/fgw"
@@ -136,6 +138,7 @@ func (c *ConfigGenerator) toV2HTTPRouteFilters(httpRoute *gwv1.HTTPRoute, routeF
 					RequestMirror: &fgwv2.HTTPRequestMirrorFilter{
 						BackendRef: fgwv2.NewBackendRefWithWeight(svcPort.String(), 1),
 					},
+					Key: uuid.NewString(),
 				})
 
 				// TODO: process backend level policies here??? TBD
@@ -160,14 +163,15 @@ func (c *ConfigGenerator) toV2HTTPRouteFilters(httpRoute *gwv1.HTTPRoute, routeF
 			filters = append(filters, fgwv2.HTTPRouteFilter{
 				Type:            gwv1.HTTPRouteFilterType(filterType),
 				ExtensionConfig: filter.Spec.Config,
+				Key:             uuid.NewString(),
 			})
 
 			if c.filters[filterProtocol] == nil {
 				c.filters[filterProtocol] = map[string]string{}
 			}
 			c.filters[filterProtocol][filterType] = filter.Spec.Script
 		default:
-			f2 := fgwv2.HTTPRouteFilter{}
+			f2 := fgwv2.HTTPRouteFilter{Key: uuid.NewString()}
 			if err := gwutils.DeepCopy(f2, f); err != nil {
 				continue
 			}