From 3f37fea7c33fa55e5c31df7899b34df72b30c0a1 Mon Sep 17 00:00:00 2001
From: Donal McBreen <dmcbreen@37signals.com>
Date: Wed, 7 Aug 2024 15:39:12 +0100
Subject: [PATCH] Configuration::Secrets -> Secrets

---
 lib/kamal/configuration.rb               | 2 +-
 lib/kamal/{configuration => }/secrets.rb | 2 +-
 test/cli/secrets_test.rb                 | 0
 test/configuration/env_test.rb           | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename lib/kamal/{configuration => }/secrets.rb (93%)
 create mode 100644 test/cli/secrets_test.rb

diff --git a/lib/kamal/configuration.rb b/lib/kamal/configuration.rb
index c5133f9a..4ed1d56f 100644
--- a/lib/kamal/configuration.rb
+++ b/lib/kamal/configuration.rb
@@ -254,7 +254,7 @@ class Kamal::Configuration
   end
 
   def secrets
-    @secrets ||= Secrets.new(destination: destination)
+    @secrets ||= Kamal::Secrets.new(destination: destination)
   end
 
   private
diff --git a/lib/kamal/configuration/secrets.rb b/lib/kamal/secrets.rb
similarity index 93%
rename from lib/kamal/configuration/secrets.rb
rename to lib/kamal/secrets.rb
index 088e54d5..e195cc37 100644
--- a/lib/kamal/configuration/secrets.rb
+++ b/lib/kamal/secrets.rb
@@ -1,4 +1,4 @@
-class Kamal::Configuration::Secrets
+class Kamal::Secrets
   attr_reader :secrets_file
 
   def initialize(destination: nil)
diff --git a/test/cli/secrets_test.rb b/test/cli/secrets_test.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/test/configuration/env_test.rb b/test/configuration/env_test.rb
index c3f0b929..b4e924a7 100644
--- a/test/configuration/env_test.rb
+++ b/test/configuration/env_test.rb
@@ -28,7 +28,7 @@ class ConfigurationEnvTest < ActiveSupport::TestCase
       "secret" => [ "PASSWORD" ]
     }
 
-    assert_raises(Kamal::ConfigurationError) { Kamal::Configuration::Env.new(config: { "secret" => [ "PASSWORD" ] }, secrets: Kamal::Configuration::Secrets.new).args }
+    assert_raises(Kamal::ConfigurationError) { Kamal::Configuration::Env.new(config: { "secret" => [ "PASSWORD" ] }, secrets: Kamal::Secrets.new).args }
   end
 
   test "secret and clear" do
@@ -49,7 +49,7 @@ class ConfigurationEnvTest < ActiveSupport::TestCase
 
   private
     def assert_config(config:, results:)
-      env = Kamal::Configuration::Env.new config: config, secrets: Kamal::Configuration::Secrets.new
+      env = Kamal::Configuration::Env.new config: config, secrets: Kamal::Secrets.new
       expected_args = results.to_a.flat_map { |key, value| [ "--env", "#{key}=\"#{value}\"" ] }
       assert_equal expected_args, env.args.map(&:to_s) #  to_s removes the redactions
     end