Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions internal/controller/state/graph/httproute.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ func processHTTPRouteRule(

// rule.BackendRefs are validated separately because of their special requirements
for _, b := range specRule.BackendRefs {
var interfaceFilters []interface{}
var interfaceFilters []any
if len(b.Filters) > 0 {
interfaceFilters = make([]interface{}, 0, len(b.Filters))
for i, v := range b.Filters {
interfaceFilters[i] = v
interfaceFilters = make([]any, 0, len(b.Filters))
for _, filter := range b.Filters {
interfaceFilters = append(interfaceFilters, filter)
}
}
rbr := RouteBackendRef{
Expand All @@ -211,7 +211,7 @@ func processHTTPRouteRule(
BackendRef: v1.BackendRef{
BackendObjectReference: filter.RequestMirror.BackendRef,
},
MirrorBackendIdx: helpers.GetPointer[int](i),
MirrorBackendIdx: helpers.GetPointer(i),
}
backendRefs = append(backendRefs, rbr)
}
Expand Down
65 changes: 47 additions & 18 deletions internal/controller/state/graph/httproute_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,21 @@ func createHTTPRoute(
},
},
},
BackendRefs: []gatewayv1.HTTPBackendRef{
{
BackendRef: gatewayv1.BackendRef{
BackendObjectReference: gatewayv1.BackendObjectReference{
Kind: helpers.GetPointer[gatewayv1.Kind](kinds.Service),
Name: "backend",
},
},
Filters: []gatewayv1.HTTPRouteFilter{
{
Type: gatewayv1.HTTPRouteFilterExtensionRef,
},
},
},
},
})
}

Expand Down Expand Up @@ -88,6 +103,20 @@ func addFilterToPath(hr *gatewayv1.HTTPRoute, path string, filter gatewayv1.HTTP
}
}

var expRouteBackendRef = RouteBackendRef{
BackendRef: gatewayv1.BackendRef{
BackendObjectReference: gatewayv1.BackendObjectReference{
Kind: helpers.GetPointer[gatewayv1.Kind](kinds.Service),
Name: "backend",
},
},
Filters: []any{
gatewayv1.HTTPRouteFilter{
Type: gatewayv1.HTTPRouteFilterExtensionRef,
},
},
}

func TestBuildHTTPRoutes(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -196,7 +225,7 @@ func TestBuildHTTPRoutes(t *testing.T) {
},
},
Matches: hr.Spec.Rules[0].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -394,7 +423,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: []Filter{},
},
Matches: hr.Spec.Rules[0].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
{
ValidMatches: true,
Expand All @@ -403,7 +432,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: convertHTTPRouteFilters(hr.Spec.Rules[1].Filters),
},
Matches: hr.Spec.Rules[1].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -439,7 +468,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Valid: true,
Filters: []Filter{},
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
Matches: hrInvalidMatchesEmptyPathType.Spec.Rules[0].Matches,
},
},
Expand Down Expand Up @@ -485,7 +514,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Valid: true,
Filters: []Filter{},
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
Matches: hrInvalidMatchesEmptyPathValue.Spec.Rules[0].Matches,
},
},
Expand Down Expand Up @@ -552,7 +581,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: []Filter{},
},
Matches: hrInvalidMatches.Spec.Rules[0].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -590,7 +619,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: convertHTTPRouteFilters(hrInvalidFilters.Spec.Rules[0].Filters),
},
Matches: hrInvalidFilters.Spec.Rules[0].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -627,7 +656,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: []Filter{},
},
Matches: hrDroppedInvalidMatches.Spec.Rules[0].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
{
ValidMatches: true,
Expand All @@ -636,7 +665,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: []Filter{},
},
Matches: hrDroppedInvalidMatches.Spec.Rules[1].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -676,7 +705,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: []Filter{},
},
Matches: hrDroppedInvalidMatchesAndInvalidFilters.Spec.Rules[0].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
{
ValidMatches: true,
Expand All @@ -687,7 +716,7 @@ func TestBuildHTTPRoute(t *testing.T) {
hrDroppedInvalidMatchesAndInvalidFilters.Spec.Rules[1].Filters,
),
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
{
ValidMatches: true,
Expand All @@ -696,7 +725,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: []Filter{},
},
Matches: hrDroppedInvalidMatchesAndInvalidFilters.Spec.Rules[2].Matches,
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -734,7 +763,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: convertHTTPRouteFilters(hrDroppedInvalidFilters.Spec.Rules[0].Filters),
Valid: true,
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
{
ValidMatches: true,
Expand All @@ -743,7 +772,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: convertHTTPRouteFilters(hrDroppedInvalidFilters.Spec.Rules[1].Filters),
Valid: false,
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -785,7 +814,7 @@ func TestBuildHTTPRoute(t *testing.T) {
},
Valid: true,
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -823,7 +852,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: convertHTTPRouteFilters(hrInvalidSnippetsFilter.Spec.Rules[0].Filters),
Valid: false,
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -862,7 +891,7 @@ func TestBuildHTTPRoute(t *testing.T) {
Filters: convertHTTPRouteFilters(hrUnresolvableSnippetsFilter.Spec.Rules[0].Filters),
Valid: false,
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down Expand Up @@ -907,7 +936,7 @@ func TestBuildHTTPRoute(t *testing.T) {
),
Valid: false,
},
RouteBackendRefs: []RouteBackendRef{},
RouteBackendRefs: []RouteBackendRef{expRouteBackendRef},
},
},
},
Expand Down
Loading