(#493) use correct configuration keys

choria-legacy · Dec 14, 2018 · 2846455 · 2846455
1 parent 84d39ba
commit 2846455
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/lib/mcollective/util/choria.rb b/lib/mcollective/util/choria.rb
@@ -669,7 +669,7 @@ def ssl_dir
 
       # Determines the security provider
       def security_provider
-        get_option("choria.security.provider", "puppet")
+        get_option("security.provider", "puppet")
       end
 
       # Determines if the file security provider is enabled
@@ -687,7 +687,7 @@ def puppet_security?
       # @note paths determined by Puppet AIO packages
       # @return [String]
       def client_public_cert
-        return get_option("choria.security.file.certificate", "") if file_security?
+        return get_option("security.file.certificate", "") if file_security?
 
         File.join(ssl_dir, "certs", "%s.pem" % certname)
       end
@@ -704,7 +704,7 @@ def has_client_public_cert?
       # @note paths determined by Puppet AIO packages
       # @return [String]
       def client_private_key
-        return get_option("choria.security.file.key", "") if file_security?
+        return get_option("security.file.key", "") if file_security?
 
         File.join(ssl_dir, "private_keys", "%s.pem" % certname)
       end
@@ -720,7 +720,7 @@ def has_client_private_key?
       #
       # @return [String]
       def ca_path
-        return get_option("choria.security.file.ca", "") if file_security?
+        return get_option("security.file.ca", "") if file_security?
 
         File.join(ssl_dir, "certs", "ca.pem")
       end

diff --git a/spec/unit/mcollective/util/choria_spec.rb b/spec/unit/mcollective/util/choria_spec.rb
@@ -9,15 +9,15 @@ module Util
       describe "#file_security?" do
         it "should detect file security settings" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "file"
+            "security.provider" => "file"
           )
 
           expect(choria.file_security?).to be(true)
         end
 
         it "should be false otherwise" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "puppet"
+            "security.provider" => "puppet"
           )
 
           expect(choria.file_security?).to be(false)
@@ -34,15 +34,15 @@ module Util
 
         it "should detect puppet security settings" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "puppet"
+            "security.provider" => "puppet"
           )
 
           expect(choria.puppet_security?).to be(true)
         end
 
         it "should be false when not puppet" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "file"
+            "security.provider" => "file"
           )
 
           expect(choria.puppet_security?).to be(false)
@@ -667,7 +667,7 @@ module Util
 
         it "should support the file security provider" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "file"
+            "security.provider" => "file"
           )
 
           FileUtils.expects(:mkdir_p).never
@@ -685,7 +685,7 @@ module Util
 
         it "should support the file security provider" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "file"
+            "security.provider" => "file"
           )
 
           expect(choria.csr_path).to eq("")
@@ -700,8 +700,8 @@ module Util
 
         it "should support the file security provider" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "file",
-            "choria.security.file.ca" => "/ssl/ca.pem"
+            "security.provider" => "file",
+            "security.file.ca" => "/ssl/ca.pem"
           )
 
           expect(choria.ca_path).to eq("/ssl/ca.pem")
@@ -717,8 +717,8 @@ module Util
 
         it "should support file security provider" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "file",
-            "choria.security.file.certificate" => "/ssl/rspec.pem"
+            "security.provider" => "file",
+            "security.file.certificate" => "/ssl/rspec.pem"
           )
 
           expect(choria.client_public_cert).to eq("/ssl/rspec.pem")
@@ -734,8 +734,8 @@ module Util
 
         it "should support the file security provider" do
           Config.instance.stubs(:pluginconf).returns(
-            "choria.security.provider" => "file",
-            "choria.security.file.key" => "/ssl/rspec-key.pem"
+            "security.provider" => "file",
+            "security.file.key" => "/ssl/rspec-key.pem"
           )
 
           expect(choria.client_private_key).to eq("/ssl/rspec-key.pem")