serverless_redirector 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27b96243c603289eb46266122207a19c29554d6
-  data.tar.gz: 61edd08f58d9b112c1d0a27ce73c93bd88c96408
+  metadata.gz: 534a6bb887966c4cf6d13a019e9881748b22c4be
+  data.tar.gz: 42be56020c62ca68f9b8e462a444060ce6407f45
 SHA512:
-  metadata.gz: 96605f200de8607cf5c019dc9e69b8f782e639a95bae3139ea2bdd591b54f8293936b8257cb596b7f2a0e8dd6619a2a4a8511074f55e93cd2ffe2cd96565b6a3
-  data.tar.gz: 556e2fa1603bc3b7c13194fb94f294df9288d2658a1a67a267311f5aa47e77540e16884d810cd718465491c6e474f487dc9744353ad19a768258b139988bd9c0
+  metadata.gz: a4533d0c62c12b209a01b99b806f7becbc38b0ee5228f0d93a6478aedcd59ba7a434d65ae88696efd030d4d6ce81af071cd1047936622fe640a239b13e64b0b9
+  data.tar.gz: 95af1a2dcda2590ce2bff18a202b818768f4038218180c31384dd0a07923de63a169febac6b181f0782441f4036c5056e02cb73145c1d60c3e60a1e91e70cc8b

data/lib/serverless_redirector/applicator.rb

@@ -26,4 +26,4 @@ module ServerlessRedirector
     end
 
   end
-end
+end

data/lib/serverless_redirector/controller.rb

@@ -12,18 +12,21 @@ module ServerlessRedirector
     attr_accessor :destination_uri, # Target for the syncing...
                   :manifest_path,   # Where can we find out manifest?
                   :log_path,        # If present, where do we log? (STDOUT, by default)
-                  :dry_run          # Is this a dry run?
+                  :dry_run,         # Is this a dry run?
+                  :skip_deletes,    # Deletes have a special ordering to take place to avoid downtime.
 
     def initialize(options = {})
       @dry_run = false
       @log_path = nil
       @destination_uri = nil
       @manifest_path = nil
+      @skip_deletes = false
       unpack_options options
     end
 
     def unpack_options(options)
       @dry_run = !!options[:dry_run] if options.key?(:dry_run)
+      @skip_deletes = !!options[:skip_deletes] if options.key?(:skip_deletes)
 
       @manifest_path   = options.fetch(:manifest_path) if options.key?(:manifest_path)
       @log_path        = options.fetch(:log_path) if options.key?(:log_path)
@@ -41,7 +44,7 @@ module ServerlessRedirector
       manifest = create_manifest
       destination = create_destination
 
-      syncer = ServerlessRedirector::Syncer.new(manifest, destination, logger)
+      syncer = ServerlessRedirector::Syncer.new(manifest, destination, logger, skip_deletes)
       syncer.run dry_run
     end
 
@@ -72,4 +75,4 @@ module ServerlessRedirector
 
 
   end
-end
+end

data/lib/serverless_redirector/destination.rb

@@ -1,4 +1,5 @@
 require 'aws-sdk'
+require 'cgi'
 
 module ServerlessRedirector
   class Destination
@@ -61,6 +62,9 @@ module ServerlessRedirector
       @uri = uri
       @bucket_name = uri.host
       @prefix = uri.path.to_s.empty? ? nil : ::File.join(uri.path[1..-1], "")
+      @options = CGI.parse(uri.query || "").each_with_object({}) do |(key, values), out|
+        out[key] = values.lastß
+      end
     end
 
     def existing
@@ -69,7 +73,7 @@ module ServerlessRedirector
       end.map do |o|
         path = o.key.dup
         path.gsub! /^#{Regexp.escape(prefix)}\/?/, '' if prefix
-        ServerlessRedirector::Manifest::Redirect.new 'path' => path, 'url' => o.metadata["x-redirector-target"].to_s
+        ServerlessRedirector::Manifest::Redirect.new 'path' => path, 'url' => o.metadata[REDIRECT_HEADER_KEY].to_s
       end
     end
 
@@ -91,7 +95,6 @@ module ServerlessRedirector
           REDIRECT_HEADER_KEY => location
         }
       })
-      puts "WRITTEN"
     end
 
     protected
@@ -99,8 +102,14 @@ module ServerlessRedirector
     def bucket
       @bucket ||= begin
         client = Aws::S3::Client.new
-        region = client.get_bucket_location(bucket: bucket_name).location_constraint
-        regional_client = Aws::S3::Client.new(region: region)
+        region = @options['client'] || client.get_bucket_location(bucket: bucket_name).location_constraint
+
+        accelerate = @options['accelerate'] == "true"
+
+        regional_client = Aws::S3::Client.new(
+          region: region,
+          use_accelerate_endpoint: accelerate,
+        )
         resource = Aws::S3::Resource.new(client: regional_client)
         resource.bucket bucket_name
       end
@@ -116,4 +125,4 @@ module ServerlessRedirector
 
   end
 
-end
+end

data/lib/serverless_redirector/syncer.rb

@@ -5,12 +5,13 @@ require 'yaml'
 module ServerlessRedirector
   class Syncer
 
-    attr_reader :manifest, :destination, :logger
+    attr_reader :manifest, :destination, :logger, :skip_deletes
 
-    def initialize(manifest, destination, logger = ::Logger.new(STDOUT))
+    def initialize(manifest, destination, logger = ::Logger.new(STDOUT), skip_deletes = false)
       @manifest = manifest
       @destination = destination
       @logger = logger
+      @skip_deletes = skip_deletes
     end
 
     def run(dry_run = false)
@@ -39,7 +40,9 @@ module ServerlessRedirector
       changed = (targets.keys & contents.keys).select { |k| targets[k] != contents[k] }.map { |k| targets[k] }
 
       [].tap do |operations|
-        operations.concat removed.map { |r| Operations::RemoveRedirect.new(r) }
+        unless skip_deletes
+          operations.concat removed.map { |r| Operations::RemoveRedirect.new(r) }
+        end
         operations.concat added.map { |r| Operations::CreateRedirect.new(r) }
         operations.concat changed.map { |r| Operations::UpdateDestination.new(r) }
       end
@@ -65,4 +68,4 @@ module ServerlessRedirector
     end
 
   end
-end
+end

data/lib/serverless_redirector/version.rb

@@ -1,3 +1,3 @@
 module ServerlessRedirector
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverless_redirector
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Darcy Laycock
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler