xds/test: delete use of removed types (#4784)

menghanl · web-flow · commit 5417cf809116 · 2021-09-20T13:27:27.000-07:00
They were deprecated, and removed later.
diff --git a/internal/xds/matcher/string_matcher_test.go b/internal/xds/matcher/string_matcher_test.go
@@ -67,13 +67,6 @@ func TestStringMatcherFromProto(t *testing.T) {
 			},
 			wantErr: true,
 		},
-		{
-			desc: "invalid deprecated regex",
-			inputProto: &v3matcherpb.StringMatcher{
-				MatchPattern: &v3matcherpb.StringMatcher_HiddenEnvoyDeprecatedRegex{},
-			},
-			wantErr: true,
-		},
 		{
 			desc: "happy case exact",
 			inputProto: &v3matcherpb.StringMatcher{
diff --git a/xds/internal/xdsclient/rds_test.go b/xds/internal/xdsclient/rds_test.go
@@ -1146,7 +1146,7 @@ func (s) TestRoutesProtoToSlice(t *testing.T) {
 						Headers: []*v3routepb.HeaderMatcher{
 							{
 								Name:                 "th",
-								HeaderMatchSpecifier: &v3routepb.HeaderMatcher_HiddenEnvoyDeprecatedRegexMatch{},
+								HeaderMatchSpecifier: &v3routepb.HeaderMatcher_StringMatch{},
 							},
 						},
 					},

Original file line number	Diff line number	Diff line change
`@@ -1146,7 +1146,7 @@ func (s) TestRoutesProtoToSlice(t *testing.T) {`
`1146`	`1146`	`Headers: []*v3routepb.HeaderMatcher{`
`1147`	`1147`	`{`
`1148`	`1148`	`Name: "th",`
`1149`		`- HeaderMatchSpecifier: &v3routepb.HeaderMatcher_HiddenEnvoyDeprecatedRegexMatch{},`
	`1149`	`+ HeaderMatchSpecifier: &v3routepb.HeaderMatcher_StringMatch{},`
`1150`	`1150`	`},`
`1151`	`1151`	`},`
`1152`	`1152`	`},`