Merge pull request #610 from puppetlabs/unused-lsb

apt/params: Remove unused LSB facts

diff --git a/manifests/key.pp b/manifests/key.pp
index 8fbb47abd0b846aa9fd4ef47a6b46c60e73df1f4..914ec88ca4e92f1861899a76c33cd7938b6e76de 100644 (file)
--- a/manifests/key.pp
+++ b/manifests/key.pp
@@ -49,7 +49,7 @@ define apt::key (
   }
 
   validate_re($_id, ['\A(0x)?[0-9a-fA-F]{8}\Z', '\A(0x)?[0-9a-fA-F]{16}\Z', '\A(0x)?[0-9a-fA-F]{40}\Z'])
-  validate_re($ensure, ['\Aabsent|present\Z',])
+  validate_re($ensure, ['\A(absent|present)\Z',])
 
   if $_content {
     validate_string($_content)

diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
index d4a85a4150e1bd8559931377e2f80a9bdc4d5698..14a3efbc5aadbfeb8527c48b858ca4b39b6f3848 100644 (file)
--- a/spec/defines/key_spec.rb
+++ b/spec/defines/key_spec.rb
@@ -268,13 +268,15 @@ describe 'apt::key' do
     end
 
     context 'invalid ensure' do
-      let :params do
-        {
-          :ensure => 'foo',
-        }
-      end
-      it 'fails' do
-        expect { subject.call }.to raise_error(/does not match/)
+      %w(foo aabsent absenta apresent presenta).each do |param|
+        let :params do
+          {
+            :ensure => param,
+          }
+          end
+        it 'fails' do
+          expect { subject.call }.to raise_error(/does not match/)
+        end
       end
     end