From f8572b9e6a0ecd22ece0eac9338f1e8c0d9397a8 Mon Sep 17 00:00:00 2001
From: Nathan Zimmerman <npzimmerman@gmail.com>
Date: Wed, 5 Oct 2016 15:58:34 -0400
Subject: [PATCH] Make regex for s3 URLs handle s3/s3a/s3n

---
 s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala
index 1596a5efa1..6c83bd5485 100644
--- a/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala
+++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala
@@ -128,7 +128,7 @@ object S3InputFormat {
   private val idRx = "[A-Z0-9]{20}"
   private val keyRx = "[a-zA-Z0-9+/]+={0,2}"
   private val slug = "[a-zA-Z0-9-]+"
-  val S3UrlRx = new Regex(s"""s3n://(?:($idRx):($keyRx)@)?($slug)/{0,1}(.*)""", "aws_id", "aws_key", "bucket", "prefix")
+  val S3UrlRx = new Regex(s"""s3[an]?://(?:($idRx):($keyRx)@)?($slug)/{0,1}(.*)""", "aws_id", "aws_key", "bucket", "prefix")
 
   /** Set S3N url to use, may include AWS Id and Key */
   def setUrl(job: Job, url: String): Unit =