Skip to content
Merged
Changes from all commits
Commits
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
59 changes: 59 additions & 0 deletions rls/src/test/java/io/grpc/rls/RlsProtoConvertersTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,65 @@ public void convert_jsonRlsConfig_doNotClampMaxAgeIfStaleAgeIsSet() throws IOExc
assertThat(converted).isEqualTo(expectedConfig);
}

@Test
public void convert_jsonRlsConfig_clampMaxAgeIfStaleAgeMissing() throws IOException {
String jsonStr = "{\n"
+ " \"grpcKeybuilders\": [\n"
+ " {\n"
+ " \"names\": [\n"
+ " {\n"
+ " \"service\": \"service1\",\n"
+ " \"method\": \"create\"\n"
+ " }\n"
+ " ],\n"
+ " \"headers\": [\n"
+ " {\n"
+ " \"key\": \"user\","
+ " \"names\": [\"User\", \"Parent\"],\n"
+ " \"optional\": true\n"
+ " },\n"
+ " {\n"
+ " \"key\": \"id\","
+ " \"names\": [\"X-Google-Id\"],\n"
+ " \"optional\": true\n"
+ " }\n"
+ " ]\n"
+ " }\n"
+ " ],\n"
+ " \"lookupService\": \"service1\",\n"
+ " \"lookupServiceTimeout\": \"2s\",\n"
+ " \"maxAge\": \"350s\",\n" // Exceeds 5m limit
+ " \"validTargets\": [\"a valid target\"],"
+ " \"cacheSizeBytes\": \"1000\",\n"
+ " \"defaultTarget\": \"us_east_1.cloudbigtable.googleapis.com\"\n"
+ "}";

RouteLookupConfig expectedConfig =
RouteLookupConfig.builder()
.grpcKeybuilders(ImmutableList.of(
GrpcKeyBuilder.create(
ImmutableList.of(Name.create("service1", "create")),
ImmutableList.of(
NameMatcher.create("user", ImmutableList.of("User", "Parent")),
NameMatcher.create("id", ImmutableList.of("X-Google-Id"))),
ExtraKeys.DEFAULT,
ImmutableMap.<String, String>of())))
.lookupService("service1")
.lookupServiceTimeoutInNanos(TimeUnit.SECONDS.toNanos(2))
// Should be clamped to 300s (5m) because staleAge is missing
.maxAgeInNanos(TimeUnit.MINUTES.toNanos(5))
.staleAgeInNanos(TimeUnit.MINUTES.toNanos(5))
.cacheSizeBytes(1000)
.defaultTarget("us_east_1.cloudbigtable.googleapis.com")
.build();

RouteLookupConfigConverter converter = new RouteLookupConfigConverter();
@SuppressWarnings("unchecked")
Map<String, ?> parsedJson = (Map<String, ?>) JsonParser.parse(jsonStr);
RouteLookupConfig converted = converter.convert(parsedJson);
assertThat(converted).isEqualTo(expectedConfig);
}

@Test
public void convert_jsonRlsConfig_keyBuilderWithoutName() throws IOException {
String jsonStr = "{\n"
Expand Down