Show scheme (http/https) in puppetdb connection errors

Author: sathieu

lib/puppet/util/puppetdb_validator.rb

@@ -31,12 +31,12 @@ def attempt_connection
 
         response = conn.get(test_path, test_headers)
         unless response.kind_of?(Net::HTTPSuccess)
-          Puppet.notice "Unable to connect to puppetdb server (#{puppetdb_server}:#{puppetdb_port}): [#{response.code}] #{response.msg}"
+          Puppet.notice "Unable to connect to puppetdb server (http#{use_ssl ? "s" : ""}://#{puppetdb_server}:#{puppetdb_port}): [#{response.code}] #{response.msg}"
           return false
         end
         return true
       rescue Exception => e
-        Puppet.notice "Unable to connect to puppetdb server (#{puppetdb_server}:#{puppetdb_port}): #{e.message}"
+        Puppet.notice "Unable to connect to puppetdb server (http#{use_ssl ? "s" : ""}://#{puppetdb_server}:#{puppetdb_port}): #{e.message}"
         return false
       end
     end

spec/unit/util/puppetdb_validator_spec.rb

@@ -41,23 +41,23 @@
     puppetdb_server = 'mypuppetdb.com'
     puppetdb_port = 8080
     validator = Puppet::Util::PuppetdbValidator.new(puppetdb_server, puppetdb_port)
-    Puppet.expects(:notice).with("Unable to connect to puppetdb server (#{puppetdb_server}:#{puppetdb_port}): Connection refused")
+    Puppet.expects(:notice).with("Unable to connect to puppetdb server (https://#{puppetdb_server}:#{puppetdb_port}): Connection refused")
     validator.attempt_connection.should be false
   end
 
   it 'returns false and issues an appropriate notice if connection succeeds but puppetdb is not available' do
     puppetdb_server = 'wrongserver.com'
     puppetdb_port = 8081
     validator = Puppet::Util::PuppetdbValidator.new(puppetdb_server, puppetdb_port)
-    Puppet.expects(:notice).with("Unable to connect to puppetdb server (#{puppetdb_server}:#{puppetdb_port}): [404] Not found")
+    Puppet.expects(:notice).with("Unable to connect to puppetdb server (https://#{puppetdb_server}:#{puppetdb_port}): [404] Not found")
     validator.attempt_connection.should be false
   end
 
   it 'returns false and issues an appropriate notice if host:port is unreachable or does not exist' do
     puppetdb_server = 'non-existing.com'
     puppetdb_port = nil
     validator = Puppet::Util::PuppetdbValidator.new(puppetdb_server, puppetdb_port)
-    Puppet.expects(:notice).with("Unable to connect to puppetdb server (#{puppetdb_server}:#{puppetdb_port}): Unknown host")
+    Puppet.expects(:notice).with("Unable to connect to puppetdb server (https://#{puppetdb_server}:#{puppetdb_port}): Unknown host")
     validator.attempt_connection.should be false
   end