s3_website 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3817c71cb9e62df94035abdb0c2a82518086f31f
-  data.tar.gz: f865711262a86542bbbbe79889fed47695f00ced
+  metadata.gz: 74e389d709a1b22628c825ed08d0b10ed70a3203
+  data.tar.gz: 36fe9d03a05edd81fe46d640a658adab56190d82
 SHA512:
-  metadata.gz: b8fdf4cc12c1e05ed5189e1ad0e447e83794c510f7347786eca40cc08d22336fafb6f5d88a439451f7fd7d1002529b8aab9407c064f065993c991b8d43cae4ee
-  data.tar.gz: 462f392810758a973b71aece6a052651d95978b98740ae421cb6b35373c5167bcccf31e4d1d19ee4643ba3a83335714dafd3fe551c1cf4b55e621e8d41e809c8
+  metadata.gz: f7e14464bf2b8a3b3ea49f475dce49fc8642f5710a6c9e2b6bd07c4d7b2522854fd6e603c0c913fd2ad899804d11d638949fc2e56eb16556e88c80828bd69df7
+  data.tar.gz: 7b30125db36d4bbbca1443c2455e2f71a1d38205a7e1622963a334ca634d314212c41f9e072dd5a6e51677844385f5a3e6f0cd7714bc286c406d1b735d78c712

data/README.md

@@ -205,11 +205,6 @@ s3_endpoint: ap-northeast-1
 The valid `s3_endpoint` values consist of the [S3 location constraint
 values](http://docs.amazonwebservices.com/general/latest/gr/rande.html#s3_region).
 
-Note that at the moment s3_website does not support any region that
-supports only a V4 Signature and does not support V2
- (i.e. *eu-central-1*, *ap-south-1*, *ap-northeast-2*).
-This support can be tracked in [issue #126](https://github.com/laurilehmijoki/s3_website/issues/126).
-
 ### Ignoring files you want to keep on AWS
 
 Sometimes there are files or directories you want to keep on S3, but not on

data/build.sbt

@@ -18,7 +18,7 @@ libraryDependencies += "org.yaml" % "snakeyaml" % "1.13"
 
 libraryDependencies += "org.jruby" % "jruby" % "1.7.11"
 
-libraryDependencies += "com.amazonaws" % "aws-java-sdk" % "1.7.7"
+libraryDependencies += "com.amazonaws" % "aws-java-sdk" % "1.11.32"
 
 libraryDependencies += "log4j" % "log4j" % "1.2.17"
 

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.15.1
+
+* Support all AWS regions
+
 ## 2.15.0
 
 * Add new setting `content_type`

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.15.0'
+  VERSION = '2.15.1'
 end

data/s3_website.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.default_executable = %q{s3_website}
 
   s.add_dependency 'thor', '~> 0.18'
-  s.add_dependency 'configure-s3-website', '= 1.7.1'
+  s.add_dependency 'configure-s3-website', '= 1.7.5'
   s.add_dependency 'colored', '1.2'
   s.add_dependency 'dotenv', '~> 1.0'
 

data/src/main/scala/s3/website/model/Config.scala

@@ -131,12 +131,8 @@ object Config {
 
 
   def loadEndpoint(implicit unsafeYaml: UnsafeYaml): Either[ErrorReport, Option[S3Endpoint]] =
-    loadOptionalString("s3_endpoint").right flatMap { endpointString =>
-      endpointString.map(S3Endpoint.forString) match {
-        case Some(Right(endpoint)) => Right(Some(endpoint))
-        case Some(Left(endpointError)) => Left(endpointError)
-        case None => Right(None)
-      }
+    loadOptionalString("s3_endpoint").right map { endpointString =>
+      endpointString.map(S3Endpoint(_))
     }
 
   def loadRedirects(s3_key_prefix: Option[String])(implicit unsafeYaml: UnsafeYaml): Either[ErrorReport, Option[Map[S3Key, String]]] = {

data/src/main/scala/s3/website/model/S3Endpoint.scala

@@ -1,24 +1,43 @@
 package s3.website.model
 
-import s3.website.ErrorReport
-
 case class S3Endpoint(
   s3WebsiteHostname: String,
   s3Hostname: String
 )
 
 object S3Endpoint {
-  val defaultEndpoint = S3Endpoint("s3-website-us-east-1.amazonaws.com", "s3.amazonaws.com")
+  def defaultEndpoint = S3Endpoint("us-east-1")
+
+  val oldRegions = Seq(
+    "us-east-1",
+    "us-west-1",
+    "us-west-2",
+    "ap-southeast-1",
+    "ap-southeast-2",
+    "ap-northeast-1",
+    "eu-west-1",
+    "sa-east-1"
+  )
+
+  def apply(region: String): S3Endpoint = {
+    if (region == "EU") {
+      return S3Endpoint("eu-west-1")
+    }
+
+    val isOldRegion = oldRegions.contains(region)
+    val s3WebsiteHostname =
+      if (isOldRegion)
+        s"s3-website-$region.amazonaws.com"
+      else
+        s"s3-website.$region.amazonaws.com"
+    val s3Hostname =
+      if (region == "us-east-1")
+        "s3.amazonaws.com"
+      else if (isOldRegion)
+        s"s3-$region.amazonaws.com"
+      else
+        s"s3.$region.amazonaws.com"
 
-  def forString(locationConstraint: String): Either[ErrorReport, S3Endpoint] = locationConstraint match {
-    case "EU" | "eu-west-1" => Right(S3Endpoint("s3-website-eu-west-1.amazonaws.com",      "s3-eu-west-1.amazonaws.com"))
-    case "us-east-1" =>        Right(defaultEndpoint)
-    case "us-west-1" =>        Right(S3Endpoint("s3-website-us-west-1.amazonaws.com",      "s3-us-west-1.amazonaws.com"))
-    case "us-west-2" =>        Right(S3Endpoint("s3-website-us-west-2.amazonaws.com",      "s3-us-west-2.amazonaws.com"))
-    case "ap-southeast-1" =>   Right(S3Endpoint("s3-website-ap-southeast-1.amazonaws.com", "s3-ap-southeast-1.amazonaws.com"))
-    case "ap-southeast-2" =>   Right(S3Endpoint("s3-website-ap-southeast-2.amazonaws.com", "s3-ap-southeast-2.amazonaws.com"))
-    case "ap-northeast-1" =>   Right(S3Endpoint("s3-website-ap-northeast-1.amazonaws.com", "s3-ap-northeast-1.amazonaws.com"))
-    case "sa-east-1" =>        Right(S3Endpoint("s3-website-sa-east-1.amazonaws.com",      "s3-sa-east-1.amazonaws.com"))
-    case _ =>                  Left(ErrorReport(s"Unrecognised endpoint: $locationConstraint"))
+    S3Endpoint(s3WebsiteHostname = s3WebsiteHostname, s3Hostname = s3Hostname)
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement