kamal-backup 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c69dd196192b66424004ae3769d75602862227ad958e056288e1cb49b8242a8a
-  data.tar.gz: fa70cfffdf1d95212700244fcdfbb5e7b72b8f4eaf27f2898177c16c305fe9d8
+  metadata.gz: dfb6c6c9e7956edddb88036298071e47511a29cd062fbaa2553f89d9a310dfaa
+  data.tar.gz: fc3f699dcd1daa667cb4fd984729c9adf9b9e762d99c0716da5869da236c3bc9
 SHA512:
-  metadata.gz: c1764bd5d9a81b9d705838a27f857a679efebe7b2c3ff64be0f4faffc440678e1958124f0cb8ca81c24fa5e30380324d20d42447ae20e5b33f7d946eab7dcec4
-  data.tar.gz: f929aecfd15c9b2ed34560292217a97e4ceff31fd4fad1b9ce0e2589af862cd725a45a275c3755ddc744bb8f0e8703c187aa96537664431b93cc4a2841ae4627
+  metadata.gz: 640dc10b40aa46159391cac4f73567746ccd845359d10dae443b500234136ca43962fbc83353308e14809a5c9c1d3a51ebe35e9b6b3bc517b204183968d2d2e5
+  data.tar.gz: 7637ff0dc17cdf53968ad8b0ca4908ac1cdb62cfa119fd489b2c3a639c19479176532c3437b82955226111da04826a6546670b8f3b6b66e4292dac955a13774b

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,12 @@ 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, cwd: Dir.pwd)
       @redactor = redactor
       @config_file = config_file
       @destination = destination
+      @env = env
+      @cwd = cwd
     end
 
     def accessory_name(preferred: nil)
@@ -104,23 +106,61 @@ 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
 
       def kamal_config_argv
         [
-          "kamal",
+          *kamal_command,
           "config",
           *kamal_option_argv,
           "--version",
@@ -130,7 +170,7 @@ module KamalBackup
 
       def kamal_exec_argv(accessory_name, command)
         [
-          "kamal",
+          *kamal_command,
           "accessory",
           "exec",
           accessory_name,
@@ -139,6 +179,25 @@ module KamalBackup
         ]
       end
 
+      def kamal_secrets_print_argv
+        [
+          *kamal_command,
+          "secrets",
+          "print",
+          *kamal_option_argv
+        ]
+      end
+
+      def kamal_command
+        if File.executable?(File.join(@cwd, "bin", "kamal"))
+          [ "bin/kamal" ]
+        elsif File.file?(File.join(@cwd, "Gemfile"))
+          [ "bundle", "exec", "kamal" ]
+        else
+          [ "kamal" ]
+        end
+      end
+
       def kamal_option_argv
         argv = []
         argv.concat(["-c", @config_file]) if @config_file

data/lib/kamal_backup/version.rb

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

metadata

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