bard-backup 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78ccac53e890df00e494ba9fb1d67ef861bb53d234e4848494b3b6d2392c5689
-  data.tar.gz: 566ff7ef397fd6ad36c3f508a666fd0037b45eafe02d0a6956c44828bab486b3
+  metadata.gz: 760a50cd9995dcdb13d1e89906f3898a5eae0423e0f6945e33a851439e5a9354
+  data.tar.gz: 95f7c3ccaa81fb55f8ac4e535c26a9260822131291f407a8ebf4bad4b7eab9be
 SHA512:
-  metadata.gz: 1088cbdcb2c7de2fc108731489ad567b2be2abc7fd59bd9b3edbff2fd6f4c5f043e1a6b59863fc9b8c54f472eb56b62e2841be7e80228d787267ff8a9588e69a
-  data.tar.gz: 5d0d7e3334ceb562e766da8fa9c736e0800d56b69e74b1b333fa5ffccfb21a4333ef9dd9ae0072f262de3c6cba3d64b2c956032cad4f1490bc5a06099ecc8bc1
+  metadata.gz: 96a4e68dc17386716e68f8d8c4c917e86388d1b3ffecce50951b2901ee12ce1b8560f86fc9450074dfcc4c54d90e8e0ed2e308ac27ac810576b0a339f180f469
+  data.tar.gz: 4c9d2b692bf56286abedd0c8deb7ec443adebbfd95c0300127b37b951bb27d99d551f7922a0059d3e9c666bd833b7af52634a765a2344b36f03343d344c099c3

data/README.md

@@ -2,7 +2,7 @@
 
 Bard::Backup does 3 things in a bard project
 1. Takes a database dump and uploads it to our s3 bucket
-2. Deletes old backups using a backoff heuristic: 48 hours, 60 days, 48 months, then yearly
+2. Deletes old backups using a backoff heuristic: 72 hours, 60 days, 52 weeks, 48 months, then yearly
 3. Raises an error if we don't have a backup from the previous hour
 
 ## Installation

data/lib/bard/backup/controller.rb

@@ -1,13 +1,10 @@
-require "backhoe"
-require "bard/backup/s3_dir"
-
 module Bard
   module Backup
-    class Controller < Struct.new(:s3_path, :filename, :access_key, :secret_key)
+    class Controller < Struct.new(:dumper, :s3_dir, :now)
       def call
+        filename = "#{now.iso8601}.sql.gz"
         path = "/tmp/#{filename}"
-        Backhoe.dump path
-        s3_dir = S3Dir.new(path: s3_path, access_key:, secret_key:)
+        dumper.dump path
         s3_dir.put path
       end
     end

data/lib/bard/backup/deleter.rb

@@ -0,0 +1,41 @@
+require "active_support"
+require "active_support/core_ext/date_time/calculations"
+require "active_support/core_ext/integer/time"
+
+module Bard
+  module Backup
+    class Deleter < Struct.new(:s3_dir, :now)
+      def call
+        s3_dir.delete keys_to_delete
+      end
+
+      def keys_to_delete
+        s3_dir.keys.select do |key|
+          [
+            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) }
+        end
+      end
+
+      class Filter < Struct.new(:now, :limit, :unit)
+        def cover? key
+          remote = DateTime.parse(key).beginning_of_hour
+          limit.times.any? do |count|
+            remote == ago(count)
+          end
+        end
+
+        private
+
+        def ago count
+          now.send(:"beginning_of_#{unit.to_s.singularize}") - count.send(unit)
+        end
+      end
+    end
+  end
+end
+

data/lib/bard/backup/s3_dir.rb

@@ -21,16 +21,21 @@ module Bard
         })
       end
 
+      def delete keys
+        return if keys.empty?
+        objects_to_delete = Array(keys).map { |key| { key: key } }
+        client.delete_objects({
+          bucket: bucket_name,
+          delete: {
+            objects: objects_to_delete,
+            quiet: true,
+          }
+        })
+      end
+
       def empty!
         keys.each_slice(1000) do |key_batch|
-          objects_to_delete = key_batch.map { |key| { key: key } }
-          client.delete_objects({
-            bucket: bucket_name,
-            delete: {
-              objects: objects_to_delete,
-              quiet: true,
-            }
-          })
+          delete key_batch
         end
       end
 

data/lib/bard/backup/version.rb

@@ -1,6 +1,6 @@
 module Bard
   module Backup
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   end
 end
 

data/lib/bard/backup.rb

@@ -1,9 +1,15 @@
 require "bard/backup/controller"
+require "bard/backup/deleter"
+require "bard/backup/s3_dir"
+require "backhoe"
 
 module Bard
   module Backup
-    def self.call s3_path, access_key:, secret_key:, filename: "#{Time.now.utc.iso8601}.sql.gz"
-      Controller.new(s3_path, filename, access_key, secret_key).call
+    def self.call s3_path, access_key:, secret_key:, now: Time.now.utc
+      dumper = Backhoe
+      s3_dir = S3Dir.new(path: s3_path, access_key:, secret_key:)
+      Controller.new(dumper, s3_dir, now).call
+      Deleter.new(s3_dir, now).call
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard-backup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backhoe
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - micah@botandrose.com
@@ -68,6 +82,7 @@ files:
 - lib/bard-backup.rb
 - lib/bard/backup.rb
 - lib/bard/backup/controller.rb
+- lib/bard/backup/deleter.rb
 - lib/bard/backup/s3_dir.rb
 - lib/bard/backup/version.rb
 - sig/bard/backup.rbs