fix: same issue exists in grpcroute

Signed-off-by: Kostis Kapelonis <[email protected]>

Author: kostis-codefresh

pkg/plugin/grpcroute.go

@@ -130,6 +130,7 @@ func (r *RpcPlugin) setGRPCHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
 	}
 	grpcHeaderRouteRule := gatewayv1.GRPCRouteRule{
 		Matches: []gatewayv1.GRPCRouteMatch{},
+		Filters: []gatewayv1.GRPCRouteFilter{},
 		BackendRefs: []gatewayv1.GRPCBackendRef{
 			{
 				BackendRef: gatewayv1.BackendRef{
@@ -143,6 +144,13 @@ func (r *RpcPlugin) setGRPCHeaderRoute(rollout *v1alpha1.Rollout, headerRouting
 			},
 		},
 	}
+
+	// Copy filters from original route
+	if grpcRouteRule.Filters != nil {
+		for i := 0; i < len(grpcRouteRule.Filters); i++ {
+			grpcHeaderRouteRule.Filters = append(grpcHeaderRouteRule.Filters, *grpcRouteRule.Filters[i].DeepCopy())
+		}
+	}
 	matchLength := len(grpcRouteRule.Matches)
 	if matchLength == 0 {
 		grpcHeaderRouteRule.Matches = []gatewayv1.GRPCRouteMatch{

pkg/plugin/plugin_test.go

@@ -222,6 +222,113 @@ func TestRunSuccessfully(t *testing.T) {
 		assert.Equal(t, prefixedHeaderValue, rpcPluginImp.UpdatedGRPCRouteMock.Spec.Rules[1].Matches[0].Headers[0].Value)
 		assert.Equal(t, headerValueType, *rpcPluginImp.UpdatedGRPCRouteMock.Spec.Rules[1].Matches[0].Headers[0].Type)
 	})
+	t.Run("SetGRPCHeaderRouteWithFilters", func(t *testing.T) {
+		// Create a GRPCRoute mock with filters
+		grpcRouteWithFilters := mocks.GRPCRouteObj
+		grpcRouteWithFilters.Spec.Rules[0].Filters = []gatewayv1.GRPCRouteFilter{
+			{
+				Type: gatewayv1.GRPCRouteFilterRequestHeaderModifier,
+				RequestHeaderModifier: &gatewayv1.HTTPHeaderFilter{
+					Add: []gatewayv1.HTTPHeader{
+						{
+							Name:  "X-Custom-Header",
+							Value: "custom-value",
+						},
+					},
+				},
+			},
+			{
+				Type: gatewayv1.GRPCRouteFilterResponseHeaderModifier,
+				ResponseHeaderModifier: &gatewayv1.HTTPHeaderFilter{
+					Set: []gatewayv1.HTTPHeader{
+						{
+							Name:  "X-Response-Header",
+							Value: "response-value",
+						},
+					},
+				},
+			},
+		}
+
+		// Update the plugin's GRPCRouteClient with the new mock
+		rpcPluginImp.GRPCRouteClient = gwFake.NewSimpleClientset(&grpcRouteWithFilters).GatewayV1().GRPCRoutes(mocks.RolloutNamespace)
+
+		headerName := "X-Test"
+		headerValue := "test"
+		headerMatch := v1alpha1.StringMatch{
+			Prefix: headerValue,
+		}
+		headerRouting := v1alpha1.SetHeaderRoute{
+			Name: mocks.ManagedRouteName,
+			Match: []v1alpha1.HeaderRoutingMatch{
+				{
+					HeaderName:  headerName,
+					HeaderValue: &headerMatch,
+				},
+			},
+		}
+		rollout := newRollout(mocks.StableServiceName, mocks.CanaryServiceName, &GatewayAPITrafficRouting{
+			Namespace: mocks.RolloutNamespace,
+			GRPCRoute: mocks.GRPCRouteName,
+			ConfigMap: mocks.ConfigMapName,
+		})
+		err := pluginInstance.SetHeaderRoute(rollout, &headerRouting)
+
+		assert.Empty(t, err.Error())
+		// Verify that the new header route rule (index 1) has the same filters as the original route rule (index 0)
+		originalFilters := grpcRouteWithFilters.Spec.Rules[0].Filters
+		newRouteFilters := rpcPluginImp.UpdatedGRPCRouteMock.Spec.Rules[1].Filters
+
+		assert.Equal(t, len(originalFilters), len(newRouteFilters), "New route should have same number of filters as original")
+
+		// Verify first filter (RequestHeaderModifier)
+		assert.Equal(t, originalFilters[0].Type, newRouteFilters[0].Type)
+		assert.Equal(t, originalFilters[0].RequestHeaderModifier.Add[0].Name, newRouteFilters[0].RequestHeaderModifier.Add[0].Name)
+		assert.Equal(t, originalFilters[0].RequestHeaderModifier.Add[0].Value, newRouteFilters[0].RequestHeaderModifier.Add[0].Value)
+
+		// Verify second filter (ResponseHeaderModifier)
+		assert.Equal(t, originalFilters[1].Type, newRouteFilters[1].Type)
+		assert.Equal(t, originalFilters[1].ResponseHeaderModifier.Set[0].Name, newRouteFilters[1].ResponseHeaderModifier.Set[0].Name)
+		assert.Equal(t, originalFilters[1].ResponseHeaderModifier.Set[0].Value, newRouteFilters[1].ResponseHeaderModifier.Set[0].Value)
+	})
+	t.Run("SetGRPCHeaderRouteWithoutFilters", func(t *testing.T) {
+		// Create a GRPCRoute mock without filters (using the original mock which has no filters)
+		grpcRouteWithoutFilters := mocks.GRPCRouteObj
+		grpcRouteWithoutFilters.Spec.Rules[0].Filters = nil // Explicitly set to nil
+
+		// Update the plugin's GRPCRouteClient with the mock without filters
+		rpcPluginImp.GRPCRouteClient = gwFake.NewSimpleClientset(&grpcRouteWithoutFilters).GatewayV1().GRPCRoutes(mocks.RolloutNamespace)
+
+		headerName := "X-Test"
+		headerValue := "test"
+		headerMatch := v1alpha1.StringMatch{
+			Prefix: headerValue,
+		}
+		headerRouting := v1alpha1.SetHeaderRoute{
+			Name: mocks.ManagedRouteName,
+			Match: []v1alpha1.HeaderRoutingMatch{
+				{
+					HeaderName:  headerName,
+					HeaderValue: &headerMatch,
+				},
+			},
+		}
+		rollout := newRollout(mocks.StableServiceName, mocks.CanaryServiceName, &GatewayAPITrafficRouting{
+			Namespace: mocks.RolloutNamespace,
+			GRPCRoute: mocks.GRPCRouteName,
+			ConfigMap: mocks.ConfigMapName,
+		})
+		err := pluginInstance.SetHeaderRoute(rollout, &headerRouting)
+
+		assert.Empty(t, err.Error())
+		// Verify that the new header route rule (index 1) has no filters, same as the original route rule (index 0)
+		originalFilters := grpcRouteWithoutFilters.Spec.Rules[0].Filters
+		newRouteFilters := rpcPluginImp.UpdatedGRPCRouteMock.Spec.Rules[1].Filters
+
+		assert.Nil(t, originalFilters, "Original route should have no filters")
+		assert.Equal(t, len(originalFilters), len(newRouteFilters), "New route should have same number of filters as original (none)")
+		assert.Empty(t, newRouteFilters, "New route should have no filters when original has none")
+	})
 	t.Run("SetHTTPHeaderRouteWithFilters", func(t *testing.T) {
 		// Create an HTTPRoute mock with filters
 		httpRouteWithFilters := mocks.HTTPRouteObj