From 6a39bafe137855bd867871d6c588b5ac989ebf4c Mon Sep 17 00:00:00 2001
From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Thu, 20 Apr 2023 19:47:17 +0530
Subject: [PATCH] Include env vars as defaults

strimzikafka section updated in mountpoint-registrar.properties

Issue-ID: SDNC-1796
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I2880442966291dd00293bf92e31fecd15d554e4c
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
---
 sdnr/wt/mountpoint-registrar/feature/pom.xml                | 11 ++++++++++-
 sdnr/wt/mountpoint-registrar/provider/pom.xml               |  4 +++-
 .../wt/mountpointregistrar/config/StrimziKafkaConfig.java   | 13 +++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sdnr/wt/mountpoint-registrar/feature/pom.xml b/sdnr/wt/mountpoint-registrar/feature/pom.xml
index e5ab684c4..81c0ac4c8 100644
--- a/sdnr/wt/mountpoint-registrar/feature/pom.xml
+++ b/sdnr/wt/mountpoint-registrar/feature/pom.xml
@@ -22,6 +22,7 @@
   ~ ============LICENSE_END=======================================================
   ~
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,7 +39,15 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-features :: ${project.artifactId}</name>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.kafka</groupId>
+                <artifactId>kafka-clients</artifactId>
+		<version>3.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/sdnr/wt/mountpoint-registrar/provider/pom.xml b/sdnr/wt/mountpoint-registrar/provider/pom.xml
index a10566920..9eb06b214 100644
--- a/sdnr/wt/mountpoint-registrar/provider/pom.xml
+++ b/sdnr/wt/mountpoint-registrar/provider/pom.xml
@@ -22,7 +22,9 @@
   ~ ============LICENSE_END=======================================================
   ~
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
diff --git a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/config/StrimziKafkaConfig.java b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/config/StrimziKafkaConfig.java
index 41ab8a7cb..0e88e299f 100644
--- a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/config/StrimziKafkaConfig.java
+++ b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/config/StrimziKafkaConfig.java
@@ -25,7 +25,7 @@ import org.onap.ccsdk.features.sdnr.wt.common.configuration.ConfigurationFileRep
  * bootstrapServers=abc:9092,def:9092
  * securityProtocol=PLAINTEXT #OTHER POSSIBLE VALUES - SSL, SASL_PLAINTEXT, SASL_SSL
  * saslMechanism=PLAIN #Need to understand more
- * saslJaasConfig=
+ * saslJaasConfig=PLAIN
  * consumerGroup=
  * consumerID=
  */
@@ -34,18 +34,19 @@ public class StrimziKafkaConfig implements Configuration {
     private static final String SECTION_MARKER = "strimzi-kafka";
 
     private static final String PROPERTY_KEY_ENABLED = "strimziEnabled";
+    private static final String DEFAULT_VALUE_KAFKA_ENABLED = "${SDNR_KAFKA_ENABLED}";
 
     private static final String PROPERTY_KEY_BOOTSTRAPSERVERS = "bootstrapServers";
-    private static final String DEFAULT_VALUE_BOOTSTRAPSERVERS = "onap-strimzi-kafka-0:9094,onap-strimzi-kafka-1:9094";
+    private static final String DEFAULT_VALUE_BOOTSTRAPSERVERS = "${SDNR_KAFKA_BOOTSTRAP_SERVERS}";
 
     private static final String PROPERTY_KEY_SECURITYPROTOCOL = "securityProtocol";
-    private static final String DEFAULT_VALUE_SECURITYPROTOCOL = "PLAINTEXT";
+    private static final String DEFAULT_VALUE_SECURITYPROTOCOL = "${SDNR_KAFKA_SECURITY_PROTOCOL}";
 
     private static final String PROPERTY_KEY_SASLMECHANISM = "saslMechanism";
-    private static final String DEFAULT_VALUE_SASLMECHANISM = "PLAIN";
+    private static final String DEFAULT_VALUE_SASLMECHANISM = "${SDNR_KAFKA_SASL_MECHANISM}";
 
     private static final String PROPERTY_KEY_SASLJAASCONFIG = "saslJaasConfig";
-    private static final String DEFAULT_VALUE_SASLJAASCONFIG = "PLAIN"; // TBD
+    private static final String DEFAULT_VALUE_SASLJAASCONFIG = "${SDNR_KAFKA_SASL_JAAS_CONFIG}";
 
     private ConfigurationFileRepresentation configuration;
 
@@ -84,7 +85,7 @@ public class StrimziKafkaConfig implements Configuration {
     public void defaults() {
         // The default value should be "false" given that SDNR can be run in
         // environments where Strimzi is not used
-        configuration.setPropertyIfNotAvailable(SECTION_MARKER, PROPERTY_KEY_ENABLED, Boolean.FALSE);
+        configuration.setPropertyIfNotAvailable(SECTION_MARKER, PROPERTY_KEY_ENABLED, DEFAULT_VALUE_KAFKA_ENABLED);
         configuration.setPropertyIfNotAvailable(SECTION_MARKER, PROPERTY_KEY_BOOTSTRAPSERVERS,
                 DEFAULT_VALUE_BOOTSTRAPSERVERS);
         configuration.setPropertyIfNotAvailable(SECTION_MARKER, PROPERTY_KEY_SECURITYPROTOCOL,
-- 
2.16.6