Skip to content

xds: eliminate downstreamTlsContext from XdsServerBuilder - #6901

Merged
sanjaypujare merged 9 commits into
grpc:masterfrom
sanjaypujare:xds-server-test
Apr 14, 2020
Merged

xds: eliminate downstreamTlsContext from XdsServerBuilder#6901
sanjaypujare merged 9 commits into
grpc:masterfrom
sanjaypujare:xds-server-test

Conversation

@sanjaypujare

Copy link
Copy Markdown
Contributor

No description provided.

@sanjaypujare
sanjaypujare requested a review from creamsoup April 5, 2020 18:29
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java
Comment thread xds/src/test/java/io/grpc/xds/internal/sds/SdsProtocolNegotiatorsTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/internal/sds/SdsProtocolNegotiatorsTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated

@creamsoup creamsoup left a comment

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.

most comments in XdsSdsClientServerTest.java is still not resolved.
also, can you consider using rectangular rule? iirc i shared it with you before.

Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
Comment thread xds/src/main/java/io/grpc/xds/XdsClientWrapperForServerSds.java Outdated
Comment thread xds/src/main/java/io/grpc/xds/internal/sds/SdsProtocolNegotiators.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/internal/sds/SdsProtocolNegotiatorsTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
sanjaypujare and others added 3 commits April 9, 2020 09:11
Update xds/src/main/java/io/grpc/xds/XdsClientWrapperForServerSds.java

Co-Authored-By: Jihun Cho <jihuncho@google.com>

Update xds/src/main/java/io/grpc/xds/XdsClientWrapperForServerSds.java

Co-Authored-By: Jihun Cho <jihuncho@google.com>
@sanjaypujare

Copy link
Copy Markdown
Contributor Author

rebased to resolve the merge conflict.

Comment thread xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java Outdated
Comment thread xds/src/test/java/io/grpc/xds/XdsSdsClientServerTest.java Outdated
public void createSslContextProvider_sdsConfigForCertValidationContext_expectException() {
CommonTlsContext commonTlsContext =
CommonTlsContextTestsUtil.buildCommonTlsContextFromSdsConfigForValidationContext(
CommonTlsContextTestsUtil.buildCommonTlsContextFromSdsConfigForValidationContext(

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.

wrong indentation

@creamsoup creamsoup left a comment

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.

few nits, otherwise LGTM in general.

public static final String CA_PEM_FILE = "ca.pem";
/** Bad/untrusted server certs. */
public static final String BAD_SERVER_PEM_FILE = "badserver.pem";

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.

nit: this is little weird. formatter does this because all the instance variables should have empty line. anyways, we can remove this


@Before
public void setUp() throws IOException {
port = findFreePort();

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.

nit: you can directly assign findFreePort() in L61.

@sanjaypujare
sanjaypujare merged commit 2f07c83 into grpc:master Apr 14, 2020
@sanjaypujare
sanjaypujare deleted the xds-server-test branch April 14, 2020 00:37
dfawley pushed a commit to dfawley/grpc-java that referenced this pull request Jan 15, 2021
* xds: eliminate downstreamTlsContext from XdsServerBuilder


Co-authored-by: Jihun Cho <jihuncho@google.com>
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jun 15, 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.

3 participants