From 117177fbc574edd08f836510e930e46b77f6357d Mon Sep 17 00:00:00 2001 From: gschiavon Date: Tue, 9 Jan 2018 09:19:43 +0100 Subject: [PATCH] Added debug message (#121) --- .../apache/spark/security/ConfigSecurity.scala | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/security/ConfigSecurity.scala b/core/src/main/scala/org/apache/spark/security/ConfigSecurity.scala index c0e599edeb090..7827dd175fb01 100644 --- a/core/src/main/scala/org/apache/spark/security/ConfigSecurity.scala +++ b/core/src/main/scala/org/apache/spark/security/ConfigSecurity.scala @@ -16,8 +16,10 @@ */ package org.apache.spark.security + import scala.util.{Failure, Success, Try} + import org.apache.spark.internal.Logging object ConfigSecurity extends Logging { @@ -25,15 +27,21 @@ object ConfigSecurity extends Logging { lazy val vaultToken: Option[String] = if (sys.env.get("VAULT_TOKEN").isDefined) { - logDebug("Obtaining vault token using VAULT_TOKEN") + logInfo("Obtaining vault token using VAULT_TOKEN") sys.env.get("VAULT_TOKEN") } else if (sys.env.get("VAULT_TEMP_TOKEN").isDefined) { - logDebug("Obtaining vault token using VAULT_TEMP_TOKEN") + logInfo("Obtaining vault token using VAULT_TEMP_TOKEN") scala.util.Try { VaultHelper.getRealToken(sys.env.get("VAULT_TEMP_TOKEN")) - }.toOption + } match { + case Success(token) => Option(token) + case Failure(e) => + logWarning("An error ocurred while trying to obtain" + + " Application Token from a temporal token", e) + None + } } else if (sys.env.get("VAULT_ROLE_ID").isDefined && sys.env.get("VAULT_SECRET_ID").isDefined) { - logDebug("Obtaining vault token using ROLE_ID and SECRET_ID") + logInfo("Obtaining vault token using ROLE_ID and SECRET_ID") Option(VaultHelper.getTokenFromAppRole( sys.env("VAULT_ROLE_ID"), sys.env("VAULT_SECRET_ID")))