Merge pull request #9012 from AriaXLi/PUP-11754/Json.load_handles_empty_string

(PUP-11754) Empty metadata files should be treated as though they don't exist

Author: joshcooper

lib/puppet/module.rb

@@ -214,7 +214,9 @@ def license_file
 
   def read_metadata
     md_file = metadata_file
-    md_file.nil? ? {} : Puppet::Util::Json.load(File.read(md_file, :encoding => 'utf-8'))
+    return {} if md_file.nil?
+    content = File.read(md_file, :encoding => 'utf-8')
+    content.empty? ? {} : Puppet::Util::Json.load(content)
   rescue Errno::ENOENT
     {}
   rescue Puppet::Util::Json::ParseError => e

lib/puppet/module/task.rb

@@ -232,8 +232,6 @@ def initialize(pup_module, task_name,  module_executables, metadata_file = nil)
     end
 
     def self.read_metadata(file)
-      # MultiJSON has a bug that improperly errors when loading an empty string
-      # so we handle it here for now. See: PUP-11629
       if file
         content = Puppet::FileSystem.read(file, :encoding => 'utf-8')
         content.empty? ? {} : Puppet::Util::Json.load(content)

spec/unit/pops/loaders/loaders_spec.rb

@@ -246,7 +246,6 @@ def expect_loader_hierarchy(loaders, expected_loaders)
     end
 
     it 'loader allows loading a function more than once' do
-      pending('See PUP-11754')
       allow(File).to receive(:read).with(user_metadata_path, {:encoding => 'utf-8'}).and_return('')
       allow(File).to receive(:read).with(usee_metadata_path, {:encoding => 'utf-8'}).and_raise(Errno::ENOENT)
       allow(File).to receive(:read).with(usee2_metadata_path, {:encoding => 'utf-8'}).and_raise(Errno::ENOENT)