Merge pull request #80 from tvpartytonight/PA-5966

Stop using legacy facts

Author: joshcooper

lib/puppet/provider/sshkey/parsed.rb

@@ -33,10 +33,10 @@ def title
   end
 
   def self.default_target
-    case Facter.value(:operatingsystem)
+    case Facter.value('os.name')
     when 'Darwin'
       # Versions 10.11 and up use /etc/ssh/ssh_known_hosts
-      version = Facter.value(:macosx_productversion_major)
+      version = Facter.value('os.macosx.version.major')
       if version
         if Puppet::Util::Package.versioncmp(version, '10.11') >= 0
           '/etc/ssh/ssh_known_hosts'

spec/unit/provider/sshkey/parsed_spec.rb

@@ -72,22 +72,22 @@ def key
   context 'default ssh_known_hosts target path' do
     ['9.10', '9.11', '10.10'].each do |version|
       it 'is `/etc/ssh_known_hosts` when OSX version 10.10 or older`' do
-        expect(Facter).to receive(:value).with(:operatingsystem).and_return('Darwin')
-        expect(Facter).to receive(:value).with(:macosx_productversion_major).and_return(version)
+        expect(Facter).to receive(:value).with('os.name').and_return('Darwin')
+        expect(Facter).to receive(:value).with('os.macosx.version.major').and_return(version)
         expect(subject.default_target).to eq('/etc/ssh_known_hosts')
       end
     end
 
     ['10.11', '10.13', '11.0', '11.11'].each do |version|
       it 'is `/etc/ssh/ssh_known_hosts` when OSX version 10.11 or newer`' do
-        expect(Facter).to receive(:value).with(:operatingsystem).and_return('Darwin')
-        expect(Facter).to receive(:value).with(:macosx_productversion_major).and_return(version)
+        expect(Facter).to receive(:value).with('os.name').and_return('Darwin')
+        expect(Facter).to receive(:value).with('os.macosx.version.major').and_return(version)
         expect(subject.default_target).to eq('/etc/ssh/ssh_known_hosts')
       end
     end
 
     it 'is `/etc/ssh/ssh_known_hosts` on other operating systems' do
-      expect(Facter).to receive(:value).with(:operatingsystem).and_return('RedHat')
+      expect(Facter).to receive(:value).with('os.name').and_return('RedHat')
       expect(subject.default_target).to eq('/etc/ssh/ssh_known_hosts')
     end
   end