Merge pull request #136 from bastelfreak/foo

Use structured facts to detect OS version
voxpupuli · Apr 22, 2022 · b1b69c5 · b1b69c5
2 parents 7e73e37 + 790eb1b
commit b1b69c5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/rspec-puppet-facts.rb b/lib/rspec-puppet-facts.rb
@@ -149,12 +149,15 @@ def on_supported_os_implementation(opts = {})
     os_facts_hash = {}
     received_facts.map do |facts|
       # Fix facter bug
+      # Todo: refactor the whole block to rely on structured facts and use legacy facts as fallback
       if facts[:operatingsystem] == 'Ubuntu'
         operatingsystemmajrelease = facts[:operatingsystemrelease].split('.')[0..1].join('.')
       elsif facts[:operatingsystem] == 'OpenBSD'
         operatingsystemmajrelease = facts[:operatingsystemrelease]
       elsif facts[:operatingsystem] == 'windows' && facts[:operatingsystemrelease].start_with?('10.0.')
         operatingsystemmajrelease = '2016'
+      elsif facts.dig(:os, 'release', 'major')
+        operatingsystemmajrelease = facts[:os]['release']['major']
       else
         if facts[:operatingsystemmajrelease].nil?
           operatingsystemmajrelease = facts[:operatingsystemrelease].split('.')[0]