Merge pull request #8 from nats-io/1.1.1

1.1.1 [IMPROVED] Can use both NATS creds and client cert at the same time
nats-io · Sep 13, 2023 · 6884e30 · 6884e30
2 parents 044e54c + 338f73a
commit 6884e30
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/load_balanced/build.sbt b/load_balanced/build.sbt
@@ -1,6 +1,6 @@
 
 name := "nats-spark-connector"
-version := "1.1.0"
+version := "1.1.1"
 scalaVersion := "2.12.14"
 
 val sparkVersion = "3.3.0"

diff --git a/load_balanced/src/main/scala/natsconnector/NatsConfig.scala b/load_balanced/src/main/scala/natsconnector/NatsConfig.scala
@@ -70,7 +70,7 @@ class NatsConfig(isSource: Boolean) {
   // ============== JetStream stream Config Values
   // TODO: add replication configuration
   var streamName: Option[String] = None // configurable
-  var storageType: StorageType = StorageType.Memory // configurable
+  var storageType: StorageType = StorageType.File // configurable
   var streamSubjects: Option[String] = None // configurable
   var durable: Option[String] = None // configurable
   val ackPolicy: AckPolicy =
@@ -187,9 +187,9 @@ class NatsConfig(isSource: Boolean) {
 
     try {
       val typeOfStorage: String = parameters("nats.storage.type")
-      // storage type default is set to 'memory'
-      if (typeOfStorage.trim().toLowerCase.equals("file"))
-        this.storageType = StorageType.File
+      // storage type default is set to 'file'
+      if (typeOfStorage.trim().toLowerCase.equals("memory"))
+        this.storageType = StorageType.Memory
     } catch {
       case e: NoSuchElementException =>
     }
@@ -356,19 +356,16 @@ class NatsConfig(isSource: Boolean) {
       builder = builder.maxReconnects(-1)
     }
 
-    if (
-      System.getenv("NATS_NKEY") != null && System.getenv("NATS_NKEY") != ""
-    ) {
+    if (System.getenv("NATS_NKEY") != null && System.getenv("NATS_NKEY") != "") {
       val handler: AuthHandler = new SampleAuthHandler(
         System.getenv("NATS_NKEY")
       )
       builder.authHandler(handler)
-    } else if (
-      System.getenv("NATS_CREDS") != null && System.getenv("NATS_CREDS") != ""
-    ) {
+    } else if (System.getenv("NATS_CREDS") != null && System.getenv("NATS_CREDS") != "") {
       builder.authHandler(Nats.credentials(System.getenv("NATS_CREDS")));
-    } else if (System.getenv("NATS_TLS_KEY_STORE") != null && System.getenv("NATS_TLS_KEY_STORE") != "" && System.getenv("NATS_TLS_TRUST_STORE") != null && System.getenv("NATS_TLS_TRUST_STORE") != "") {
+    }
 
+    if (System.getenv("NATS_TLS_KEY_STORE") != null && System.getenv("NATS_TLS_KEY_STORE") != "" && System.getenv("NATS_TLS_TRUST_STORE") != null && System.getenv("NATS_TLS_TRUST_STORE") != "") {
       val tlsAlgo = if (System.getenv("NATS_TLS_ALGO") != null && System.getenv("NATS_TLS_ALGO") != "") {
         System.getenv("NATS_TLS_ALGO")
       } else "SunX509"

diff --git a/load_balanced/target/scala-2.12/nats-spark-connector_2.12-1.1.0.jar b/load_balanced/target/scala-2.12/nats-spark-connector_2.12-1.1.0.jar
diff --git a/partitioned/build.sbt b/partitioned/build.sbt
@@ -1,6 +1,6 @@
 
 name := "nats-spark-connector"
-version := "1.1.0"
+version := "1.1.1"
 scalaVersion := "2.12.14"
 
 val sparkVersion = "3.3.0"

diff --git a/partitioned/src/main/scala/natsconnector/NatsConfig.scala b/partitioned/src/main/scala/natsconnector/NatsConfig.scala
@@ -211,18 +211,16 @@ class NatsConfig(isSource:Boolean) {
       builder = builder.maxReconnects(-1)
     }
 
-    if (
-      System.getenv("NATS_NKEY") != null && System.getenv("NATS_NKEY") != ""
-    ) {
+    if (System.getenv("NATS_NKEY") != null && System.getenv("NATS_NKEY") != "") {
       val handler: AuthHandler = new SampleAuthHandler(
         System.getenv("NATS_NKEY")
       )
       builder.authHandler(handler)
-    } else if (
-      System.getenv("NATS_CREDS") != null && System.getenv("NATS_CREDS") != ""
-    ) {
+    } else if (System.getenv("NATS_CREDS") != null && System.getenv("NATS_CREDS") != "") {
       builder.authHandler(Nats.credentials(System.getenv("NATS_CREDS")));
-    } else if (System.getenv("NATS_TLS_KEY_STORE") != null && System.getenv("NATS_TLS_KEY_STORE") != "" && System.getenv("NATS_TLS_TRUST_STORE") != null && System.getenv("NATS_TLS_TRUST_STORE") != "") {
+    }
+
+    if (System.getenv("NATS_TLS_KEY_STORE") != null && System.getenv("NATS_TLS_KEY_STORE") != "" && System.getenv("NATS_TLS_TRUST_STORE") != null && System.getenv("NATS_TLS_TRUST_STORE") != "") {
 
       val tlsAlgo = if (System.getenv("NATS_TLS_ALGO") != null && System.getenv("NATS_TLS_ALGO") != "") {
         System.getenv("NATS_TLS_ALGO")
@@ -240,7 +238,6 @@ class NatsConfig(isSource:Boolean) {
         System.getenv("NATS_TLS_TRUST_STORE_PASSWORD").toCharArray
       } else "".toCharArray
 
-
       val ctx = javax.net.ssl.SSLContext.getInstance(Options.DEFAULT_SSL_PROTOCOL)
 
       val keyStore = KeyStore.getInstance(instanceType)

diff --git a/partitioned/target/scala-2.12/nats-spark-connector_2.12-1.1.0.jar b/partitioned/target/scala-2.12/nats-spark-connector_2.12-1.1.0.jar