(FACT-2850) Don't show nil custom facts

lib/facter.rb

@@ -392,7 +392,7 @@ def to_user_output(cli_options, *args)
 
       status = error_check(resolved_facts)
 
-      [fact_formatter.format(resolved_facts), status || 0]
+      [fact_formatter.format(resolved_facts), status]
     end
 
     # Logs an exception and an optional message
@@ -504,14 +504,13 @@ def resolve_fact(user_query)
     #
     # @api private
     def error_check(resolved_facts)
+      status = 0
       if Options[:strict]
         missing_names = resolved_facts.select { |fact| fact.type == :nil }.map(&:user_query)
 
         if missing_names.count.positive?
           status = 1
           log_errors(missing_names)
-        else
-          status = nil
         end
       end
 

lib/facter/models/fact_collection.rb

@@ -8,7 +8,7 @@ def initialize
 
     def build_fact_collection!(facts)
       facts.each do |fact|
-        next if %i[core legacy].include?(fact.type) && fact.value.nil?
+        next if %i[custom core legacy].include?(fact.type) && fact.value.nil?
 
         bury_fact(fact)
       end

spec/facter/model/fact_collection_spec.rb

@@ -57,9 +57,9 @@
         let(:fact_value) { nil }
         let(:type) { :custom }
 
-        it 'adds fact to collection' do
+        it 'does not add fact to collection' do
           fact_collection.build_fact_collection!([resolved_fact])
-          expected_hash = { 'operatingsystem' => nil }
+          expected_hash = {}
 
           expect(fact_collection).to eq(expected_hash)
         end