loadjson: do not send http_basic_authentication if not needed

Author: chaen

lib/puppet/parser/functions/loadjson.rb

@@ -28,21 +28,22 @@ module Puppet::Parser::Functions
     require 'open-uri'
     begin
       if args[0].start_with?('http://', 'https://')
-        username = ''
-        password = ''
+        http_options = {}
         if (match = args[0].match(%r{(http\://|https\://)(.*):(.*)@(.*)}))
           # If URL is in the format of https://username:[email protected]/my_hash.yaml
           protocol, username, password, path = match.captures
           url = "#{protocol}#{path}"
+          http_options[:http_basic_authentication] = [username, password]
         elsif (match = args[0].match(%r{(http\:\/\/|https\:\/\/)(.*)@(.*)}))
           # If URL is in the format of https://[email protected]/my_hash.yaml
           protocol, username, path = match.captures
           url = "#{protocol}#{path}"
+          http_options[:http_basic_authentication] = [username, '']
         else
           url = args[0]
         end
         begin
-          contents = OpenURI.open_uri(url, http_basic_authentication: [username, password])
+          contents = OpenURI.open_uri(url, **http_options)
         rescue OpenURI::HTTPError => err
           res = err.io
           warning("Can't load '#{url}' HTTP Error Code: '#{res.status[0]}'")

spec/functions/loadjson_spec.rb

@@ -76,12 +76,11 @@
       let(:filename) do
         'https://example.local/myhash.json'
       end
-      let(:basic_auth) { { http_basic_authentication: ['', ''] } }
       let(:data) { { 'key' => 'value', 'ķęŷ' => 'νậŀųề', 'キー' => '値' } }
       let(:json) { '{"key":"value", {"ķęŷ":"νậŀųề" }, {"キー":"値" }' }
 
       it {
-        expect(OpenURI).to receive(:open_uri).with(filename, basic_auth).and_return(json)
+        expect(OpenURI).to receive(:open_uri).with(filename).and_return(json)
         expect(PSON).to receive(:load).with(json).and_return(data).once
         is_expected.to run.with_params(filename).and_return(data)
       }
@@ -123,11 +122,10 @@
       let(:filename) do
         'https://example.local/myhash.json'
       end
-      let(:basic_auth) { { http_basic_authentication: ['', ''] } }
       let(:json) { ',;{"key":"value"}' }
 
       it {
-        expect(OpenURI).to receive(:open_uri).with(filename, basic_auth).and_return(json)
+        expect(OpenURI).to receive(:open_uri).with(filename).and_return(json)
         expect(PSON).to receive(:load).with(json).once.and_raise StandardError, 'Something terrible have happened!'
         is_expected.to run.with_params(filename, 'default' => 'value').and_return('default' => 'value')
       }
@@ -137,10 +135,9 @@
       let(:filename) do
         'https://example.local/myhash.json'
       end
-      let(:basic_auth) { { http_basic_authentication: ['', ''] } }
 
       it {
-        expect(OpenURI).to receive(:open_uri).with(filename, basic_auth).and_raise OpenURI::HTTPError, '404 File not Found'
+        expect(OpenURI).to receive(:open_uri).with(filename).and_raise OpenURI::HTTPError, '404 File not Found'
         is_expected.to run.with_params(filename, 'default' => 'value').and_return('default' => 'value')
       }
     end