-
Notifications
You must be signed in to change notification settings - Fork 195
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updated Kafka security configuration #2994
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
34 changes: 34 additions & 0 deletions
34
...rc/main/java/org/opensearch/dataprepper/plugins/kafka/configuration/AwsIamAuthConfig.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package org.opensearch.dataprepper.plugins.kafka.configuration; | ||
|
||
import com.fasterxml.jackson.annotation.JsonCreator; | ||
import java.util.Map; | ||
import java.util.Arrays; | ||
import java.util.stream.Collectors; | ||
|
||
public enum AwsIamAuthConfig { | ||
ROLE("role"), | ||
DEFAULT("default"); | ||
//TODO add "PROFILE" option | ||
|
||
private static final Map<String, AwsIamAuthConfig> OPTIONS_MAP = Arrays.stream(AwsIamAuthConfig.values()) | ||
.collect(Collectors.toMap( | ||
value -> value.option, | ||
value -> value | ||
)); | ||
|
||
private final String option; | ||
|
||
AwsIamAuthConfig(final String option) { | ||
this.option = option; | ||
} | ||
|
||
@JsonCreator | ||
static AwsIamAuthConfig fromOptionValue(final String option) { | ||
return OPTIONS_MAP.get(option.toLowerCase()); | ||
} | ||
} |
34 changes: 34 additions & 0 deletions
34
.../src/main/java/org/opensearch/dataprepper/plugins/kafka/configuration/EncryptionType.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package org.opensearch.dataprepper.plugins.kafka.configuration; | ||
|
||
import com.fasterxml.jackson.annotation.JsonCreator; | ||
|
||
import java.util.Map; | ||
import java.util.Arrays; | ||
import java.util.stream.Collectors; | ||
|
||
public enum EncryptionType { | ||
SSL("ssl"), | ||
PLAINTEXT("plaintext"); | ||
|
||
private static final Map<String, EncryptionType> OPTIONS_MAP = Arrays.stream(EncryptionType.values()) | ||
.collect(Collectors.toMap( | ||
value -> value.type, | ||
value -> value | ||
)); | ||
|
||
private final String type; | ||
|
||
EncryptionType(final String type) { | ||
this.type = type; | ||
} | ||
|
||
@JsonCreator | ||
static EncryptionType fromTypeValue(final String type) { | ||
return OPTIONS_MAP.get(type.toLowerCase()); | ||
} | ||
} |
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
35 changes: 35 additions & 0 deletions
35
.../java/org/opensearch/dataprepper/plugins/kafka/configuration/MskBrokerConnectionType.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* Copyright OpenSearch Contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package org.opensearch.dataprepper.plugins.kafka.configuration; | ||
|
||
import com.fasterxml.jackson.annotation.JsonCreator; | ||
|
||
import java.util.Map; | ||
import java.util.Arrays; | ||
import java.util.stream.Collectors; | ||
|
||
public enum MskBrokerConnectionType { | ||
PUBLIC("public"), | ||
SINGLE_VPC("single_vpc"), | ||
MULTI_VPC("multi_vpc"); | ||
|
||
private static final Map<String, MskBrokerConnectionType> OPTIONS_MAP = Arrays.stream(MskBrokerConnectionType.values()) | ||
.collect(Collectors.toMap( | ||
value -> value.type, | ||
value -> value | ||
)); | ||
|
||
private final String type; | ||
|
||
MskBrokerConnectionType(final String type) { | ||
this.type = type; | ||
} | ||
|
||
@JsonCreator | ||
static MskBrokerConnectionType fromTypeValue(final String type) { | ||
return OPTIONS_MAP.get(type.toLowerCase()); | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we have a similar check on sasl_mechanism as well? I guess only one of the mechanisms should be specified.