Skip to content

xds: use the correct resource id template as per xDS server gRFC#7978

Merged
sanjaypujare merged 2 commits intogrpc:masterfrom
sanjaypujare:grpc-server-resource-change
Mar 17, 2021
Merged

xds: use the correct resource id template as per xDS server gRFC#7978
sanjaypujare merged 2 commits intogrpc:masterfrom
sanjaypujare:grpc-server-resource-change

Conversation

@sanjaypujare
Copy link
Copy Markdown
Contributor

@sanjaypujare sanjaypujare requested a review from voidzcy March 17, 2021 00:19
}

@Test
public void xdsClientStart_multipleReplacements() {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any value of such a test, it's majorly testing the functionality of String.replaceAll(...)...

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test verifies the contract and is useful and is not there to test functionality of replaceAll. I want the test to show breakage when implementation changes.

}
}
String grpcServerResourceId = JsonUtil.getString(rawData, "grpc_server_resource_name_id");
String grpcServerResourceId =
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should also change the property name in BoootstrapInfo and everywhere else.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The names are really internal names between the Bootstrapper and the consumer (XdsClientWrapperForServerXds) so not strictly an API exposed to outside. But I will change it

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, what name will work for you? Is serverListenerResourceNameTemplate okay?

@sanjaypujare sanjaypujare merged commit 69587c5 into grpc:master Mar 17, 2021
@sanjaypujare sanjaypujare deleted the grpc-server-resource-change branch March 17, 2021 15:23
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants