Merge pull request #2795 from puppetlabs/backport_4.15.0

Backport 4.15.0

Author: joshcooper

.github/actions/presuite.rb

@@ -11,7 +11,7 @@ on:
 
 jobs:
   rubocop_checks:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: RuboCop
     steps:
       - name: Checkout current PR

.github/workflows/acceptance_tests.yml

@@ -22,8 +22,8 @@ jobs:
           - {os: ubuntu-22.04, ruby: '3.2'} # with openssl 3
           - {os: ubuntu-22.04, ruby: 'jruby-9.3.14.0'}
           - {os: ubuntu-latest, ruby: 'jruby-9.4.8.0'}
-          - {os: windows-2019, ruby: '2.7'}
-          - {os: windows-2019, ruby: '3.2'} # with openssl 3
+          - {os: windows-2022, ruby: '2.7'}
+          - {os: windows-2022, ruby: '3.2'} # with openssl 3
     runs-on: ${{ matrix.cfg.os }}
     env:
       BUNDLE_SET: 'with integration'

.github/workflows/checks.yaml

@@ -24,7 +24,9 @@ jobs:
           - '3.2'
           - 'jruby-9.3.14.0'
           - 'jruby-9.4.8.0'
-    runs-on: ubuntu-20.04
+    # 24.04 doesn't support older jruby versions, so use 22.04 as middle ground
+    # When we drop testing against puppet7, then we can use newer ubuntu.
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout current PR
         uses: actions/checkout@v4
@@ -43,7 +45,7 @@ jobs:
         ruby:
           - '2.7'
           - '3.2'
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout current PR
         uses: actions/checkout@v4

.github/workflows/integration_tests.yaml

@@ -53,6 +53,7 @@ build-iPhoneSimulator/
 .rvmrc
 
 .rspec_status
+.rspec_integration_status
 Gemfile.lock
 Gemfile.local
 acceptance/vendor

.github/workflows/unit_tests.yaml

@@ -11,6 +11,10 @@ require:
   - rubocop-performance
   - rubocop-rspec
 
+plugins:
+  - rubocop-factory_bot
+  - rubocop-capybara
+
 Layout/LineLength:
   Enabled: false
 
@@ -43,6 +47,7 @@ Naming/MethodName:
   Exclude:
     - 'spec/mocks/win32ole.rb'
     - 'spec/mocks/ffi.rb'
+    - 'spec/facter/util/windows/network_utils_spec.rb'
 
 Naming/PredicateName:
   Exclude:

.gitignore

@@ -5,8 +5,6 @@ require 'open3'
 require 'rspec/core/rake_task'
 require 'facter/version'
 
-Dir.glob(File.join('tasks/**/*.rake')).each { |file| load file }
-
 task default: :spec
 
 desc 'Generate changelog'

.rubocop.yml

@@ -118,7 +118,7 @@ def debian_expected_facts(agent)
 
       # el (RedHat, Centos)
       def el_expected_facts(agent)
-        version = agent['platform'].match(/(el|centos)-(\d)/)
+        version = agent['platform'].match(/(el|centos)-(\d+)/)
         os_version = if version.nil?
                        /\d+/
                      else
@@ -143,6 +143,11 @@ def el_expected_facts(agent)
           os_distro_description = /Rocky Linux release #{os_version}\.\d+ \(.+\)/
           os_distro_id = 'Rocky'
           os_distro_release_full = /#{os_version}\.\d+/
+        when /rhel/
+          os_name = 'RedHat'
+          os_distro_description = /Red Hat Enterprise Linux( Server)? release #{os_version}\.\d+( Beta)? \(\w+\)/
+          os_distro_id = /^RedHatEnterprise(Server)?$/
+          os_distro_release_full = /#{os_version}\.\d+/
         when /centos/
           os_name = 'CentOS'
           os_distro_description = /CentOS( Linux)? release #{os_version}\.\d+(\.\d+)? \(\w+\)/
@@ -154,6 +159,7 @@ def el_expected_facts(agent)
           os_distro_id = /^RedHatEnterprise(Server)?$/
           os_distro_release_full = /#{os_version}\.\d+/
         end
+
         if agent['platform'] =~ /x86_64/
           os_arch                 = 'x86_64'
           os_hardware             = 'x86_64'
@@ -190,7 +196,7 @@ def el_expected_facts(agent)
           expected_facts['os.release.minor'] = /(\d+)?/
           expected_facts['processors.count'] = /[1-9]/
           expected_facts['processors.physicalcount'] = /[1-9]/
-          expected_facts['processors.isa'] = os_hardware
+          expected_facts['processors.isa'] = /unknown|#{os_hardware}/
           expected_facts['processors.models'] = processor_model_pattern
           expected_facts['kernel'] = 'Linux'
           expected_facts['kernelrelease'] = /\d+\.\d+\.\d+/
@@ -437,6 +443,8 @@ def windows_expected_facts(agent)
           os_version = '2019'
         elsif agent['platform'] =~ /2022/
           os_version = '2022'
+        elsif agent['platform'] =~ /2025/
+          os_version = '2025'
         else
           fail_test "Unknown Windows version #{agent['platform']}"
         end

Rakefile

@@ -9,7 +9,7 @@
       setcode do
         require 'win32ole'
         locator = WIN32OLE.new('WbemScripting.SWbemLocator')
-        locator.ConnectServer('', "root/CIMV2", '', '', nil, nil, nil, nil).to_s
+        locator.ConnectServer('', "root/CIMV2", '', '', nil, nil, nil, nil).class.to_s
       end
     end
   EOM
@@ -26,7 +26,7 @@
     # Test is assumed to have hung if it takes longer than 5 seconds.
     Timeout::timeout(5) do
       on agent, facter('--custom-dir', custom_dir, 'custom_fact_ole') do |facter_result|
-        assert_match(/#<WIN32OLE:0x[0-9a-f]+>/, facter_result.stdout.chomp, 'Custom fact output does not match expected output')
+        assert_match(/WIN32OLE/, facter_result.stdout.chomp, 'Custom fact output does not match expected output')
       end
     end
   end