Merge pull request #2601 from cthorn42/bug_fix/main/FACT-3422_fix_sle…

…s_sap_os_distro (FACT-3422) Fix SLES SAP use of os distro
puppetlabs · Aug 15, 2023 · 0b0b988 · 0b0b988
2 parents af7272b + 436f968
commit 0b0b988
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/facter/resolvers/os_release.rb b/lib/facter/resolvers/os_release.rb
@@ -69,6 +69,7 @@ def process_version_id
         def process_id
           return unless @fact_list[:id]
 
+          @fact_list[:id] = 'sles' if /sles_sap/i.match?(@fact_list[:id])
           @fact_list[:id] = 'opensuse' if /opensuse/i.match?(@fact_list[:id])
         end
 

diff --git a/spec/facter/resolvers/os_release_spec.rb b/spec/facter/resolvers/os_release_spec.rb
@@ -156,6 +156,12 @@
 
       expect(result).to eq('SLES')
     end
+
+    it 'returns os ID' do
+      result = Facter::Resolvers::OsRelease.resolve(:id)
+
+      expect(result).to eq('sles')
+    end
   end
 
   context 'when on Manjarolinux' do