Skip to content

xds: fix wrong number type for generated raw config #7880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2021
Merged

xds: fix wrong number type for generated raw config #7880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions xds/src/main/java/io/grpc/xds/XdsNameResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,10 @@ public void onError(Status error) {
rawHeaderMatcherBuilder.put("regexMatch", regexMatch.pattern());
}
if (rangeMatch != null) {
rawHeaderMatcherBuilder
.put(
"rangeMatch",
ImmutableMap.of("start", rangeMatch.getStart(), "end", rangeMatch.getEnd()));
rawHeaderMatcherBuilder.put(
"rangeMatch",
ImmutableMap.of("start", Long.valueOf(rangeMatch.getStart()).doubleValue(),
"end", Long.valueOf(rangeMatch.getEnd()).doubleValue()));
}
if (presentMatch != null) {
rawHeaderMatcherBuilder.put("presentMatch", presentMatch);
Expand Down
3 changes: 2 additions & 1 deletion xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ public void convertToRawRoute() throws IOException {
Map<String, ?> rawRoute3 = XdsNameResolver.convertToRawRoute(routeMatch3, "action_foo");
Map<String, ?> header =
(Map<String, ?>) Iterables.getOnlyElement((List<?>) rawRoute3.get("headers"));
assertThat((Map<String, ?>) header.get("rangeMatch")).containsExactly("start", 0L, "end", 10L);
assertThat((Map<String, ?>) header.get("rangeMatch")).containsExactly(
"start", (double) 0L, "end", (double) 10L);

RouteMatch routeMatch4 =
new RouteMatch(
Expand Down