Skip to content

Commit

Permalink
internal/sorter: remove xDS v2 sorters (#3128)
Browse files Browse the repository at this point in the history 
Updates #1898.

Signed-off-by: Steve Kriss <krisss@vmware.com>
  • Loading branch information
@skriss
skriss authored Nov 16, 2020
1 parent 35e2013 commit 4f893a6
Showing 1 changed file with 0 additions and 204 deletions.
204 changes: 0 additions & 204 deletions internal/sorter/sorter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,8 @@ import (
"sort"
"strings"

v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
envoy_api_v2_listener "github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"
envoy_api_v2_route "github.com/envoyproxy/go-control-plane/envoy/api/v2/route"
envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
tcp_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2"
envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
tcp "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
Expand Down Expand Up @@ -206,210 +201,11 @@ func (s secretSorter) Len() int { return len(s) }
func (s secretSorter) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s secretSorter) Less(i, j int) bool { return s[i].Name < s[j].Name }

// Sorts the given route configuration values by name.
type routeConfigurationSorterv2 []*v2.RouteConfiguration

func (s routeConfigurationSorterv2) Len() int { return len(s) }
func (s routeConfigurationSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s routeConfigurationSorterv2) Less(i, j int) bool { return s[i].Name < s[j].Name }

// Sorts the given host values by name.
type virtualHostSorterv2 []*envoy_api_v2_route.VirtualHost

func (s virtualHostSorterv2) Len() int { return len(s) }
func (s virtualHostSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s virtualHostSorterv2) Less(i, j int) bool { return s[i].Name < s[j].Name }

// Sorts HeaderMatcher objects, first by the header name,
// then by their matcher conditions (textually).
type headerMatcherSorterv2 []*envoy_api_v2_route.HeaderMatcher

func (s headerMatcherSorterv2) Len() int { return len(s) }
func (s headerMatcherSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s headerMatcherSorterv2) Less(i, j int) bool {
val := strings.Compare(s[i].Name, s[j].Name)
switch val {
case -1:
return true
case 1:
return false
case 0:
return proto.CompactTextString(s[i]) < proto.CompactTextString(s[j])
}

panic("bad comparison")
}

// longestRouteByHeaders compares the HeaderMatcher slices for lhs and rhs and
// returns true if lhs is longer.
func longestRouteByHeadersv2(lhs, rhs *envoy_api_v2_route.Route) bool {
if len(lhs.Match.Headers) == len(rhs.Match.Headers) {
pair := make([]*envoy_api_v2_route.HeaderMatcher, 2)

for i := 0; i < len(lhs.Match.Headers); i++ {
pair[0] = lhs.Match.Headers[i]
pair[1] = rhs.Match.Headers[i]

if headerMatcherSorterv2(pair).Less(0, 1) {
return true
}
}
}

return len(lhs.Match.Headers) > len(rhs.Match.Headers)
}

// Sorts the given Route slice in place. Routes are ordered first by
// longest prefix (or regex), then by the length of the HeaderMatch
// slice (if any). The HeaderMatch slice is also ordered by the matching
// header name.
type routeSorterv2 []*envoy_api_v2_route.Route

func (s routeSorterv2) Len() int { return len(s) }
func (s routeSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s routeSorterv2) Less(i, j int) bool {
switch a := s[i].Match.PathSpecifier.(type) {
case *envoy_api_v2_route.RouteMatch_Prefix:
switch b := s[j].Match.PathSpecifier.(type) {
case *envoy_api_v2_route.RouteMatch_Prefix:
cmp := strings.Compare(a.Prefix, b.Prefix)
switch cmp {
case 1:
// Sort longest prefix first.
return true
case -1:
return false
default:
return longestRouteByHeadersv2(s[i], s[j])
}
}
case *envoy_api_v2_route.RouteMatch_SafeRegex:
switch b := s[j].Match.PathSpecifier.(type) {
case *envoy_api_v2_route.RouteMatch_SafeRegex:
cmp := strings.Compare(a.SafeRegex.Regex, b.SafeRegex.Regex)
switch cmp {
case 1:
// Sort longest regex first.
return true
case -1:
return false
default:
return longestRouteByHeadersv2(s[i], s[j])
}
case *envoy_api_v2_route.RouteMatch_Prefix:
return true
}
}

return false
}

// Sorts clusters by name.
type clusterSorterv2 []*v2.Cluster

func (s clusterSorterv2) Len() int { return len(s) }
func (s clusterSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s clusterSorterv2) Less(i, j int) bool { return s[i].Name < s[j].Name }

// Sorts cluster load assignments by name.
type clusterLoadAssignmentSorterv2 []*v2.ClusterLoadAssignment

func (s clusterLoadAssignmentSorterv2) Len() int { return len(s) }
func (s clusterLoadAssignmentSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s clusterLoadAssignmentSorterv2) Less(i, j int) bool {
return s[i].ClusterName < s[j].ClusterName
}

// Sorts the weighted clusters by name, then by weight.
type httpWeightedClusterSorterv2 []*envoy_api_v2_route.WeightedCluster_ClusterWeight

func (s httpWeightedClusterSorterv2) Len() int { return len(s) }
func (s httpWeightedClusterSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s httpWeightedClusterSorterv2) Less(i, j int) bool {
if s[i].Name == s[j].Name {
return s[i].Weight.Value < s[j].Weight.Value
}

return s[i].Name < s[j].Name
}

// Sorts the weighted clusters by name, then by weight.
type tcpWeightedClusterSorterv2 []*tcp_v2.TcpProxy_WeightedCluster_ClusterWeight

func (s tcpWeightedClusterSorterv2) Len() int { return len(s) }
func (s tcpWeightedClusterSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s tcpWeightedClusterSorterv2) Less(i, j int) bool {
if s[i].Name == s[j].Name {
return s[i].Weight < s[j].Weight
}

return s[i].Name < s[j].Name
}

// Listeners sorts the listeners by name.
type listenerSorterv2 []*v2.Listener

func (s listenerSorterv2) Len() int { return len(s) }
func (s listenerSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s listenerSorterv2) Less(i, j int) bool { return s[i].Name < s[j].Name }

// FilterChains sorts the filter chains by the first server name in the chain match.
type filterChainSorterv2 []*envoy_api_v2_listener.FilterChain

func (s filterChainSorterv2) Len() int { return len(s) }
func (s filterChainSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s filterChainSorterv2) Less(i, j int) bool {

// If i's ServerNames aren't defined, then it should not swap
if len(s[i].FilterChainMatch.ServerNames) == 0 {
return false
}

// If j's ServerNames aren't defined, then it should not swap
if len(s[j].FilterChainMatch.ServerNames) == 0 {
return true
}

// The ServerNames field will only ever have a single entry
// in our FilterChain config, so it's okay to only sort
// on the first slice entry.
return s[i].FilterChainMatch.ServerNames[0] < s[j].FilterChainMatch.ServerNames[0]
}

// Sorts the secret values by name.
type secretSorterv2 []*envoy_api_v2_auth.Secret

func (s secretSorterv2) Len() int { return len(s) }
func (s secretSorterv2) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
func (s secretSorterv2) Less(i, j int) bool { return s[i].Name < s[j].Name }

// For returns a sort.Interface object that can be used to sort the
// given value. It returns nil if there is no sorter for the type of
// value.
func For(v interface{}) sort.Interface {
switch v := v.(type) {
case []*envoy_api_v2_auth.Secret:
return secretSorterv2(v)
case []*v2.RouteConfiguration:
return routeConfigurationSorterv2(v)
case []*envoy_api_v2_route.VirtualHost:
return virtualHostSorterv2(v)
case []*envoy_api_v2_route.Route:
return routeSorterv2(v)
case []*envoy_api_v2_route.HeaderMatcher:
return headerMatcherSorterv2(v)
case []*v2.Cluster:
return clusterSorterv2(v)
case []*v2.ClusterLoadAssignment:
return clusterLoadAssignmentSorterv2(v)
case []*envoy_api_v2_route.WeightedCluster_ClusterWeight:
return httpWeightedClusterSorterv2(v)
case []*tcp_v2.TcpProxy_WeightedCluster_ClusterWeight:
return tcpWeightedClusterSorterv2(v)
case []*v2.Listener:
return listenerSorterv2(v)
case []*envoy_api_v2_listener.FilterChain:
return filterChainSorterv2(v)
case []*envoy_tls_v3.Secret:
return secretSorter(v)
case []*envoy_route_v3.RouteConfiguration:
Expand Down

0 comments on commit 4f893a6

Please sign in to comment.