kamal-backup 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8322ff9eeead7c145127274766d96c54677333fafd7a94b57c6eb7b395cfeae6
-  data.tar.gz: b9b1d442c93b808b4d0e04c9fdd3eb757ff97df2470610769bd7e430836107e9
+  metadata.gz: d3bd8ce5d3434c45246641943cdcd4eeeab4bda3caf5fec309f9b65efbd3a21a
+  data.tar.gz: 3bf191da068b6c64540d98d786c49772f451085b08dce8f5058c1923818a3a91
 SHA512:
-  metadata.gz: 4d4031c8ffaa652db3f151c3b21cbf2e170571278a57d815880fa4bbe5a06d6dfce9690d9f59fbe5e68de77c97c6e1ac6a1da90c4c400ccb8af2acaf7d18cec7
-  data.tar.gz: f037233779d710baadf2c6c5e4100b8caccda9069d95b781411fbe35f5c8e4b93899c41d0652f6baa69f38f7e8107c83b65ef19d3ee988397067e5c40e0ae0b7
+  metadata.gz: a74bcf4abc214cbc22f4c9aed16c067b8e928c8d666ba3e73155c52ac8ef0b3ec3be0b5f68b01f258025b6cfada5629562de372e3a46f1f8321c395ef92d3aee
+  data.tar.gz: 0bc5fc2dd8e7e103cb93f0e4fa576ae9a7e643f4084edbec2b644ae9c8a47ba5917014f7b6ba0e1ae261a98c3b574b75f789985710eb27bcb912ea87d84d6d6f

data/README.md

@@ -71,6 +71,8 @@ accessories:
       - "chatwithwork_backup_state:/var/lib/kamal-backup"
 ```
 
+For SQLite databases stored on the mounted storage volume, omit `:ro` from that volume.
+
 Put the backup settings in `config/kamal-backup.yml`:
 
 ```yaml

data/lib/kamal_backup/cli.rb

@@ -147,6 +147,43 @@ module KamalBackup
         end
       end
 
+      def confirm_production_restore!(snapshot)
+        return if options[:"confirm-production-restore"]
+
+        if options[:yes]
+          raise ConfigurationError, "--yes does not bypass restore production; use --confirm-production-restore only for deliberate automation"
+        end
+
+        unless $stdin.tty?
+          raise ConfigurationError, "production restore confirmation required; rerun interactively or pass --confirm-production-restore only for deliberate automation"
+        end
+
+        app_name = production_restore_confirmation_config.required_app_name
+        say "This will overwrite the production database and file paths for #{app_name} from backup #{snapshot}.", :red
+        require_typed_confirmation("Type the app name to continue", app_name)
+        require_typed_confirmation("Type RESTORE PRODUCTION to continue", "RESTORE PRODUCTION")
+        confirm!("Restore #{snapshot} into production now? This will overwrite production data.")
+      end
+
+      def require_typed_confirmation(prompt, expected)
+        answer = ask("#{prompt}:").to_s.strip
+        return if answer == expected
+
+        raise ConfigurationError, "aborted"
+      end
+
+      def production_restore_confirmation_config
+        if deployment_mode?
+          Config.new(
+            env: bridge.accessory_environment(accessory_name: accessory_name),
+            config_paths: [Config::SHARED_CONFIG_PATH],
+            load_project_defaults: false
+          )
+        else
+          direct_app.config
+        end
+      end
+
       def prompt_required(label)
         unless $stdin.tty?
           raise ConfigurationError, "#{label.downcase} is required; pass it on the command line"
@@ -234,12 +271,13 @@ module KamalBackup
         puts(JSON.pretty_generate(local_app.restore_to_local_machine(snapshot)))
       end
 
+      method_option :"confirm-production-restore", type: :boolean, default: false, desc: "Confirm production restore without interactive prompts"
       desc "production [SNAPSHOT]", "Restore the backup into the production database and Active Storage path"
       def production(snapshot = "latest")
-        confirm!("Restore #{snapshot} into the production database and Active Storage path? This will overwrite production data.")
+        confirm_production_restore!(snapshot)
 
         if deployment_mode?
-          exec_remote(["kamal-backup", "restore", "production", snapshot, "--yes"])
+          exec_remote(["kamal-backup", "restore", "production", snapshot, "--confirm-production-restore"])
         else
           puts(JSON.pretty_generate(direct_app.restore_to_production(snapshot)))
         end

data/lib/kamal_backup/config.rb

@@ -42,7 +42,6 @@ module KamalBackup
       "backup_schedule_seconds" => "BACKUP_SCHEDULE_SECONDS",
       "backup_start_delay_seconds" => "BACKUP_START_DELAY_SECONDS",
       "state_dir" => "KAMAL_BACKUP_STATE_DIR",
