(maint) wip

Author: melissa

lib/puppet/http/resolver/serverlist.rb

@@ -1,27 +1,24 @@
 class Puppet::HTTP::Resolver::ServerList < Puppet::HTTP::Resolver
-  def initialize(client, server_list: Puppet[:server_list], default_port: Puppet[:masterport])
+  def initialize(client, server_list:, default_port:)
     @client = client
     @server_list = server_list
     @default_port = default_port
   end
 
   def resolve(session, name, ssl_context: nil, &block)
-    success = false
     @server_list.each do |server|
       host = server[0]
       port = server[1] || @default_port
       uri = URI("https://#{host}:#{port}/status/v1/simple/master")
-      service = Puppet::HTTP::Service.create_service(@client, name, host, port)
-      if check_connection?(uri, session, service, ssl_context: ssl_context)
-        success = true
-        return service
+      if get_success?(uri, session, ssl_context: ssl_context)
+        return Puppet::HTTP::Service.create_service(@client, name, host, port)
       end
     end
 
-    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
+    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) }
   end
 
-  def check_connection?(uri, session, service, ssl_context: nil)
+  def get_success?(uri, session, ssl_context: nil)
     response = @client.get(uri, ssl_context: ssl_context)
     return true if response.success?
 

lib/puppet/http/resolver/settings.rb

@@ -1,6 +1,6 @@
 class Puppet::HTTP::Resolver::Settings < Puppet::HTTP::Resolver
   def resolve(session, name, ssl_context: nil, &block)
     service = Puppet::HTTP::Service.create_service(@client, name)
-    return service if check_connection?(session, service, ssl_context: ssl_context)
+    check_connection?(session, service, ssl_context: ssl_context) ? service : nil
   end
 end

lib/puppet/http/resolver/srv.rb

@@ -13,5 +13,7 @@ def resolve(session, name, ssl_context: nil, &block)
       service = Puppet::HTTP::Service.create_service(@client, name, server, port)
       return service if check_connection?(session, service, ssl_context: ssl_context)
     end
+
+    return nil
   end
 end

lib/puppet/http/session.rb

@@ -12,6 +12,8 @@ def route_to(name, ssl_context: nil)
     cached = @resolved_services[name]
     return cached if cached
 
+    @resolution_exceptions = []
+
     @resolvers.each do |resolver|
       Puppet.debug("Resolving service '#{name}' using #{resolver.class}")
       service = resolver.resolve(self, name, ssl_context: ssl_context)

spec/unit/http/resolver_spec.rb

@@ -23,11 +23,11 @@
   end
 
   context 'when resolving using server_list' do
-    let(:subject) { Puppet::HTTP::Resolver::ServerList.new(client) }
+    let(:server_list) { [["ca.example.com", "8141"], ["apple.example.com"]] }
+    let(:default_port) { '8142' }
+    let(:subject) { Puppet::HTTP::Resolver::ServerList.new(client, server_list: server_list, default_port: default_port) }
 
     it 'yields a service based on the current server_list setting' do
-      Puppet[:server_list] = 'ca.example.com:8141'
-
       stub_request(:get, "https://ca.example.com:8141/status/v1/simple/master").to_return(status: 200)
 
       subject.resolve(session, :ca) do |service|
@@ -37,8 +37,6 @@
     end
 
     it 'yields a service based on the current server_list setting if the server returns any success codes' do
-      Puppet[:server_list] = 'ca.example.com:8141'
-
       stub_request(:get, "https://ca.example.com:8141/status/v1/simple/master").to_return(status: 202)
 
       subject.resolve(session, :ca) do |service|
@@ -48,34 +46,19 @@
     end
 
     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)
+      stub_request(:get, "https://apple.example.com:8142/status/v1/simple/master").to_return(status: 503)
 
       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
-      Puppet[:server_list] = 'ca.example.com:8141, ca.failover.com:1984'
-
       stub_request(:get, "https://ca.example.com:8141/status/v1/simple/master").to_return(status: 503)
-      stub_request(:get, "https://ca.failover.com:1984/status/v1/simple/master").to_return(status: 200)
-
-      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://ca.failover.com:1984/puppet-ca/v1")
-      end
-    end
-
-    it 'defaults port to `Puppet[:masterport]` if no port is set' do
-      Puppet[:server_list] = 'ca.example.com'
-      Puppet[:masterport] = 8142
-
-      stub_request(:get, "https://ca.example.com:8142/status/v1/simple/master").to_return(status: 200)
+      stub_request(:get, "https://apple.example.com:8142/status/v1/simple/master").to_return(status: 200)
 
       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://ca.example.com:8142/puppet-ca/v1")
+        expect(service.url.to_s).to eq("https://apple.example.com:8142/puppet-ca/v1")
       end
     end
   end