Use valid_displayname? unless cat is PrivilegeRights (#4)

* Use valid_displayname? unless cat is PrivilegeRights * Adapt spec tests
camptocamp · Aug 5, 2020 · 2b78dd7 · 2b78dd7
1 parent d910a63
commit 2b78dd7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/puppet/parameter/windows_securityoptions_name.rb b/lib/puppet/parameter/windows_securityoptions_name.rb
@@ -12,8 +12,15 @@ def self.category(&block)
   end
 
   def unsafe_validate(value)
-    cat = self.class.category.to_s
-    raise ArgumentError, "Invalid display name: '#{value}'" unless PuppetX::Securityoptions::Mappingtables.new.valid_displayname?(value, cat)
+    cat = self.class.category
+
+    if cat == :PrivilegeRights
+      raise ArgumentError, "Invalid name: '#{value}'" \
+        unless PuppetX::Securityoptions::Mappingtables.new.valid_name?(value, cat.to_s)
+    else
+      raise ArgumentError, "Invalid display name: '#{value}'" \
+        unless PuppetX::Securityoptions::Mappingtables.new.valid_displayname?(value, cat.to_s)
+    end
   end
 
   munge do |value|

diff --git a/spec/unit/puppet/type/so_privilegerights_spec.rb b/spec/unit/puppet/type/so_privilegerights_spec.rb
@@ -2,7 +2,7 @@
 
 describe Puppet::Type.type(:so_privilegerights) do
   let(:invalid_name) { 'Manage invalide privilege right name' }
-  let(:valid_name) { 'Access this computer from the network' }
+  let(:valid_name) { 'SeNetworkLogonRight' }
 
   context 'when using namevar' do
     it 'has a namevar' do
@@ -17,7 +17,7 @@
         described_class.new(
           name: invalid_name,
         )
-      }.to raise_error(Puppet::ResourceError, %r{Invalid display name: \'Manage invalide privilege right name\'})
+      }.to raise_error(Puppet::ResourceError, %r{Invalid name: \'Manage invalide privilege right name\'})
     end
 
     it 'passes with a valid name' do