bard-backup 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ece259f7be3aae82e05c75b510f18bb1d7f70b9d0c77b3b9f6e71a641ddf4c
-  data.tar.gz: aed5da390d8f657fe3db65b009cde22ef0e6baf545fd4aafb2222e62258c3ad1
+  metadata.gz: 30f8ca36634a8ee2f414e6aa238a27227d71b9033904b19ff55c649dd8bfe71b
+  data.tar.gz: 2c858195ad3e2e23d84cbce7be7d99ab0000fec2d39f2cd1d409774987067f2d
 SHA512:
-  metadata.gz: dcc9f83eb793a5ed76446c862ce95a4b2b019eb38aa2f5c6589f5e6a516642f5cbad1292054e2f72f4a676d40f91c79b11cb6f26457fcdea565509c337a72dc2
-  data.tar.gz: 9a61e8264d5f3e4fe0247e88aba019b9971099a4325ff523c0d2cb195b104d51d2c0a2b3b497b1a15016c9a83d7e2f97c1a2e5920686fd5da732d579689d139a
+  metadata.gz: 44346cf310237c1d24c60733328dff6ac819ce050a45a183af50b269e61d9ebef420af721e961e612d5fff5d083d53c70dbf8b214b1443d9eee265df6f5b25ba
+  data.tar.gz: 5bcf351a8697340af6e2388b42cf513a7dab8b76da456c0d4ba659dd846e32455eb447148cf77006dd32dd4992a4100ffd6b0f9b7662efe55ac633cf544fd3cf

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

@@ -0,0 +1,12 @@
+module Bard
+  module Backup
+    class Controller < Struct.new(:dumper, :s3_dir, :now)
+      def call
+        filename = "#{now.iso8601}.sql.gz"
+        path = "/tmp/#{filename}"
+        dumper.dump path
+        s3_dir.put path
+      end
+    end
+  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

@@ -0,0 +1,61 @@
+require "aws-sdk-s3"
+require "rexml"
+
+module Bard
+  module Backup
+    class S3Dir < Data.define(:path, :access_key, :secret_key)
+      def keys
+        response = client.list_objects_v2({
+          bucket: bucket_name,
+          prefix: folder_prefix,
+        })
+        raise if response.is_truncated
+        response.contents.map(&:key)
+      end
+
+      def put file_path, body: File.read(file_path)
+        client.put_object({
+          bucket: bucket_name,
+          key: "#{folder_prefix}/#{File.basename(file_path)}",
+          body: body,
+        })
+      end
+
+      def delete keys
+        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|
+          delete key_batch
+        end
+      end
+
+      def bucket_name
+        path.split("/").first
+      end
+
+      def folder_prefix
+        path.split("/")[1..].join("/")
+      end
+
+      private
+
+      def client
+        Aws::S3::Client.new({
+          region: "us-west-2",
+          access_key_id: access_key,
+          secret_access_key: secret_key,
+        })
+      end
+    end
+  end
+end
+

data/lib/bard/backup/version.rb

@@ -0,0 +1,6 @@
+module Bard
+  module Backup
+    VERSION = "0.3.0"
+  end
+end
+

data/lib/bard/backup.rb

@@ -1,91 +1,16 @@
-# frozen_string_literal: true
-
-require "net/http"
-require "openssl"
-require "base64"
+require "bard/backup/controller"
+require "bard/backup/deleter"
+require "bard/backup/s3_dir"
 require "backhoe"
 
 module Bard
-  class Backup < Struct.new(:s3_path, :access_key, :secret_key)
-    def self.call s3_path, access_key:, secret_key:
-      new(s3_path, access_key, secret_key).call
-    end
-
-    def call
-      @time = Time.now
-
-      Backhoe.dump path
-
-      self.full_s3_path = "/#{s3_path}/#{filename}"
-
-      if s3_path.include?("/")
-        s3_bucket = s3_path.split("/").first
-        self.s3_path = s3_path.split("/")[1..].join("/")
-        uri = URI("https://#{s3_bucket}.s3.amazonaws.com/#{s3_path}/#{filename}")
-      else
-        uri = URI("https://#{s3_path}.s3.amazonaws.com/#{filename}")
-      end
-
-      request = Net::HTTP::Put.new(uri, {
-        "Content-Length": File.size(path).to_s,
-        "Content-Type": content_type,
-        "Date": date,
-        "Authorization": "AWS #{access_key}:#{signature}",
-        "x-amz-storage-class": "STANDARD",
-        "x-amz-acl": "private",
-      })
-      request.body_stream = File.open(path)
-
-      Net::HTTP.start(uri.hostname) do |http|
-        response = http.request(request)
-        response.value # raises if not success
-      end
-    end
-
-    private
-
-    attr_accessor :full_s3_path
-
-    def signature
-      digester = OpenSSL::Digest::SHA1.new
-      digest = OpenSSL::HMAC.digest(digester, secret_key, key)
-      Base64.strict_encode64(digest)
-    end
-
-    def key
-      [
-        "PUT",
-        "",
-        content_type,
-        date,
-        acl,
-        storage_type,
-        full_s3_path,
-      ].join("\n")
-    end
-
-    def content_type
-      "application/gzip"
-    end
-
-    def date
-      @time.rfc2822
-    end
-
-    def acl
-      "x-amz-acl:private"
-    end
-
-    def storage_type
-      "x-amz-storage-class:STANDARD"
-    end
-
-    def path
-      "/tmp/#{filename}"
-    end
-
-    def filename
-      "#{@time.utc.iso8601}.sql.gz"
+  module Backup
+    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,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: bard-backup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
-dependencies: []
+date: 2024-07-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: backhoe
+  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'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  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'
+- !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
@@ -25,6 +81,10 @@ files:
 - Rakefile
 - 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
 homepage: https://github.com/botandrose/bard-backup
 licenses: