kamal-backup 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b890ee6ff8e37a722f17ea92270d01c6c106fec2a523bf601b8016790646b4
-  data.tar.gz: 4ac9df9a5f7e9b6b7c9a4b5cab76d23c0555a237885579c5e6ada74968ac1ab6
+  metadata.gz: c69dd196192b66424004ae3769d75602862227ad958e056288e1cb49b8242a8a
+  data.tar.gz: fa70cfffdf1d95212700244fcdfbb5e7b72b8f4eaf27f2898177c16c305fe9d8
 SHA512:
-  metadata.gz: 5f0e231df821c0dae8bcb570fe9a41a221d9e8561fee88b57228de6f045c6fdbc211030e0aae27b8072c881e76714c0665aa26e3daf73f6eff5b8046b955cfdf
-  data.tar.gz: b86e898c00cd2676a62d91e8c28b207128894907795a483a420280dbedc5c3040e230ad66e6f23fc97831300e2e7805466ab51dd9e7baefd8164b4e49c6dda8e
+  metadata.gz: c1764bd5d9a81b9d705838a27f857a679efebe7b2c3ff64be0f4faffc440678e1958124f0cb8ca81c24fa5e30380324d20d42447ae20e5b33f7d946eab7dcec4
+  data.tar.gz: f929aecfd15c9b2ed34560292217a97e4ceff31fd4fad1b9ce0e2589af862cd725a45a275c3755ddc744bb8f0e8703c187aa96537664431b93cc4a2841ae4627

data/lib/kamal_backup/restic.rb

@@ -6,6 +6,8 @@ require_relative "command"
 
 module KamalBackup
   class Restic
+    RESTIC_ENV_PATTERN = /\A(?:RESTIC_|AWS_|B2_|AZURE_|GOOGLE_|RCLONE_|OS_|ST_|HP_|HTTP_|HTTPS_|NO_PROXY)/i
+
     attr_reader :config, :redactor
 
     def initialize(config, redactor:)
@@ -25,13 +27,19 @@ module KamalBackup
     end
 
     def backup_stream(command, filename:, tags:)
-      restic_command = CommandSpec.new(argv: ["restic", "backup", "--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags))
+      restic_command = CommandSpec.new(
+        argv: ["restic", "backup", "--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags),
+        env: restic_env
+      )
       log("backing up stream as #{filename}")
       pipe_commands(command, restic_command, producer_label: "dump", consumer_label: "restic backup")
     end
 
     def backup_file(path, filename:, tags:)
-      command = CommandSpec.new(argv: ["restic", "backup", "--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags))
+      command = CommandSpec.new(
+        argv: ["restic", "backup", "--stdin", "--stdin-filename", filename] + tag_args(common_tags + tags),
+        env: restic_env
+      )
       log("backing up file content as #{filename}")
 
       File.open(path, "rb") do |file|
@@ -126,12 +134,12 @@ module KamalBackup
     end
 
     def pipe_dump_to_command(snapshot, filename, command)
-      restic_command = CommandSpec.new(argv: ["restic", "dump", snapshot, filename])
+      restic_command = CommandSpec.new(argv: ["restic", "dump", snapshot, filename], env: restic_env)
       pipe_commands(restic_command, command, producer_label: "restic dump", consumer_label: command.argv.first)
     end
 
     def write_dump_to_path(snapshot, filename, target_path)
-      command = CommandSpec.new(argv: ["restic", "dump", snapshot, filename])
+      command = CommandSpec.new(argv: ["restic", "dump", snapshot, filename], env: restic_env)
       target_path = File.expand_path(target_path)
       FileUtils.mkdir_p(File.dirname(target_path))
       temp_path = "#{target_path}.kamal-backup-#{$$}.tmp"
@@ -160,7 +168,7 @@ module KamalBackup
     end
 
     def run(args)
-      Command.capture(CommandSpec.new(argv: ["restic"] + args), redactor: redactor)
+      Command.capture(CommandSpec.new(argv: ["restic"] + args, env: restic_env), redactor: redactor)
     end
 
     def common_tags
@@ -172,6 +180,12 @@ module KamalBackup
         tags.compact.each_with_object([]) { |tag, args| args.concat(["--tag", tag]) }
       end
 
+      def restic_env
+        config.env.each_with_object({}) do |(key, value), env|
+          env[key] = value if key.to_s.match?(RESTIC_ENV_PATTERN)
+        end
+      end
+
       def pipe_commands(producer, consumer, producer_label:, consumer_label:)
         Open3.popen3(producer.env, *producer.argv) do |producer_stdin, producer_stdout, producer_stderr, producer_wait|
           producer_stdin.close

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kamal-backup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - crmne