-      "allow_production_restore" => "KAMAL_BACKUP_ALLOW_PRODUCTION_RESTORE",
       "allow_suspicious_paths" => "KAMAL_BACKUP_ALLOW_SUSPICIOUS_PATHS",
       "pgpassword" => "PGPASSWORD",
       "mysql_pwd" => "MYSQL_PWD"
@@ -104,10 +103,6 @@ module KamalBackup
       value("RESTIC_CHECK_READ_DATA_SUBSET")
     end
 
-    def allow_production_restore?
-      truthy?("KAMAL_BACKUP_ALLOW_PRODUCTION_RESTORE")
-    end
-
     def allow_in_place_file_restore?
       truthy?("KAMAL_BACKUP_ALLOW_IN_PLACE_FILE_RESTORE")
     end
@@ -245,8 +240,8 @@ module KamalBackup
     def validate_local_database_restore_target(target)
       raise ConfigurationError, "local restore database target is required" if target.to_s.strip.empty?
 
-      if production_named_target?(target) && !allow_production_restore?
-        raise ConfigurationError, "refusing production-looking local restore target #{target}; set KAMAL_BACKUP_ALLOW_PRODUCTION_RESTORE=true to override"
+      if production_named_target?(target)
+        raise ConfigurationError, "refusing production-looking local restore target #{target}; use restore production for production restores"
       end
     end
 
@@ -266,8 +261,8 @@ module KamalBackup
     def validate_database_restore_target(target)
       raise ConfigurationError, "restore database target is required" if target.to_s.strip.empty?
 
-      if production_like_target?(target) && !allow_production_restore?
-        raise ConfigurationError, "refusing production-looking restore target #{target}; set KAMAL_BACKUP_ALLOW_PRODUCTION_RESTORE=true to override"
+      if production_like_target?(target)
+        raise ConfigurationError, "refusing production-looking restore target #{target}; choose a scratch target that does not look like production"
       end
     end
 
@@ -384,8 +379,8 @@ module KamalBackup
         if environment = local_restore_environment
           key, value = environment
 
-          if production_environment?(value) && !allow_production_restore?
-            raise ConfigurationError, "restore local refuses to run with #{key}=#{value}; set KAMAL_BACKUP_ALLOW_PRODUCTION_RESTORE=true to override"
+          if production_environment?(value)
+            raise ConfigurationError, "restore local refuses to run with #{key}=#{value}; unset #{key} or use restore production"
           end
         end
       end

data/lib/kamal_backup/databases/sqlite.rb

@@ -1,6 +1,5 @@
 require "fileutils"
 require "tempfile"
-require "uri"
 require_relative "base"
 
 module KamalBackup
@@ -18,7 +17,10 @@ module KamalBackup
         source = sqlite_source
         Tempfile.create(["kamal-backup-", ".sqlite3"]) do |tempfile|
           tempfile.close
-          backup_to_file(source, tempfile.path)
+          Command.capture(
+            CommandSpec.new(argv: ["sqlite3", source, ".backup #{sqlite_literal(tempfile.path)}"]),
+            redactor: redactor
+          )
           restic.backup_file(
             tempfile.path,
             filename: database_filename(timestamp),
@@ -53,40 +55,6 @@ module KamalBackup
           config.required_value("SQLITE_DATABASE_PATH")
         end
 
-        def backup_to_file(source, target)
-          run_backup(source, target)
-        rescue CommandError => e
-          raise unless immutable_retry_safe?(source, e)
-
-          # Immutable mode skips WAL change detection, so only use it when no WAL sidecar exists.
-          run_backup(sqlite_immutable_uri(source), target)
-        end
-
-        def run_backup(source, target)
-          Command.capture(
-            CommandSpec.new(argv: ["sqlite3", source, ".backup #{sqlite_literal(target)}"]),
-            redactor: redactor
-          )
-        end
-
-        def immutable_retry_safe?(source, error)
-          readonly_database_error?(error) &&
-            !File.exist?("#{source}-wal") &&
-            !File.exist?("#{source}-shm")
-        end
-
-        def readonly_database_error?(error)
-          error.stderr.include?("readonly database") || error.message.include?("readonly database")
-        end
-
-        def sqlite_immutable_uri(source)
-          path = File.expand_path(source).split("/").map do |part|
-            URI.encode_www_form_component(part).gsub("+", "%20")
-          end.join("/")
-
-          "file:#{path}?immutable=1"
-        end
-
         def validate_scratch_restore_target(target)
           if File.expand_path(sqlite_source) == File.expand_path(target)
             raise ConfigurationError, "scratch SQLite path must differ from SQLITE_DATABASE_PATH"

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - crmne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor