kamal-backup 0.3.0.beta8 → 0.3.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d920c58d8ff83794df465f0549d8599ea6a5e815b800221fa850ce024241abfa
-  data.tar.gz: feb8374a19862349d1fb0b3d55e3e697b45df66d58fc0c0f63ddba4767ed01f9
+  metadata.gz: c7c67946461c23a767a12d31d82389bb4e0fb3c75a5494f102c4dad8facecb2e
+  data.tar.gz: f0265c16c92bdf291bf19f0586589af08938962c5a6b79635f782559dee75d39
 SHA512:
-  metadata.gz: 9e36489f2557dca0695be87b779a9b20f96148b141e67a9422bc8933c925ea68a17a73d221c56f4a51585258194752f0db4f0b6fed4a4845783334e6dc0d8e0e
-  data.tar.gz: f8bb63eb69f7da8bdfcc001e07c95495ac60fa6996eb4b4188cfb2a8bc453979176985703f897c8e5ac4a9b02faec5cf3d76aad15862b0c964d6c961c2910556
+  metadata.gz: f919b9df92d55407c57745e61cfa4fd011c15060ab6edd5d93b75516fef13b22f0490e7010531bb6c464578df6a25faf8a485d6a35f5431f9a6e53331cef90a5
+  data.tar.gz: d7243e236effb7c4da158c70993af8896e39764952f9dc2155a123655ddac49931804c67dd10424d10a5ddcdd0208542a28fe798256691a4cb2287ef35bba242

data/lib/kamal_backup/app.rb

@@ -16,6 +16,8 @@ require_relative "schema"
 
 module KamalBackup
   class App
+    FRESH_BACKUP_GRACE_SECONDS = 5
+
     attr_reader :config, :redactor
 
     def initialize(env: ENV, config: nil, redactor: nil, restic: nil, database: nil, evidence_class: Evidence, scheduler_class: Scheduler)
@@ -28,6 +30,7 @@ module KamalBackup
     end
 
     def backup
+      started_at = Time.now.utc
       config.validate_backup
       require_restic!
 
@@ -43,7 +46,9 @@ module KamalBackup
         restic.check
       end
 
-      true
+      backup_summary(started_at: started_at, finished_at: Time.now.utc).tap do |summary|
+        validate_fresh_backup_summary!(summary, started_at: started_at)
+      end
     end
 
     def validate(check_files: true)
@@ -241,6 +246,59 @@ module KamalBackup
         result[:files] = file_results.size == 1 ? file_results.first : file_results
       end
 
+      def backup_summary(started_at:, finished_at:)
+        {
+          kind: "backup_result",
+          status: "ok",
+          started_at: started_at.iso8601,
+          finished_at: finished_at.iso8601,
+          databases: databases.map { |adapter| backup_snapshot_summary(adapter) },
+          files: backup_file_snapshot_summary
+        }
+      end
+
+      def backup_snapshot_summary(adapter)
+        snapshot = restic.latest_snapshot(tags: database_snapshot_tags(adapter))
+        snapshot_summary(snapshot).merge(
+          database: database_config_name(adapter),
+          adapter: adapter.adapter_name
+        )
+      end
+
+      def backup_file_snapshot_summary
+        return nil if config.backup_paths.empty?
+
+        snapshot_summary(restic.latest_snapshot(tags: ["type:files"]))
+      end
+
+      def snapshot_summary(snapshot)
+        {
+          snapshot: snapshot && (snapshot["short_id"] || snapshot["id"]),
+          time: snapshot && snapshot["time"]
+        }
+      end
+
+      def validate_fresh_backup_summary!(summary, started_at:)
+        stale_databases = summary.fetch(:databases).reject { |entry| fresh_snapshot?(entry, started_at) }
+
+        unless stale_databases.empty?
+          names = stale_databases.map { |entry| entry.fetch(:database) }.join(", ")
+          raise ConfigurationError, "backup did not create a fresh database snapshot for #{names}"
+        end
+
+        files = summary[:files]
+        if files && !fresh_snapshot?(files, started_at)
+          raise ConfigurationError, "backup did not create a fresh file snapshot"
+        end
+      end
+
+      def fresh_snapshot?(entry, started_at)
+        snapshot_time = Time.parse(entry[:time].to_s)
+        snapshot_time >= started_at - FRESH_BACKUP_GRACE_SECONDS
+      rescue ArgumentError
+        false
+      end
+
       def database_snapshot_tags(adapter)
         ["type:database", "database:#{database_config_name(adapter)}", "adapter:#{adapter.adapter_name}"]
       end

data/lib/kamal_backup/cli.rb

@@ -138,6 +138,19 @@ module KamalBackup
         puts("fix: #{status_output.decorate(accessory_reboot_command, :yellow, :bold)}") if status == "out of sync"
       end
 
+      def print_backup_result(result)
+        return unless result.is_a?(Hash)
+
+        puts("Backup completed at #{result.fetch(:finished_at)}")
+        result.fetch(:databases).each do |database|
+          puts("database #{database.fetch(:database)}: #{database.fetch(:snapshot)} at #{database.fetch(:time)}")
+        end
+
+        if files = result[:files]
+          puts("files: #{files.fetch(:snapshot)} at #{files.fetch(:time)}")
+        end
+      end
+
       def validate_deploy_config
         config = Config.new(
           env: bridge.accessory_environment(accessory_name: accessory_name),
@@ -424,7 +437,7 @@ module KamalBackup
       if remote_command_mode?
         exec_remote(["kamal-backup", "backup"])
       else
-        direct_app.backup
+        print_backup_result(direct_app.backup)
       end
     end
 

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta8"
+  VERSION = "0.3.0.beta9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta8
+  version: 0.3.0.beta9
 platform: ruby
 authors:
 - crmne