Fix secrets adapters failing fetch on Windows

lib/kamal/secrets/adapters/aws_secrets_manager.rb

@@ -45,7 +45,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `aws --version 2> /dev/null`
+      system("aws --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/bitwarden.rb

@@ -75,7 +75,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `bw --version 2> /dev/null`
+      system("bw --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/bitwarden_secrets_manager.rb

@@ -66,7 +66,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `bws --version 2> /dev/null`
+      system("bws --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/doppler.rb

@@ -12,7 +12,7 @@ def login(*)
     end
 
     def loggedin?
-      `doppler me --json 2> /dev/null`
+      system("doppler me --json", err: File::NULL)
       $?.success?
     end
 
@@ -51,7 +51,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `doppler --version 2> /dev/null`
+      system("doppler --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/enpass.rb

@@ -27,7 +27,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `enpass-cli version 2> /dev/null`
+      system("enpass-cli version", err: File::NULL)
       $?.success?
     end
 

lib/kamal/secrets/adapters/gcp_secret_manager.rb

@@ -94,7 +94,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `gcloud --version 2> /dev/null`
+      system("gcloud --version", err: File::NULL)
       $?.success?
     end
 

lib/kamal/secrets/adapters/last_pass.rb

@@ -34,7 +34,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `lpass --version 2> /dev/null`
+      system("lpass --version", err: File::NULL)
       $?.success?
     end
 end

lib/kamal/secrets/adapters/one_password.rb

@@ -11,7 +11,7 @@ def login(account)
     end
 
     def loggedin?(account)
-      `op account get --account #{account.shellescape} 2> /dev/null`
+      system("op account get --account #{account.shellescape}", err: File::NULL)
       $?.success?
     end
 
@@ -64,7 +64,7 @@ def check_dependencies!
     end
 
     def cli_installed?
-      `op --version 2> /dev/null`
+      system("op --version", err: File::NULL)
       $?.success?
     end
 end

test/secrets/aws_secrets_manager_adapter_test.rb

@@ -2,8 +2,8 @@
 
 class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   test "fails when errors are present" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list unknown1 unknown2 --profile default --output json")
       .returns(<<~JSON)
         {
@@ -31,8 +31,8 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list secret/KEY1 secret/KEY2 secret2/KEY3 --profile default --output json")
       .returns(<<~JSON)
         {
@@ -65,17 +65,17 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
     json = JSON.parse(shellunescape(run_command("fetch", "secret/KEY1", "secret/KEY2", "secret2/KEY3")))
 
     expected_json = {
-      "secret/KEY1"=>"VALUE1",
-      "secret/KEY2"=>"VALUE2",
-      "secret2/KEY3"=>"VALUE3"
+      "secret/KEY1" => "VALUE1",
+      "secret/KEY2" => "VALUE2",
+      "secret2/KEY3" => "VALUE3"
     }
 
     assert_equal expected_json, json
   end
 
   test "fetch with string value" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list secret secret2/KEY1 --profile default --output json")
       .returns(<<~JSON)
         {
@@ -108,16 +108,16 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
     json = JSON.parse(shellunescape(run_command("fetch", "secret", "secret2/KEY1")))
 
     expected_json = {
-      "secret"=>"a-string-secret",
-      "secret2/KEY2"=>"VALUE2"
+      "secret" => "a-string-secret",
+      "secret2/KEY2" => "VALUE2"
     }
 
     assert_equal expected_json, json
   end
 
   test "fetch with secret names" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list secret/KEY1 secret/KEY2 --profile default --output json")
       .returns(<<~JSON)
         {
@@ -140,15 +140,15 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
     json = JSON.parse(shellunescape(run_command("fetch", "--from", "secret", "KEY1", "KEY2")))
 
     expected_json = {
-      "secret/KEY1"=>"VALUE1",
-      "secret/KEY2"=>"VALUE2"
+      "secret/KEY1" => "VALUE1",
+      "secret/KEY2" => "VALUE2"
     }
 
     assert_equal expected_json, json
   end
 
   test "fetch without CLI installed" do
-    stub_ticks_with("aws --version 2> /dev/null", succeed: false)
+    stub_command_with("aws --version", false, :system)
 
     error = assert_raises RuntimeError do
       JSON.parse(shellunescape(run_command("fetch", "SECRET1")))
@@ -157,8 +157,8 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
   end
 
   test "fetch without account option omits --profile" do
-    stub_ticks.with("aws --version 2> /dev/null")
-    stub_ticks
+    stub_command(:system).with("aws --version", err: File::NULL)
+    stub_command
       .with("aws secretsmanager batch-get-secret-value --secret-id-list secret/KEY1 secret/KEY2 --output json")
       .returns(<<~JSON)
         {
@@ -181,20 +181,21 @@ class AwsSecretsManagerAdapterTest < SecretAdapterTestCase
     json = JSON.parse(shellunescape(run_command("fetch", "--from", "secret", "KEY1", "KEY2", account: nil)))
 
     expected_json = {
-      "secret/KEY1"=>"VALUE1",
-      "secret/KEY2"=>"VALUE2"
+      "secret/KEY1" => "VALUE1",
+      "secret/KEY2" => "VALUE2"
     }
     assert_equal expected_json, json
   end
 
   private
-    def run_command(*command, account: "default")
-      stdouted do
-        args = [ *command,
-                "-c", "test/fixtures/deploy_with_accessories.yml",
-                "--adapter", "aws_secrets_manager" ]
-        args += [ "--account", account ] if account
-        Kamal::Cli::Secrets.start(args)
-      end
+
+  def run_command(*command, account: "default")
+    stdouted do
+      args = [ *command,
+        "-c", "test/fixtures/deploy_with_accessories.yml",
+        "--adapter", "aws_secrets_manager" ]
+      args += [ "--account", account ] if account
+      Kamal::Cli::Secrets.start(args)
     end
+  end
 end