bard-backup 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452af7bfaa1d38372eb29a727e0b78200d479cb8f3eec98088aad4734bfae827
-  data.tar.gz: 7408415418eda357aceda59944720a63e50d19f10f34b29d43b2709ec713fd2e
+  metadata.gz: c646d0f6f82c6bc07b6fdfc94256094e60ec681bde22b295aa7ad7f6766a0a23
+  data.tar.gz: 05f47f4952af321ac6a7183ed0643ecf134e9f847b42b3a14a05c0b30399d26f
 SHA512:
-  metadata.gz: 8c16a1f42236bfc41d42a68db41b1e7e806c737508a0b7b0aac5c87984107d5e77fd1446445b4daf1ba460c24e7ac6870eb62e612d49091febf74902325e3e22
-  data.tar.gz: cb10ae30ececa98bbf031ed4a6500cde3b73a5a1564891d39a517f4c7f252da27108432ba50cabf894160c81e489cbcf84d28c6fc592daf6f2d8cb21f7c4825d
+  metadata.gz: 8eea608f2e85b5bb968985e57a6ca0a87f127516e6e0638ab0657dc829f68f46c9a467d18e53c9b0fdb128c83aa88b25c6fa814d079777b506e592ce21cf34f2
+  data.tar.gz: 7aaac7dad88c8ca3c1f50d7a95157adb5c096a41347accd498c46f08905c3f573cd934f6aa7f3c364250628af3126b0e45fd65ec03dc26b70d0209c82ef04586

data/lib/bard/backup/deleter.rb

@@ -6,24 +6,24 @@ module Bard
   module Backup
     class Deleter < Struct.new(:s3_dir, :now)
       def call
-        s3_dir.delete keys_to_delete
+        s3_dir.delete files_to_delete
       end
 
-      def keys_to_delete
-        s3_dir.keys.select do |key|
+      def files_to_delete
+        s3_dir.files.select do |file|
           [
             Filter.new(now, 72, :hours),
             Filter.new(now, 60, :days),
             Filter.new(now, 52, :weeks),
             Filter.new(now, 48, :months),
             Filter.new(now, 100, :years),
-          ].all? { |filter| !filter.cover?(key) }
+          ].all? { |filter| !filter.cover?(file) }
         end
       end
 
       class Filter < Struct.new(:now, :limit, :unit)
-        def cover? key
-          remote = DateTime.parse(key).beginning_of_hour
+        def cover? file
+          remote = DateTime.parse(file).beginning_of_hour
           limit.times.any? do |count|
             remote == ago(count)
           end

data/lib/bard/backup/{controller.rb → local_backhoe.rb}

@@ -1,10 +1,12 @@
+require "backhoe"
+
 module Bard
   module Backup
-    class Controller < Struct.new(:dumper, :s3_dir, :now)
-      def call
+    class LocalBackhoe
+      def self.call s3_dir, now
         filename = "#{now.iso8601}.sql.gz"
         path = "/tmp/#{filename}"
-        dumper.dump path
+        Backhoe.dump path
         s3_dir.mv path
       end
     end

data/lib/bard/backup/s3_dir.rb

@@ -4,13 +4,15 @@ require "rexml"
 module Bard
   module Backup
     class S3Dir < Data.define(:path, :access_key, :secret_key, :region)
-      def keys
+      def files
         response = client.list_objects_v2({
           bucket: bucket_name,
           prefix: folder_prefix,
         })
         raise if response.is_truncated
-        response.contents.map(&:key)
+        response.contents.map do |object|
+          object.key.sub("#{folder_prefix}/", "")
+        end
       end
 
       def put file_path, body: File.read(file_path)
@@ -21,14 +23,25 @@ module Bard
         })
       end
 
+      def presigned_url file_path
+        presigner = Aws::S3::Presigner.new(client: client)
+        presigner.presigned_url(
+          :put_object,
+          bucket: bucket_name,
+          key: [folder_prefix, File.basename(file_path)].compact.join("/"),
+        )
+      end
+
       def mv file_path, body: File.read(file_path)
         put file_path, body: body
         FileUtils.rm file_path
       end
 
-      def delete keys
-        return if keys.empty?
-        objects_to_delete = Array(keys).map { |key| { key: key } }
+      def delete file_paths
+        return if file_paths.empty?
+        objects_to_delete = Array(file_paths).map do |file_path|
+          { key: [folder_prefix, File.basename(file_path)].compact.join("/") }
+        end
         client.delete_objects({
           bucket: bucket_name,
           delete: {
@@ -39,8 +52,8 @@ module Bard
       end
 
       def empty!
-        keys.each_slice(1000) do |key_batch|
-          delete key_batch
+        files.each_slice(1000) do |batch|
+          delete batch
         end
       end
 

data/lib/bard/backup/version.rb

@@ -1,6 +1,6 @@
 module Bard
   module Backup
-    VERSION = "0.3.3"
+    VERSION = "0.5.0"
   end
 end
 

data/lib/bard/backup.rb

@@ -1,14 +1,12 @@
-require "bard/backup/controller"
-require "bard/backup/deleter"
 require "bard/backup/s3_dir"
-require "backhoe"
+require "bard/backup/local_backhoe"
+require "bard/backup/deleter"
 
 module Bard
   module Backup
-    def self.call s3_path, access_key:, secret_key:, region: "us-west-2", now: Time.now.utc
-      dumper = Backhoe
+    def self.call s3_path, access_key:, secret_key:, region: "us-west-2", now: Time.now.utc, strategy: LocalBackhoe
       s3_dir = S3Dir.new(path: s3_path, access_key:, secret_key:, region:)
-      Controller.new(dumper, s3_dir, now).call
+      strategy.call(s3_dir, now)
       Deleter.new(s3_dir, now).call
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backhoe
@@ -81,8 +81,8 @@ files:
 - Rakefile
 - lib/bard-backup.rb
 - lib/bard/backup.rb
-- lib/bard/backup/controller.rb
 - lib/bard/backup/deleter.rb
+- lib/bard/backup/local_backhoe.rb
 - lib/bard/backup/s3_dir.rb
 - lib/bard/backup/version.rb
 - sig/bard/backup.rbs