Updated Kafka security configuration #2994
Merged
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
added 2 commits
July 7, 2023 05:45
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
kkondaka
requested review from
chenqi0805,
engechas,
graytaylor0,
dinujoh,
cmanning09,
asifsmohammed,
dlvenable and
oeyh
as code owners
hshardeesi
reviewed
Jul 10, 2023
.../src/main/java/org/opensearch/dataprepper/plugins/kafka/configuration/KafkaSourceConfig.java
Outdated
Show resolved
Hide resolved
hshardeesi
reviewed
Jul 10, 2023
| return plainTextAuthConfig; | ||
| @AssertTrue(message = "Only one of SSL or SASL auth config must be specified") | ||
| public boolean hasSaslOrSslConfig() { | ||
| return Stream.of(sslAuthConfig, saslAuthConfig).filter(n -> n!=null).count() == 1; |
There was a problem hiding this comment.
should we have a similar check on sasl_mechanism as well? I guess only one of the mechanisms should be specified.
hshardeesi
reviewed
Jul 10, 2023
...-plugins/src/main/java/org/opensearch/dataprepper/plugins/kafka/configuration/AwsConfig.java
Outdated
Show resolved
Hide resolved
added 2 commits
July 12, 2023 05:13
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com>
hshardeesi
approved these changes
Jul 12, 2023
hshardeesi
approved these changes
Jul 12, 2023
asifsmohammed
approved these changes
Jul 13, 2023
Comment on lines
+239
to
+246
| if (awsIamAuthConfig == AwsIamAuthConfig.ROLE) { | ||
| properties.put("sasl.jaas.config", | ||
| "software.amazon.msk.auth.iam.IAMLoginModule required " + | ||
| "awsRoleArn=\"" + awsConfig.getStsRoleArn()+ | ||
| "\" awsStsRegion=\""+ awsConfig.getRegion()+"\";"); | ||
| } else if (awsIamAuthConfig == AwsIamAuthConfig.DEFAULT) { | ||
| properties.put("sasl.jaas.config", | ||
| "software.amazon.msk.auth.iam.IAMLoginModule required;"); |
There was a problem hiding this comment.
Can you explain what these properties are?
chenqi0805
pushed a commit
that referenced
this pull request
Jul 19, 2023
* Add Kafka Security Configurations Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com> * Modified kafka security config. Added new fields to AwsConfig Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com> * Addressed review comments Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com> * Modified AwsConfig to have msk option that can take multiple options Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com> --------- Signed-off-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com> Co-authored-by: Krishna Kondaka <krishkdk@dev-dsk-krishkdk-2c-bd29c437.us-west-2.amazon.com> Signed-off-by: George Chen <qchea@amazon.com>
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.
Description
Updated Kafka security configuration.
Issues Resolved
[List any issues this PR will resolve]
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.