Skip to content
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

Jump to bottom

xds: fix Node.toBuilder() bug #7964

Merged
merged 1 commit into from Mar 12, 2021
Merged

xds: fix Node.toBuilder() bug #7964

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions xds/src/main/java/io/grpc/xds/EnvoyProtoData.java
View file
Open in desktop
Expand Up @@ -204,14 +204,16 @@ static Builder newBuilder() {
}

Builder toBuilder() {
Builder builder = new Builder().setId(id).setCluster(cluster);
if (metadata != null) {
builder.setMetadata(metadata);
}
if (locality != null) {
builder.setLocality(locality);
}
Builder builder = new Builder();
builder.id = id;
builder.cluster = cluster;
builder.metadata = metadata;
builder.locality = locality;
builder.buildVersion = buildVersion;
builder.listeningAddresses.addAll(listeningAddresses);
builder.userAgentName = userAgentName;
builder.userAgentVersion = userAgentVersion;
builder.clientFeatures.addAll(clientFeatures);
return builder;
}

Expand Down
18 changes: 18 additions & 0 deletions xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java
View file
Open in desktop
Expand Up @@ -122,4 +122,22 @@ public void convertNode() {
.build();
assertThat(node.toEnvoyProtoNodeV2()).isEqualTo(nodeProtoV2);
}

@Test
public void nodeToBuilderPropagatesAllAttributes() {
Node node = Node.newBuilder()
.setId("id")
.setCluster("cluster")
.setMetadata(ImmutableMap.of("key1", "value1", "key2", "value2"))
.setLocality(Locality.create("region", "zone", "subzone"))
.setBuildVersion("v1")
.setUserAgentName("grpc-java")
.setUserAgentVersion("v1.0.9")
.addListeningAddresses(new Address("localhost", 8080))
.addListeningAddresses(new Address("localhost", 8081))
.addClientFeatures("feature1")
.addClientFeatures("feature2")
.build();
assertThat(node.toBuilder().build()).isEqualTo(node);
}
}