(FACT-2475) os.distro use os-release

lib/facts/debian/os/distro/release.rb

@@ -9,14 +9,15 @@ class Release
           ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
+            fact_value = Facter::Resolvers::OsRelease.resolve(:release)
+
             return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
 
             versions = fact_value.split('.')
             release = {
-              'full' => fact_value,
-              'major' => versions[0],
-              'minor' => versions[1]
+                'full' => fact_value,
+                'major' => versions[0],
+                'minor' => versions[1].gsub(/^0([1-9])/, '\1')
             }
 
             [Facter::ResolvedFact.new(FACT_NAME, release),

spec/facter/facts/debian/os/distro/release_spec.rb

@@ -8,12 +8,12 @@
     let(:release) { { 'full' => '9.0', 'major' => '9', 'minor' => '0' } }
 
     before do
-      allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:release).and_return(value)
+      allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:release).and_return(value)
     end
 
     it 'calls Facter::Resolvers::LsbRelease' do
       fact.call_the_resolver
-      expect(Facter::Resolvers::LsbRelease).to have_received(:resolve).with(:release)
+      expect(Facter::Resolvers::OsRelease).to have_received(:resolve).with(:release)
     end
 
     it 'returns release fact' do
@@ -30,7 +30,7 @@
       let(:value) { nil }
 
       before do
-        allow(Facter::Resolvers::LsbRelease).to receive(:resolve).with(:release).and_return(value)
+        allow(Facter::Resolvers::OsRelease).to receive(:resolve).with(:release).and_return(value)
       end
 
       it 'returns release fact' do