kamal-backup 0.3.0.beta1 → 0.3.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2281a21cf479b89029c45b98996ab6284d4077cbd6c5689c80a5b3eba7a28ee5
-  data.tar.gz: 2390560f1249e650b178f8fa9986ca12ec06e89c003aab8dc9f68d6e64d8fab3
+  metadata.gz: a1361a5b9b6637aa96a0de2f2407bca63f2dd6d253cede1595c2ebac8f55b578
+  data.tar.gz: 74f156851335e88d5a36756fb43018e5f498b152cd2a00742cdd6eb425f623dd
 SHA512:
-  metadata.gz: 54bbd60fb5e69186de9e2b85d1c9b390d3feda54c074722dae8c2358df5fd6a25a184e8ff237cae08d2dba0628769ee48933abcd0330bf398620e67bde7ae0b0
-  data.tar.gz: df0487cab9ab8bc0c1f06aa40587ad39ce3e9b3bcea92be45616668f357debb037dda6308dba4c8d24296a95c56d09db4ad77123e5c996e5f12c23851ccb3bf2
+  metadata.gz: 43b1f8c585ddd0e4c9f0df96ea243d736ac5e9e565c12382816b6329ad3054746c47b42c72e269bc199daba7985af8d75efcfbeb5ec2bd09b54c2d9877b511aa
+  data.tar.gz: b08fe68ed2474db14330819700af6f6d499d2d53d27721becf92cf03cc59a7239fba2c30087bd3bc7bdc552de87ec3a4cad9411fbda71b148488b91a8aea7d23

data/lib/kamal_backup/config.rb

@@ -592,6 +592,8 @@ module KamalBackup
           end
         end
 
+        env.merge!(normalize_yaml_restic_rest(hash["rest"], raw_env: raw_env, path: path)) if hash.key?("rest")
+
         {
           "init_if_missing" => "RESTIC_INIT_IF_MISSING",
           "check_after_backup" => "RESTIC_CHECK_AFTER_BACKUP",
@@ -635,6 +637,16 @@ module KamalBackup
         end
       end
 
+      def normalize_yaml_restic_rest(raw_value, raw_env:, path:)
+        hash = require_mapping(raw_value, "#{path} restic.rest")
+        env = {}
+        username = hash.key?("username") ? hash["username"] : hash["user"]
+
+        env["RESTIC_REST_USERNAME"] = resolve_yaml_value(username, raw_env: raw_env, context: "#{path} restic.rest.username") if username
+        env["RESTIC_REST_PASSWORD"] = resolve_yaml_value(hash["password"], raw_env: raw_env, context: "#{path} restic.rest.password") if hash.key?("password")
+        env.compact
+      end
+
       def normalize_yaml_backup(raw_value, path:)
         hash = require_mapping(raw_value, "#{path} backup")
         env = {}

data/lib/kamal_backup/kamal_bridge.rb

@@ -1,3 +1,4 @@
+require "shellwords"
 require "yaml"
 require_relative "command"
 
@@ -147,10 +148,15 @@ module KamalBackup
 
       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?
+          tokens = Shellwords.split(line.chomp)
+          tokens.shift if tokens.first == "export"
 
-          secrets[key] = value.to_s
+          tokens.each do |assignment|
+            key, value = assignment.split("=", 2)
+            next if key.to_s.empty? || value.nil?
+
+            secrets[key] = value.to_s
+          end
         end
       end
 

data/lib/kamal_backup/version.rb

@@ -1,3 +1,3 @@
 module KamalBackup
-  VERSION = "0.3.0.beta1"
+  VERSION = "0.3.0.beta3"
 end

metadata

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