(FACT-2676) fix os identifier for opensuse-leap

lib/resolvers/os_release_resolver.rb

@@ -37,6 +37,7 @@ def read_os_release_file(fact_name)
           fill_fact_list(pairs)
           process_name
           pad_version_id
+          normalize_opensuse_identifier
 
           @fact_list[fact_name]
         end
@@ -61,6 +62,10 @@ def process_name
                                 @fact_list[:name].split(' ')[0].strip
                               end
         end
+
+        def normalize_opensuse_identifier
+          @fact_list[:identifier] = 'opensuse' if @fact_list[:identifier] =~ /opensuse/
+        end
       end
     end
   end

spec/facter/resolvers/os_release_resolver_spec.rb

@@ -37,6 +37,12 @@
 
       expect(result).to eq('bionic')
     end
+
+    it 'returns os identifier' do
+      result = Facter::Resolvers::OsRelease.resolve(:identifier)
+
+      expect(result).to eq('')
+    end
   end
 
   context 'when /etc/os-release file is not readable' do
@@ -75,5 +81,21 @@
 
       expect(result).to eq('buster')
     end
+
+    it 'returns os identifier' do
+      result = Facter::Resolvers::OsRelease.resolve(:identifier)
+
+      expect(result).to eq('debian')
+    end
+  end
+
+  context 'when on opensuse-leap' do
+    let(:os_release_content) { load_fixture('os_release_opensuse-leap').readlines }
+
+    it 'returns os identifier' do
+      result = Facter::Resolvers::OsRelease.resolve(:identifier)
+
+      expect(result).to eq('opensuse')
+    end
   end
 end

spec/fixtures/os_release_opensuse-leap

@@ -0,0 +1,10 @@
+NAME="openSUSE Leap"
+VERSION="15.1"
+ID="opensuse-leap"
+ID_LIKE="suse opensuse"
+VERSION_ID="15.1"
+PRETTY_NAME="openSUSE Leap 15.1"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:leap:15.1"
+BUG_REPORT_URL="https://bugs.opensuse.org"
+HOME_URL="https://www.opensuse.org/"