Merge pull request #2662 from joshcooper/macosx_version_full

Relax os.macosx.version.full requirement
puppetlabs · Jan 4, 2024 · 81a6e12 · 81a6e12
2 parents 49379df + 009cd16
commit 81a6e12
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/acceptance/lib/facter/acceptance/base_fact_utils.rb b/acceptance/lib/facter/acceptance/base_fact_utils.rb
@@ -263,6 +263,9 @@ def osx_expected_facts(agent)
           'os.macosx.product' => 'macOS',
           'os.macosx.version.major' => major_version,
           'os.macosx.version.minor' => /\d+/,
+          'os.macosx.version.patch' => /\d+/,
+          # If "patch" is 0, then the third component will be omitted
+          'os.macosx.version.full' => /^#{major_version}\.\d+(\.\d+)?$/,
           'os.release.full' => /\d+\.\d+\.\d+/,
           'os.release.major' => /\d+/,
           'os.release.minor' => /\d+/,
@@ -275,13 +278,6 @@ def osx_expected_facts(agent)
           'kernelversion' => /\d+\.\d+\.\d+/,
           'kernelmajversion' => /\d+\.\d+/
         }
-
-        expected_facts['os.macosx.version.patch'] = /\d+/
-        if agent['platform'] =~ /arm64/ && agent['platform'].split('-')[1].to_i < 13
-          expected_facts['os.macosx.version.full'] = /^#{expected_facts['os.macosx.version.major']}\.#{expected_facts['os.macosx.version.minor']}$/
-        else
-          expected_facts['os.macosx.version.full'] = /^#{expected_facts['os.macosx.version.major']}\.#{expected_facts['os.macosx.version.minor']}\.*#{expected_facts['os.macosx.version.patch']}*$/
-        end
         expected_facts
       end