switch from legacy to structured facts

voxpupuli · Sep 18, 2024 · d877511 · d877511
1 parent 88b4e9c
commit d877511
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/lib/puppet/provider/alternative_entry/chkconfig.rb b/lib/puppet/provider/alternative_entry/chkconfig.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Puppet::Type.type(:alternative_entry).provide(:chkconfig) do
-  confine osfamily: :redhat
-  defaultfor osfamily: :redhat
+  confine 'os.family' => :redhat
+  defaultfor 'os.family' => :redhat
 
   commands update: '/usr/sbin/alternatives'
 

diff --git a/lib/puppet/provider/alternative_entry/dpkg.rb b/lib/puppet/provider/alternative_entry/dpkg.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Puppet::Type.type(:alternative_entry).provide(:dpkg) do
-  confine osfamily: %i[debian suse]
-  defaultfor [operatingsystem: %i[debian ubuntu], osfamily: :suse]
+  confine 'os.family' => %i[debian suse]
+  defaultfor ['os.name' => %i[debian ubuntu], 'os.family' => :suse]
 
   commands update: 'update-alternatives'
 

diff --git a/lib/puppet/provider/alternatives/chkconfig.rb b/lib/puppet/provider/alternatives/chkconfig.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Puppet::Type.type(:alternatives).provide(:chkconfig) do
-  confine osfamily: :redhat
-  defaultfor osfamily: :redhat
+  confine 'os.family' => :redhat
+  defaultfor 'os.family' => :redhat
 
   commands update: 'alternatives'
 

diff --git a/lib/puppet/provider/alternatives/dpkg.rb b/lib/puppet/provider/alternatives/dpkg.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Puppet::Type.type(:alternatives).provide(:dpkg) do
-  confine osfamily: %i[debian suse]
-  defaultfor [operatingsystem: %i[debian ubuntu], osfamily: :suse]
+  confine 'os.family' => %i[debian suse]
+  defaultfor ['os.name' => %i[debian ubuntu], 'os.family' => :suse]
   commands update: 'update-alternatives'
 
   has_feature :mode

diff --git a/lib/puppet/type/alternatives.rb b/lib/puppet/type/alternatives.rb
@@ -19,7 +19,7 @@ def insync?(is)
     end
 
     validate do |path|
-      raise ArgumentError, 'path must be a fully qualified path' unless (absolute_path? path) || (Facter.value(:osfamily) == 'RedHat')
+      raise ArgumentError, 'path must be a fully qualified path' unless (absolute_path? path) || (Facter.value('os.family') == 'RedHat')
     end
   end
 

diff --git a/spec/unit/type/alternatives_spec.rb b/spec/unit/type/alternatives_spec.rb
@@ -6,7 +6,7 @@
   describe 'property `path`' do
     context 'on Debian systems' do
       before do
-        Facter.stubs(:value).with(:osfamily).returns('Debian')
+        Facter.stubs(:value).with('os.family').returns('Debian')
       end
 
       it 'passes validation with an absolute path' do
@@ -20,7 +20,7 @@
 
     context 'on RedHat systems' do
       before do
-        Facter.stubs(:value).with(:osfamily).returns('RedHat')
+        Facter.stubs(:value).with('os.family').returns('RedHat')
       end
 
       it 'passes validation with an absolute path' do
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ def insync?(is) @@
         end
         validate do |path|
-          raise ArgumentError, 'path must be a fully qualified path' unless (absolute_path? path) || (Facter.value(:osfamily) == 'RedHat')
+          raise ArgumentError, 'path must be a fully qualified path' unless (absolute_path? path) || (Facter.value('os.family') == 'RedHat')
         end
       end
@@ Expand Down @@