kamal-backup 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b890ee6ff8e37a722f17ea92270d01c6c106fec2a523bf601b8016790646b4
-  data.tar.gz: 4ac9df9a5f7e9b6b7c9a4b5cab76d23c0555a237885579c5e6ada74968ac1ab6
+  metadata.gz: 49afc009b695f3cf7f456e1b68b2b744f5adc7138f7ca4d0c84ffb1f0d3b766d
+  data.tar.gz: fc0261dc6c744a19e02460f27aab7e8f7555de779ea1fe7827a2fdf077042071
 SHA512:
-  metadata.gz: 5f0e231df821c0dae8bcb570fe9a41a221d9e8561fee88b57228de6f045c6fdbc211030e0aae27b8072c881e76714c0665aa26e3daf73f6eff5b8046b955cfdf
-  data.tar.gz: b86e898c00cd2676a62d91e8c28b207128894907795a483a420280dbedc5c3040e230ad66e6f23fc97831300e2e7805466ab51dd9e7baefd8164b4e49c6dda8e
+  metadata.gz: 39839b0f31f1e5a9bf561e63ee2248330d1857f5f21c2736e1668aed2e226c79e3c6063c6195a6bb09e05c180bfd42a6cd6901271638e3dbba2a36ab8146844f
+  data.tar.gz: 3bb459e3ff320cff130ac29c523a09c50b85b3efb98ad977410cdd2db0a53e333fce935f8a92aaa65325b7d421ce36be4ed92c49a6f46d5836184f2a4009e94e

data/lib/kamal_backup/cli.rb

@@ -64,7 +64,8 @@ module KamalBackup
         @bridge ||= KamalBridge.new(
           redactor: redactor,
           config_file: options[:config_file],
-          destination: options[:destination]
+          destination: options[:destination],
+          env: command_env
         )
       end
 

data/lib/kamal_backup/kamal_bridge.rb

@@ -6,10 +6,11 @@ module KamalBackup
     DEFAULT_CONFIG_FILE = "config/deploy.yml"
     VERSION_LINE_PATTERN = /\A\d+(?:\.\d+)+(?:[-.][A-Za-z0-9]+)*\z/
 
-    def initialize(redactor:, config_file: nil, destination: nil)
+    def initialize(redactor:, config_file: nil, destination: nil, env: ENV)
       @redactor = redactor
       @config_file = config_file
       @destination = destination
+      @env = env
     end
 
     def accessory_name(preferred: nil)
@@ -104,16 +105,54 @@ module KamalBackup
       def normalize_secret_env(values)
         case values
         when Hash
-          values.each_with_object({}) { |(key, _value), env| env[key.to_s] = "configured" }
+          values.each_with_object({}) do |(key, secret_key), env|
+            add_resolved_secret(env, target: key, source: secret_key)
+          end
         when Array
-          values.each_with_object({}) { |key, env| env[key.to_s] = "configured" }
+          values.each_with_object({}) do |entry, env|
+            target, source = parse_secret_entry(entry)
+            add_resolved_secret(env, target: target, source: source)
+          end
         when String, Symbol
-          { values.to_s => "configured" }
+          {}.tap do |env|
+            target, source = parse_secret_entry(values)
+            add_resolved_secret(env, target: target, source: source)
+          end
         else
           {}
         end
       end
 
+      def parse_secret_entry(entry)
+        target, source = entry.to_s.split(":", 2)
+        [ target, source || target ]
+      end
+
+      def add_resolved_secret(env, target:, source:)
+        if value = resolved_secret(source)
+          env[target.to_s] = value
+        end
+      end
+
+      def resolved_secret(key)
+        raw = resolved_secrets[key.to_s] || @env[key.to_s]
+        value = raw.to_s.strip
+        value.empty? ? nil : value
+      end
+
+      def resolved_secrets
+        @resolved_secrets ||= parse_secret_output(capture_kamal(kamal_secrets_print_argv).stdout)
+      end
+
+      def parse_secret_output(output)
+        output.to_s.lines.each_with_object({}) do |line, secrets|
+          key, value = line.chomp.split("=", 2)
+          next if key.to_s.empty?
+
+          secrets[key] = value.to_s
+        end
+      end
+
       def fetch(hash, key)
         hash[key] || hash[key.to_s] || hash[key.to_sym]
       end
@@ -139,6 +178,15 @@ module KamalBackup
         ]
       end
 
+      def kamal_secrets_print_argv
+        [
+          "kamal",
+          "secrets",
+          "print",
+          *kamal_option_argv
+        ]
+      end
+
       def kamal_option_argv
         argv = []
         argv.concat(["-c", @config_file]) if @config_file

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.2"
 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.2
 platform: ruby
 authors:
 - crmne