s2a: Combine MtlsToS2ChannelCredentials and S2AChannelCredentials. #11544
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
rmehta19
changed the title
larry-safran
approved these changes
Sep 26, 2024
| File privateKeyFile = new File(privateKeyPath); | ||
| File certChainFile = new File(certChainPath); | ||
| File trustBundleFile = new File(trustBundlePath); | ||
|
|
There was a problem hiding this comment.
You should verify that the files exist so that you can provide a meaningful error message if they don't.
ejona86
reviewed
Sep 26, 2024
ejona86
approved these changes
Sep 27, 2024
| } | ||
|
|
||
| public ChannelCredentials build() { | ||
| public ChannelCredentials build() throws IOException { | ||
| checkState(!isNullOrEmpty(s2aAddress), "S2A address must not be null or empty."); |
There was a problem hiding this comment.
Both of these are already checked in newBuilder(). They should be verified when being set, not during build(), so even if we add set methods later, we wouldn't want them here.
| String certChainPath = "src/test/resources/client_cert.pem"; | ||
| String trustBundlePath = "src/test/resources/root_cert.pem"; | ||
| File privateKeyFile = new File(privateKeyPath); | ||
| if (!privateKeyFile.exists()) { |
There was a problem hiding this comment.
There's no point to doing this in the test. TlsChannelCredentials will throw if the files don't exist. Ditto in the other test.
ejona86
added
the
kokoro:run
grpc-kokoro
removed
the
kokoro:run
ejona86
added
the
kokoro:run
grpc-kokoro
removed
the
kokoro:run
kannanjgithub
pushed a commit
to kannanjgithub/grpc-java
that referenced
this pull request
Oct 23, 2024
…rpc#11544) * Combine MtlsToS2ChannelCredentials and S2AChannelCredentials. * Check if file exists. * S2AChannelCredentials API requires credentials used for client-s2a channel. * remove MtlsToS2A library in BUILD. * Don't check state twice. * Don't check for file existence in tests.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.