code style fixes.

Signed-off-by: Stéphane Cottin <stephane.cottin@vixns.com>
envoyproxy · Apr 4, 2024 · 2d4a4da · 2d4a4da
1 parent 1b015df
commit 2d4a4da
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/internal/gatewayapi/sort.go b/internal/gatewayapi/sort.go
@@ -21,15 +21,11 @@ func (x XdsIRRoutes) Less(i, j int) bool {
 	// Exact > RegularExpression > PathPrefix
 	if x[i].PathMatch != nil && x[i].PathMatch.Exact != nil {
 		if x[j].PathMatch != nil {
-			if x[j].PathMatch.Prefix != nil || x[j].PathMatch.SafeRegex != nil {
+			if x[j].PathMatch.SafeRegex != nil {
 				return false
 			}
-		}
-	}
-	if x[i].PathMatch != nil && x[i].PathMatch.Prefix != nil {
-		if x[j].PathMatch != nil {
-			if x[j].PathMatch.Exact != nil || x[j].PathMatch.SafeRegex != nil {
-				return true
+			if x[j].PathMatch.Prefix != nil {
+				return false
 			}
 		}
 	}
@@ -43,6 +39,15 @@ func (x XdsIRRoutes) Less(i, j int) bool {
 			}
 		}
 	}
+	if x[i].PathMatch != nil && x[i].PathMatch.Prefix != nil {
+		if x[j].PathMatch != nil {
+			if x[j].PathMatch.Exact != nil {
+				return true
+			}
+			if x[j].PathMatch.SafeRegex != nil {
+				return true
+			}
+	}
 	// Equal case
 
 	// 2. Sort based on characters in a matching path.