Merge pull request #1453 from disneystreaming/fix-credentials-parsing

Fix a bug in the parsing of AWS credential files

CHANGELOG.md

@@ -1,6 +1,7 @@
 # 0.18.15
 
 * Add support for injecting endpoint-specific middlewares in AWS clients
+* Fixes a bug in the parsing of AWS credentials files
 
 # 0.18.14
 

modules/aws-http4s/src/smithy4s/aws/AwsCredentialsFile.scala

@@ -168,7 +168,7 @@ object AwsCredentialsFile {
 }
 
 private object Profile {
-  private val profileMatch = "([\\w_-]*)"
+  private val profileMatch = "(.*)"
   object Default {
     def unapply(s: String): Option[String] =
       if (s == "[default]") Some("default") else None
@@ -177,15 +177,15 @@ private object Profile {
   object Prefixed {
     private val reg = s"^\\[profile $profileMatch\\]$$".r
     def unapply(s: String): Option[String] = s match {
-      case reg(first) => Some(first)
+      case reg(first) => Some(first.trim())
       case _          => None
     }
   }
 
   object NonPrefixed {
     private val reg = s"^\\[$profileMatch\\]$$".r
     def unapply(s: String): Option[String] = s match {
-      case reg(first) => Some(first)
+      case reg(first) => Some(first.trim())
       case _          => None
     }
   }

modules/aws-http4s/test/src/smithy4s/aws/AwsCredentialsFileTest.scala

@@ -26,7 +26,10 @@ object AwsCredentialsFileTest extends FunSuite {
       e: Either[Throwable, A]
   )(f: A => Expectations): Expectations =
     e.fold(
-      err => failure(s"Got Left but expected a Right. ${err.getMessage}"),
+      err => {
+        err.printStackTrace()
+        failure(s"Got Left but expected a Right. ${err.getMessage}")
+      },
       f
     )
 
@@ -144,5 +147,20 @@ object AwsCredentialsFileTest extends FunSuite {
     }
   }
 
+  test("profiles can have special characters in them") {
+    expectRight(
+      AwsCredentialsFile.processFileLines(
+        asLines(
+          """|[Namespace/User@USER_ID]
+             |aws_access_key_id = key
+             |aws_secret_access_key = sec
+             |aws_session_token = token""".stripMargin
+        )
+      )
+    ) { res =>
+      expect.same(creds, res.profiles("Namespace/User@USER_ID"))
+    }
+  }
+
   private def asLines(s: String) = s.split("\\n").toList
 }