Skip to content

Commit

Permalink
More unit test
Browse files Browse the repository at this point in the history 
Signed-off-by: lubronzhan <[email protected]>
  • Loading branch information
@lubronzhan
lubronzhan committed Feb 16, 2024
1 parent 8b9f85b commit c00ad0b
Show file tree
Hide file tree
Showing 2 changed files with 230 additions and 56 deletions.
34 changes: 33 additions & 1 deletion internal/dag/dag_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func TestServiceClusterRebalance(t *testing.T) {
}
}

func TestHasConflictHTTPRoute(t *testing.T) {
func TestHasConflictRouteForVirtualHost(t *testing.T) {
cases := map[string]struct {
vHost VirtualHost
rs []Route
Expand Down Expand Up @@ -329,6 +329,38 @@ func TestHasConflictHTTPRoute(t *testing.T) {
},
expectConflict: true,
},
"2 different routes with same path and header, but different query params, don't expect conflict": {
vHost: VirtualHost{
Routes: map[string]*Route{},
},
rs: []Route{
{
Kind: KindHTTPRoute,
Name: "a",
Namespace: "b",
PathMatchCondition: prefixSegment("/path1"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: ":authority", MatchType: HeaderMatchTypeRegex, Value: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?\\.example\\.com(:[0-9]+)?"},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-1", Value: "value-1", MatchType: QueryParamMatchTypeExact},
},
},
{
Kind: KindHTTPRoute,
Name: "c",
Namespace: "d",
PathMatchCondition: prefixSegment("/path1"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: ":authority", MatchType: HeaderMatchTypeRegex, Value: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?\\.example\\.com(:[0-9]+)?"},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-2different", Value: "value-2different", MatchType: QueryParamMatchTypePrefix},
},
},
},
expectConflict: false,
},
"2 different routes with different path, don't expect conflict": {
vHost: VirtualHost{
Routes: map[string]*Route{},
Expand Down
252 changes: 197 additions & 55 deletions internal/dag/gatewayapi_processor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,96 +1011,238 @@ func TestSortRoutes(t *testing.T) {
}

func TestHasConflictRoute(t *testing.T) {
time1 := time.Date(2021, time.Month(2), 21, 1, 10, 30, 0, time.UTC)
time2 := time.Date(2022, time.Month(2), 21, 1, 10, 30, 0, time.UTC)
time3 := time.Date(2023, time.Month(2), 21, 1, 10, 30, 0, time.UTC)
host1 := "test.projectcontour.io"
host2 := "test1.projectcontour.io"
hosts := sets.New(
host1,
host2,
)
listener := &listenerInfo{
listener: gatewayapi_v1.Listener{
Name: "l1",
AllowedRoutes: &gatewayapi_v1.AllowedRoutes{
Namespaces: &gatewayapi_v1.RouteNamespaces{
From: ptr.To(gatewayapi_v1.NamespacesFromSame),
},
},
},
dagListenerName: "l1",
allowedKinds: []gatewayapi_v1.Kind{KindHTTPRoute},
ready: true,
}
tlsListener := &listenerInfo{
listener: gatewayapi_v1.Listener{
Name: "ltls",
AllowedRoutes: &gatewayapi_v1.AllowedRoutes{
Namespaces: &gatewayapi_v1.RouteNamespaces{
From: ptr.To(gatewayapi_v1.NamespacesFromSame),
},
},
},
allowedKinds: []gatewayapi_v1.Kind{KindHTTPRoute},
ready: true,
dagListenerName: "ltls",
tlsSecret: &Secret{},
}
tests := []struct {
name string
m map[types.NamespacedName]*gatewayapi_v1.HTTPRoute
routes []*Route
expected []*gatewayapi_v1.HTTPRoute
name string
existingRoutes []*Route
routes []*Route
listener *listenerInfo
expectedConflict bool
}{
{
name: "3 httproutes, with different timestamp, earlier one should be first ",
m: map[types.NamespacedName]*gatewayapi_v1.HTTPRoute{
name: "There are 2 existing route, the 3rd route to add doesn't have conflict, listen doesn't have tls, no conflict expected",
existingRoutes: []*Route{
{
Namespace: "ns", Name: "name1",
}: {
ObjectMeta: meta_v1.ObjectMeta{
Namespace: "ns",
Name: "name3",
CreationTimestamp: meta_v1.NewTime(time3),
Name: "route1",
Namespace: "default",
PathMatchCondition: prefixSegment("/path1"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: ":authority", MatchType: HeaderMatchTypeRegex, Value: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?\\.example\\.com(:[0-9]+)?"},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-1", Value: "value-1", MatchType: QueryParamMatchTypeExact},
},
},
{
Namespace: "ns", Name: "name2",
}: {
ObjectMeta: meta_v1.ObjectMeta{
Namespace: "ns",
Name: "name2",
CreationTimestamp: meta_v1.NewTime(time2),
Kind: KindHTTPRoute,
Name: "route2",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "version", Value: "2", MatchType: "exact", Invert: false},
},
},
},
routes: []*Route{
{
Namespace: "ns", Name: "name3",
}: {
ObjectMeta: meta_v1.ObjectMeta{
Namespace: "ns",
Name: "name1",
CreationTimestamp: meta_v1.NewTime(time1),
Kind: KindHTTPRoute,
Name: "route3",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "e-tag", Value: "abc", MatchType: "contains", Invert: true},
},
},
},
expected: []*gatewayapi_v1.HTTPRoute{
listener: listener,
},
{
name: "There are 2 existing route, the 3rd route to add doesn't have conflict, listen has tls, no conflict expected",
existingRoutes: []*Route{
{
ObjectMeta: meta_v1.ObjectMeta{
Namespace: "ns",
Name: "name1",
CreationTimestamp: meta_v1.NewTime(time1),
Name: "route1",
Namespace: "default",
PathMatchCondition: prefixSegment("/path1"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: ":authority", MatchType: HeaderMatchTypeRegex, Value: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?\\.example\\.com(:[0-9]+)?"},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-1", Value: "value-1", MatchType: QueryParamMatchTypeExact},
},
},
{
ObjectMeta: meta_v1.ObjectMeta{
Namespace: "ns",
Name: "name2",
CreationTimestamp: meta_v1.NewTime(time2),
Kind: KindHTTPRoute,
Name: "route2",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "version", Value: "2", MatchType: "exact", Invert: false},
},
},
},
routes: []*Route{
{
ObjectMeta: meta_v1.ObjectMeta{
Namespace: "ns",
Name: "name3",
CreationTimestamp: meta_v1.NewTime(time3),
Kind: KindHTTPRoute,
Name: "route3",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "e-tag", Value: "abc", MatchType: "contains", Invert: true},
},
},
},
listener: tlsListener,
},
{
name: "There are 2 existing route, the 3rd route to add is conflict with 2nd route, listen doesn't have tls, expect conflicts",
existingRoutes: []*Route{
{
Name: "route1",
Namespace: "default",
PathMatchCondition: prefixSegment("/path1"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: ":authority", MatchType: HeaderMatchTypeRegex, Value: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?\\.example\\.com(:[0-9]+)?"},
},
},
{
Kind: KindHTTPRoute,
Name: "route2",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "version", Value: "2", MatchType: "exact", Invert: false},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-1", Value: "value-1", MatchType: QueryParamMatchTypeExact},
},
},
},
routes: []*Route{
{
Kind: KindHTTPRoute,
Name: "route3",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "version", Value: "2", MatchType: "exact", Invert: false},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-1", Value: "value-1", MatchType: QueryParamMatchTypeExact},
},
},
},
listener: listener,
expectedConflict: true,
},
{
name: "There are 1 existing route, the 2nd route to add is conflict with 1st route, listen has tls, expect conflicts",
existingRoutes: []*Route{
{
Kind: KindHTTPRoute,
Name: "route1",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "version", Value: "2", MatchType: "exact", Invert: false},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-1", Value: "value-1", MatchType: QueryParamMatchTypeExact},
},
},
},
routes: []*Route{
{
Kind: KindHTTPRoute,
Name: "route2",
Namespace: "default",
PathMatchCondition: prefixSegment("/path2"),
HeaderMatchConditions: []HeaderMatchCondition{
{Name: "version", Value: "2", MatchType: "exact", Invert: false},
},
QueryParamMatchConditions: []QueryParamMatchCondition{
{Name: "param-1", Value: "value-1", MatchType: QueryParamMatchTypeExact},
},
},
},
listener: tlsListener,
expectedConflict: true,
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
processor := &GatewayAPIProcessor{
FieldLogger: fixture.NewTestLogger(t),
}
listener := &listenerInfo{
listener: gatewayapi_v1.Listener{
Name: "http-1",
AllowedRoutes: &gatewayapi_v1.AllowedRoutes{
Namespaces: &gatewayapi_v1.RouteNamespaces{
From: ptr.To(gatewayapi_v1.NamespacesFromSame),
dag: &DAG{
Listeners: map[string]*Listener{
tlsListener.dagListenerName: {
svhostsByName: map[string]*SecureVirtualHost{
host1: {
VirtualHost: VirtualHost{
Name: host1,
Routes: make(map[string]*Route),
},
},
},
},
listener.dagListenerName: {
vhostsByName: map[string]*VirtualHost{
host2: {
Routes: make(map[string]*Route),
},
},
},
},
},
allowedKinds: []gatewayapi_v1.Kind{"HTTPRoute"},
ready: true,
}
hosts := sets.New(
"test.projectcontour.io",
"test1.projectcontour.io",
)
for host := range hosts {
for _, route := range tc.existingRoutes {
switch {
case tc.listener.tlsSecret != nil:
svhost := processor.dag.EnsureSecureVirtualHost(tc.listener.dagListenerName, host)
svhost.Secret = listener.tlsSecret
svhost.AddRoute(route)
default:
vhost := processor.dag.EnsureVirtualHost(tc.listener.dagListenerName, host)
vhost.AddRoute(route)
}
}
}

res := processor.hasConflictRoute(listener, hosts, tc.routes)
assert.Equal(t, tc.expected, res)
res := processor.hasConflictRoute(tc.listener, hosts, tc.routes)
assert.Equal(t, tc.expectedConflict, res)
})
}
}

0 comments on commit c00ad0b

Please sign in to comment.