For the Role Based Credential Providers if there is no roleArn then r…

…eturn null to avoid creating a AWSSecurityTokenServiceClient which is slow
tpunder · Apr 7, 2017 · b920738 · b920738
1 parent 9849ed9
commit b920738
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/scala/fm/sbt/S3URLHandler.scala b/src/main/scala/fm/sbt/S3URLHandler.scala
@@ -80,10 +80,14 @@ object S3URLHandler {
     protected def getRoleArn(keys: String*): String
 
     def getCredentials(): AWSCredentials = {
+      val roleArn: String = getRoleArn(RoleArnKeyNames: _*)
+
+      if (roleArn == null || roleArn == "") return null
+
       val securityTokenService: AWSSecurityTokenService = AWSSecurityTokenServiceClient.builder().withCredentials(providerChain).build()
 
       val roleRequest: AssumeRoleRequest = new AssumeRoleRequest()
-        .withRoleArn(getRoleArn(RoleArnKeyNames: _*))
+        .withRoleArn(roleArn)
         .withRoleSessionName(System.currentTimeMillis.toString)
 
       val result: AssumeRoleResult = securityTokenService.assumeRole(roleRequest)
@@ -100,7 +104,7 @@ object S3URLHandler {
     val RoleArnKeyName: String = "aws.roleArn"
     val RoleArnKeyNames: Seq[String] = Seq(RoleArnKeyName)
 
-    protected def getRoleArn(keys: String*) = keys.map( System.getProperty ).flatMap( Option(_) ).head.trim
+    protected def getRoleArn(keys: String*): String = keys.map( System.getProperty ).flatMap( Option(_) ).head.trim
   }
 
   private class RoleBasedEnvironmentVariableCredentialsProvider(providerChain: AWSCredentialsProviderChain)
@@ -109,7 +113,7 @@ object S3URLHandler {
     val RoleArnKeyName: String = "AWS_ROLE_ARN"
     val RoleArnKeyNames: Seq[String] = Seq("AWS_ROLE_ARN")
 
-    protected def getRoleArn(keys: String*) = keys.map( toEnvironmentVariableName ).map( System.getenv ).flatMap( Option(_) ).head.trim
+    protected def getRoleArn(keys: String*): String = keys.map( toEnvironmentVariableName ).map( System.getenv ).flatMap( Option(_) ).head.trim
   }
 
   private class RoleBasedPropertiesFileCredentialsProvider(providerChain: AWSCredentialsProviderChain, fileName: String)