Support certificate content in Opensearch Source configuration to sup… #4184
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
…port TLS and truststore on the client. Signed-off-by: Dinu John <[email protected]>
dinujoh
requested review from
chenqi0805,
engechas,
graytaylor0,
kkondaka,
asifsmohammed,
dlvenable and
oeyh
as code owners
dlvenable
previously requested changes
Feb 26, 2024
| @Test | ||
| void provideOpenSearchClient_with_self_signed_certificate() { | ||
| try (MockedStatic<TrustStoreProvider> trustStoreProviderMockedStatic = mockStatic(TrustStoreProvider.class)) { | ||
| final Path path = mock(Path.class); |
There was a problem hiding this comment.
I recommend moving as much out of the try block as possible to make the mocking easier to understand. I believe you can move lines 225-230 out of here.
| @Test | ||
| void provideElasticSearchClient_with_self_signed_certificate() { | ||
| try (MockedStatic<TrustStoreProvider> trustStoreProviderMockedStatic = mockStatic(TrustStoreProvider.class)) { | ||
| final Path path = mock(Path.class); |
There was a problem hiding this comment.
As with the above, please move lines 243-248 to sit before the try block.
| @Test | ||
| void createSdkAsyncHttpClient_with_self_signed_certificate() { | ||
| try (MockedStatic<TrustStoreProvider> trustStoreProviderMockedStatic = mockStatic(TrustStoreProvider.class)) { | ||
| final Path path = mock(Path.class); |
There was a problem hiding this comment.
As with the above, please move lines 261-269 to sit before the try block.
| @@ -14,6 +14,9 @@ public class ConnectionConfiguration { | |||
| @JsonProperty("cert") | |||
| private Path certPath; | |||
|
|
|||
| @JsonProperty("certificate_content") | |||
There was a problem hiding this comment.
Should we have a validation on mutual exclusivity?
@AssertTrue
public boolean certificateFileAndContentAreMutuallyExclusive() {
if(certPath == null && certificateContent == null)
return true;
return certPath != null ^ certificateContent != null;
}
Signed-off-by: Dinu John <[email protected]>
dlvenable
approved these changes
Feb 26, 2024
kkondaka
approved these changes
Feb 26, 2024
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.
Support certificate content in Opensearch Source configuration to support TLS and Truststore for Opensearch client.
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.