serverless_redirector 0.3.4 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf291d3b67b875bd2ae70c723af751bc58748e9b
-  data.tar.gz: 963c2e15b3c3da833ac69d89e02f3430d324b519
+  metadata.gz: 8cec9e1e0836d7ba52eb371437e619193e7c7072
+  data.tar.gz: 888f20f1b64eb22675e8dfb577a6996992da6dd7
 SHA512:
-  metadata.gz: e812bf4d35308dcbe8b6007a0d9a21cb255c2ff537e4fdde4e5765a0a3492a7fe9cafe7e18a64dd244f87756a3412455d039be741c91d4b0ae62e09f5bb9ce70
-  data.tar.gz: 59e22ec192a07c783dd365c6f61a5ff0131f160ec25dccd8068eb52b65efe4e41530566c3b0f317e2a882f8b21993bc4a073d4fa5318af0a1bc615b22ab6556d
+  metadata.gz: bf4a20525b30514f0200ded81d9388b949f0f8b3be8b47023f476b6b24a0f0abe56321c095c011d15e0e0e75ab17dd2fb052d063ee095dade066a776d0a4ab5b
+  data.tar.gz: f2d691bf8169a3616b911972a24de11d88af8fddbfce2dcda0c05087b20092927868636cdd7f750354e3e97581b36077682f0b01dcc7f50fbaf8d0f52d5a76f6

data/lib/serverless_redirector/applicator.rb

@@ -15,7 +15,7 @@ module ServerlessRedirector
       case operation
       when ServerlessRedirector::Operations::RemoveRedirect
         destination.remove_key operation.redirect.path
-      when ServerlessRedirector::Operations::CreateRedirect, ServerlessRedirector::Operations::UpdateRedirect
+      when ServerlessRedirector::Operations::CreateRedirect, ServerlessRedirector::Operations::UpdateDestination
         rendered = ServerlessRedirector::Renderer.new('redirect.erb').render(url: operation.redirect.url)
         destination.write_key operation.redirect.path, operation.redirect.url, rendered
       end

data/lib/serverless_redirector/destination.rb

@@ -102,7 +102,13 @@ module ServerlessRedirector
     def bucket
       @bucket ||= begin
         client = Aws::S3::Client.new
-        region = @options['client'] || client.get_bucket_location(bucket: bucket_name).location_constraint
+        region = @options['region'] || begin
+          constraint = ( || client).get_bucket_location(
+            bucket: bucket_name,
+          ).location_constraint
+
+          normalise_constraint_to_region(constraint)
+        end
 
         accelerate = @options['accelerate'] == "true"
 
@@ -115,6 +121,17 @@ module ServerlessRedirector
       end
     end
 
+    def normalise_constraint_to_region(constraint)
+      case constraint
+      when '', nil
+        'us-east-1'
+      when 'EU'
+        'eu-west-1'
+      else
+        constraint
+      end
+    end
+
     def build_path(path)
       if prefix
         ::File.join prefix, path

data/lib/serverless_redirector/version.rb

@@ -1,3 +1,3 @@
 module ServerlessRedirector
-  VERSION = "0.3.4"
+  VERSION = "0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverless_redirector
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: '0.4'
 platform: ruby
 authors:
 - Darcy Laycock