Refactor and Test of ConfigSecurity (apache#51)

jlopezmalla · Sep 6, 2017 · 4a0e0ba · 4a0e0ba
1 parent f33d6a3
commit 4a0e0ba
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@ hose {
     DEV = { config ->
 
         doPackage(config)
-       // doUT(config)
+        doUT(config)
         parallel(DOCKER1: {
                     doDocker(conf: config, dockerfile:"DockerfileDispatcher")
                 }, DEPLOY: {

diff --git a/core/src/main/scala/org/apache/spark/security/ConfigSecurity.scala b/core/src/main/scala/org/apache/spark/security/ConfigSecurity.scala
@@ -25,11 +25,16 @@ object ConfigSecurity extends Logging{
 
   var vaultToken: Option[String] = None
   val vaultHost: Option[String] = sys.env.get("VAULT_HOST")
-  val vaultUri: Option[String] = {
-    (sys.env.get("VAULT_PROTOCOL"), vaultHost, sys.env.get("VAULT_PORT")) match {
+  val vaultUri: Option[String] =
+    getVaultUri(sys.env.get("VAULT_PROTOCOL"), vaultHost, sys.env.get("VAULT_PORT"))
+
+  def getVaultUri(vaultProtocol: Option[String],
+                  vaultHost: Option[String],
+                  vaultPort: Option[String]): Option[String] = {
+    (vaultProtocol, vaultHost, vaultPort) match {
       case (Some(vaultProtocol), Some(vaultHost), Some(vaultPort)) =>
         val vaultUri = s"$vaultProtocol://$vaultHost:$vaultPort"
-        logDebug(s"vault uri: $vaultUri found, any Vault Connection will use it")
+        logDebug(s"Vault uri: $vaultUri found, any Vault Connection will use it")
         Option(vaultUri)
       case _ =>
         logDebug("No Vault information found, any Vault Connection will fail")

diff --git a/core/src/test/scala/org/apache/spark/security/ConfigSecuritySuite.scala b/core/src/test/scala/org/apache/spark/security/ConfigSecuritySuite.scala
@@ -46,6 +46,31 @@ class ConfigSecuritySuite extends SparkFunSuite with Matchers {
         "datastore" -> Map("DATASTORE_ENABLE" -> "true"),
         "kafka" -> Map("KAFKA_ENABLE" -> "true")))
   }
+
+  /**
+    * getVaultUri
+    */
+
+  val vaultProtocol = Option("https")
+  val vaultHost = Option("vault.labs.stratio.com")
+  val vaultPort = Option("8200")
+  val expectedResult = "https://vault.labs.stratio.com:8200"
+
+
+  test("getVaultUri with all the parameters given") {
+    val vaultUri = ConfigSecurity.getVaultUri(vaultProtocol, vaultHost, vaultPort)
+    assert(vaultUri === Option(expectedResult))
+  }
+
+  test("getVaultUri without one of the parameters needed") {
+    val vaultUri = ConfigSecurity.getVaultUri(None, vaultHost, vaultPort)
+    assert(vaultUri === None)
+  }
+
+  test("getVaultUri without none of the parameters needed") {
+    val vaultUri = ConfigSecurity.getVaultUri(None, None, None)
+    assert(vaultUri === None)
+  }
 }