Support Kafka SASL_SSL/SSL security protocol for self signed certifice

- Renamed the field names for certificate, truststore and password. - Removed redundant information from build.gradle Signed-off-by: Dinu John <[email protected]>
dinujoh · Feb 23, 2024 · 72b0164 · 72b0164
1 parent 23d0476
commit 72b0164
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 23 deletions.
diff --git a/data-prepper-plugins/http-common/build.gradle b/data-prepper-plugins/http-common/build.gradle
@@ -1,25 +1,12 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
 plugins {
     id 'java'
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     implementation 'org.apache.httpcomponents:httpcore:4.4.16'
     testImplementation testLibs.bundles.junit
 }
 
-test {
-    useJUnitPlatform()
-}
-
 jacocoTestCoverageVerification {
     dependsOn jacocoTestReport
     violationRules {

diff --git a/...rc/main/java/org/opensearch/dataprepper/plugins/kafka/configuration/EncryptionConfig.java b/...rc/main/java/org/opensearch/dataprepper/plugins/kafka/configuration/EncryptionConfig.java
@@ -11,13 +11,13 @@ public class EncryptionConfig {
     @JsonProperty("type")
     private EncryptionType type = EncryptionType.SSL;
 
-    @JsonProperty("certificateContent")
+    @JsonProperty("certificate_content")
     private String certificateContent;
 
-    @JsonProperty("trustStoreFilePath")
+    @JsonProperty("trust_store_file_path")
     private String trustStoreFilePath;
 
-    @JsonProperty("trustStorePassword")
+    @JsonProperty("trust_store_password")
     private String trustStorePassword;
 
     @JsonProperty("insecure")

diff --git a/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-auth-insecure.yaml b/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-auth-insecure.yaml
@@ -5,7 +5,7 @@ log-pipeline :
           - "localhost:9092"
         encryption:
           type: "NONE"
-          certificateContent: "CERTIFICATE_DATA"
+          certificate_content: "CERTIFICATE_DATA"
           insecure: "true"
         authentication:
           sasl:

diff --git a/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-no-auth-ssl-none.yaml b/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-no-auth-ssl-none.yaml
@@ -5,7 +5,7 @@ log-pipeline :
           - "localhost:9092"
         encryption:
           type: "NONE"
-          certificateContent: "CERTIFICATE_DATA"
+          certificate_content: "CERTIFICATE_DATA"
         topics:
         - name: "quickstart-events"
           group_id: "groupdID1"

diff --git a/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-no-auth-ssl.yaml b/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-no-auth-ssl.yaml
@@ -5,7 +5,7 @@ log-pipeline :
           - "localhost:9092"
         encryption:
           type: "SSL"
-          certificateContent: "CERTIFICATE_DATA"
+          certificate_content: "CERTIFICATE_DATA"
         topics:
         - name: "quickstart-events"
           group_id: "groupdID1"

diff --git a/...plugins/kafka-plugins/src/test/resources/kafka-pipeline-sasl-ssl-certificate-content.yaml b/...plugins/kafka-plugins/src/test/resources/kafka-pipeline-sasl-ssl-certificate-content.yaml
@@ -5,7 +5,7 @@ log-pipeline :
           - "localhost:9092"
         encryption:
           type: "SSL"
-          certificateContent: "CERTIFICATE_DATA"
+          certificate_content: "CERTIFICATE_DATA"
         authentication:
           sasl:
             plaintext:

diff --git a/...-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-sasl-ssl-truststore.yaml b/...-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-sasl-ssl-truststore.yaml
@@ -5,8 +5,8 @@ log-pipeline :
           - "localhost:9092"
         encryption:
           type: "SSL"
-          trustStoreFilePath: "some-file-path"
-          trustStorePassword: "some-password"
+          trust_store_file_path: "some-file-path"
+          trust_store_password: "some-password"
         authentication:
           sasl:
             plaintext:

diff --git a/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-sasl-ssl.yaml b/data-prepper-plugins/kafka-plugins/src/test/resources/kafka-pipeline-sasl-ssl.yaml
@@ -5,7 +5,7 @@ log-pipeline :
           - "localhost:9092"
         encryption:
           type: "SSL"
-          certificateContent: "CERTIFICATE_DATA"
+          certificate_content: "CERTIFICATE_DATA"
         authentication:
           sasl:
             plaintext: