Use the read method on the return of open_url to actually get the con…

…tent.
puppetlabs · Mar 15, 2024 · fa8339c · fa8339c
1 parent 802eb9a
commit fa8339c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/puppet/parser/functions/loadjson.rb b/lib/puppet/parser/functions/loadjson.rb
@@ -44,7 +44,7 @@ module Puppet::Parser::Functions
           url = args[0]
         end
         begin
-          contents = OpenURI.open_uri(url, http_options)
+          contents = OpenURI.open_uri(url, http_options).read
         rescue OpenURI::HTTPError => e
           res = e.io
           warning("Can't load '#{url}' HTTP Error Code: '#{res.status[0]}'")

diff --git a/spec/functions/loadjson_spec.rb b/spec/functions/loadjson_spec.rb
@@ -55,7 +55,6 @@
         allow(File).to receive(:exist?).and_call_original
         allow(File).to receive(:exist?).with(filename).and_return(true).once
         allow(File).to receive(:read).with(filename).and_return(json).once
-        allow(File).to receive(:read).with(filename).and_return(json).once
         if Puppet::PUPPETVERSION[0].to_i < 8
           allow(PSON).to receive(:load).with(json).and_return(data).once
         else
@@ -98,7 +97,7 @@
       let(:json) { '{"key":"value", {"ķęŷ":"νậŀųề" }, {"キー":"値" }' }
 
       it {
-        expect(OpenURI).to receive(:open_uri).with(filename, {}).and_return(json)
+        expect(OpenURI).to receive(:open_uri).with(filename, {}).and_return(StringIO.new(json))
         if Puppet::PUPPETVERSION[0].to_i < 8
           expect(PSON).to receive(:load).with(json).and_return(data).once
         else
@@ -118,7 +117,7 @@
       let(:json) { '{"key":"value", {"ķęŷ":"νậŀųề" }, {"キー":"値" }' }
 
       it {
-        expect(OpenURI).to receive(:open_uri).with(url_no_auth, basic_auth).and_return(json)
+        expect(OpenURI).to receive(:open_uri).with(url_no_auth, basic_auth).and_return(StringIO.new(json))
         if Puppet::PUPPETVERSION[0].to_i < 8
           expect(PSON).to receive(:load).with(json).and_return(data).once
         else
@@ -138,7 +137,7 @@
       let(:json) { '{"key":"value", {"ķęŷ":"νậŀųề" }, {"キー":"値" }' }
 
       it {
-        expect(OpenURI).to receive(:open_uri).with(url_no_auth, basic_auth).and_return(json)
+        expect(OpenURI).to receive(:open_uri).with(url_no_auth, basic_auth).and_return(StringIO.new(json))
         if Puppet::PUPPETVERSION[0].to_i < 8
           expect(PSON).to receive(:load).with(json).and_return(data).once
         else
@@ -155,7 +154,7 @@
       let(:json) { ',;{"key":"value"}' }
 
       it {
-        expect(OpenURI).to receive(:open_uri).with(filename, {}).and_return(json)
+        expect(OpenURI).to receive(:open_uri).with(filename, {}).and_return(StringIO.new(json))
         if Puppet::PUPPETVERSION[0].to_i < 8
           expect(PSON).to receive(:load).with(json).once.and_raise StandardError, 'Something terrible have happened!'
         else