From 47804367b63f3c1503ee3974eed79abf00a5ce93 Mon Sep 17 00:00:00 2001
From: Easwar Swaminathan <easwars@google.com>
Date: Fri, 7 May 2021 09:07:44 -0700
Subject: [PATCH] add test, remove json tags

---
 xds/internal/client/client.go   | 20 ++++++------
 xds/internal/client/rds_test.go | 58 +++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/xds/internal/client/client.go b/xds/internal/client/client.go
index 7e86f396a3a4..603632801b04 100644
--- a/xds/internal/client/client.go
+++ b/xds/internal/client/client.go
@@ -307,20 +307,20 @@ type WeightedCluster struct {
 
 // HeaderMatcher represents header matchers.
 type HeaderMatcher struct {
-	Name         string         `json:"name"`
-	InvertMatch  *bool          `json:"invertMatch,omitempty"`
-	ExactMatch   *string        `json:"exactMatch,omitempty"`
-	RegexMatch   *regexp.Regexp `json:"regexMatch,omitempty"`
-	PrefixMatch  *string        `json:"prefixMatch,omitempty"`
-	SuffixMatch  *string        `json:"suffixMatch,omitempty"`
-	RangeMatch   *Int64Range    `json:"rangeMatch,omitempty"`
-	PresentMatch *bool          `json:"presentMatch,omitempty"`
+	Name         string
+	InvertMatch  *bool
+	ExactMatch   *string
+	RegexMatch   *regexp.Regexp
+	PrefixMatch  *string
+	SuffixMatch  *string
+	RangeMatch   *Int64Range
+	PresentMatch *bool
 }
 
 // Int64Range is a range for header range match.
 type Int64Range struct {
-	Start int64 `json:"start"`
-	End   int64 `json:"end"`
+	Start int64
+	End   int64
 }
 
 // SecurityConfig contains the security configuration received as part of the
diff --git a/xds/internal/client/rds_test.go b/xds/internal/client/rds_test.go
index eff7879b20c8..a4aaf03e4ae0 100644
--- a/xds/internal/client/rds_test.go
+++ b/xds/internal/client/rds_test.go
@@ -22,6 +22,7 @@ package client
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 	"time"
 
@@ -916,6 +917,51 @@ func (s) TestRoutesProtoToSlice(t *testing.T) {
 			}},
 			wantErr: false,
 		},
+		{
+			name: "good with regex matchers",
+			routes: []*v3routepb.Route{
+				{
+					Match: &v3routepb.RouteMatch{
+						PathSpecifier: &v3routepb.RouteMatch_SafeRegex{SafeRegex: &v3matcherpb.RegexMatcher{Regex: "/a/"}},
+						Headers: []*v3routepb.HeaderMatcher{
+							{
+								Name:                 "th",
+								HeaderMatchSpecifier: &v3routepb.HeaderMatcher_SafeRegexMatch{SafeRegexMatch: &v3matcherpb.RegexMatcher{Regex: "tv"}},
+							},
+						},
+						RuntimeFraction: &v3corepb.RuntimeFractionalPercent{
+							DefaultValue: &v3typepb.FractionalPercent{
+								Numerator:   1,
+								Denominator: v3typepb.FractionalPercent_HUNDRED,
+							},
+						},
+					},
+					Action: &v3routepb.Route_Route{
+						Route: &v3routepb.RouteAction{
+							ClusterSpecifier: &v3routepb.RouteAction_WeightedClusters{
+								WeightedClusters: &v3routepb.WeightedCluster{
+									Clusters: []*v3routepb.WeightedCluster_ClusterWeight{
+										{Name: "B", Weight: &wrapperspb.UInt32Value{Value: 60}},
+										{Name: "A", Weight: &wrapperspb.UInt32Value{Value: 40}},
+									},
+									TotalWeight: &wrapperspb.UInt32Value{Value: 100},
+								}}}},
+				},
+			},
+			wantRoutes: []*Route{{
+				Regex: func() *regexp.Regexp { return regexp.MustCompile("/a/") }(),
+				Headers: []*HeaderMatcher{
+					{
+						Name:        "th",
+						InvertMatch: newBoolP(false),
+						RegexMatch:  func() *regexp.Regexp { return regexp.MustCompile("tv") }(),
+					},
+				},
+				Fraction:         newUInt32P(10000),
+				WeightedClusters: map[string]WeightedCluster{"A": {Weight: 40}, "B": {Weight: 60}},
+			}},
+			wantErr: false,
+		},
 		{
 			name: "query is ignored",
 			routes: []*v3routepb.Route{
@@ -1102,7 +1148,7 @@ func (s) TestRoutesProtoToSlice(t *testing.T) {
 	}
 
 	cmpOpts := []cmp.Option{
-		cmp.AllowUnexported(Route{}, HeaderMatcher{}, Int64Range{}),
+		cmp.AllowUnexported(Route{}, HeaderMatcher{}, Int64Range{}, regexp.Regexp{}),
 		cmpopts.EquateEmpty(),
 		cmp.Transformer("FilterConfig", func(fc httpfilter.FilterConfig) string {
 			return fmt.Sprint(fc)
@@ -1113,17 +1159,15 @@ func (s) TestRoutesProtoToSlice(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			oldFI := env.FaultInjectionSupport
 			env.FaultInjectionSupport = !tt.disableFI
+			defer func() { env.FaultInjectionSupport = oldFI }()
 
 			got, err := routesProtoToSlice(tt.routes, nil, false)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("routesProtoToSlice() error = %v, wantErr %v", err, tt.wantErr)
-				return
+				t.Fatalf("routesProtoToSlice() error = %v, wantErr %v", err, tt.wantErr)
 			}
-			if !cmp.Equal(got, tt.wantRoutes, cmpOpts...) {
-				t.Errorf("routesProtoToSlice() got = %v, want %v, diff: %v", got, tt.wantRoutes, cmp.Diff(got, tt.wantRoutes, cmpOpts...))
+			if diff := cmp.Diff(got, tt.wantRoutes, cmpOpts...); diff != "" {
+				t.Fatalf("routesProtoToSlice() returned unexpected diff (-got +want):\n%s", diff)
 			}
-
-			env.FaultInjectionSupport = oldFI
 		})
 	}
 }