Merge pull request #650 from puppetlabs/CAT-2228

(CAT-2228) Update legacy facts
puppetlabs · Feb 26, 2025 · 0867f2b · 0867f2b
2 parents de3f6ba + f5d229e
commit 0867f2b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/facter/vcsrepo_svn_ver.rb b/lib/facter/vcsrepo_svn_ver.rb
@@ -2,7 +2,7 @@
 
 Facter.add(:vcsrepo_svn_ver) do
   setcode do
-    if Facter.value(:operatingsystem) == 'Darwin' && !File.directory?(Facter::Core::Execution.execute('xcode-select -p'))
+    if Facter.value(:'os.name') == 'Darwin' && !File.directory?(Facter::Core::Execution.execute('xcode-select -p'))
       ''
     else
       version = Facter::Core::Execution.execute('svn --version --quiet')

diff --git a/lib/puppet/provider/vcsrepo/dummy.rb b/lib/puppet/provider/vcsrepo/dummy.rb
@@ -6,7 +6,7 @@
   desc 'Dummy default provider'
 
   defaultfor feature: :posix
-  defaultfor operatingsystem: :windows
+  defaultfor 'os.name': :windows
 
   def working_copy_exists?
     providers = begin

diff --git a/spec/unit/facter/vcsrepo_svn_ver_spec.rb b/spec/unit/facter/vcsrepo_svn_ver_spec.rb
@@ -10,7 +10,7 @@
   describe 'vcsrepo_svn_ver' do
     context 'with valid value' do
       before :each do
-        allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD')
+        allow(Facter.fact(:'os.name')).to receive(:value).and_return('OpenBSD')
         allow(Facter::Core::Execution).to receive(:execute)
           .with('svn --version --quiet')
           .and_return('1.7.23')