(PUP-10039) Yield each successfull server connection to the session

Author: melissa

lib/puppet/http/client.rb

@@ -150,7 +150,6 @@ def build_resolvers
       resolvers << Puppet::HTTP::Resolver::SRV.new(domain: Puppet[:srv_domain])
     end
 
-    resolvers << Puppet::HTTP::Resolver::ServerList.new(self, server_list: Puppet[:server_list], default_port: Puppet[:masterport])
     resolvers << Puppet::HTTP::Resolver::Settings.new
     resolvers.freeze
   end

lib/puppet/http/resolver/serverlist.rb

@@ -6,17 +6,16 @@ def initialize(client, server_list: Puppet[:server_list], default_port: Puppet[:
   end
 
   def resolve(session, name, &block)
-    server, port = yield_server
-    yield session.create_service(name, server, port)
-  end
-
-  def yield_server
+    success = false
     @server_list.each do |server|
       host = server[0]
       port = server[1] || @default_port
       begin
         response = @client.get(URI("https://#{host}:#{port}/status/v1/simple/master"))
-        return [host, port] if response.success?
+        if response.success?
+          success = true
+          yield session.create_service(name, host, port)
+        end
 
         Puppet.debug(_("Puppet server %{host}:%{port} is unavailable: %{code} %{reason}") %
                      { host: host, port: port, code: response.code, reason: response.message })
@@ -25,6 +24,7 @@ def yield_server
         Puppet.debug _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail}
       end
     end
-    [nil, nil]
+
+    raise Puppet::Error, _("Could not select a functional puppet master from server_list: '%{server_list}'") % { server_list: Puppet.settings.value(:server_list, Puppet[:environment].to_sym, true) } unless success
   end
 end

spec/unit/http/resolver_spec.rb

@@ -47,15 +47,12 @@
       end
     end
 
-    it 'falls back to the puppet defaults if no servers in server_list are accessible' do
+    it 'falls fails if no servers in server_list are accessible' do
       Puppet[:server_list] = 'ca.example.com:8141'
 
       stub_request(:get, "https://ca.example.com:8141/status/v1/simple/master").to_return(status: 503)
 
-      subject.resolve(session, :ca) do |service|
-        expect(service).to be_an_instance_of(Puppet::HTTP::Service::Ca)
-        expect(service.url.to_s).to eq("https://#{Puppet[:ca_server]}:#{Puppet[:masterport]}/puppet-ca/v1")
-      end
+      expect { subject.resolve(session, :ca) }.to raise_error(Puppet::Error, /^Could not select a functional puppet master from server_list:/)
     end
 
     it 'cycles through server_list until a valid server is found' do