puppet 6.0.9 → 6.0.10

data/spec/unit/provider/service/upstart_spec.rb

@@ -33,35 +33,16 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
   end
 
   context "upstart daemon existence confine" do
-    # We have a separate method here because our search for the upstart daemon
-    # confine expects it to be the last confine declared in the upstart provider.
-    # If in the future we add other confines below it or change its order, these
-    # unit tests will fail. Placing knowledge of where this confine is located
-    # in one place makes updating it less painful in case we ever need to do this.
-    def assert_upstart_daemon_existence_confine_is(expected_value)
-      # Reload our provider to evaluate the :confine block
-      provider_class = Puppet::Type.type(:service).provider(:upstart)
-
-      upstart_daemon_existence_confine = provider_class.confine_collection.instance_variable_get(:@confines)[-1]
-      expect(upstart_daemon_existence_confine.valid?).to be(expected_value)
-    end
-
     let(:initctl_version) { ['/sbin/initctl', 'version', '--quiet'] }
 
     before(:each) do
-      # Stub out /sbin/initctl
       allow(Puppet::Util).to receive(:which).with('/sbin/initctl').and_return('/sbin/initctl')
-
-      # Both of our tests are asserting the confine :true block that shells out to
-      # `initctl version --quiet`. Its expression is evaluated at provider load-time.
-      # Hence before each test, we want to reload the upstart provider so that the
-      # confine is re-evaluated.
-      Puppet::Type.type(:service).unprovide(:upstart)
     end
 
     it "should return true when the daemon is running" do
       expect(Puppet::Util::Execution).to receive(:execute).with(initctl_version, instance_of(Hash))
-      assert_upstart_daemon_existence_confine_is(true)
+
+      expect(provider_class).to be_has_initctl
     end
 
     it "should return false when the daemon is not running" do
@@ -69,7 +50,7 @@ describe 'Puppet::Type::Service::Provider::Upstart', unless: Puppet::Util::Platf
         .with(initctl_version, instance_of(Hash))
         .and_raise(Puppet::ExecutionFailure, "initctl failed!")
 
-      assert_upstart_daemon_existence_confine_is(false)
+      expect(provider_class).to_not be_has_initctl
     end
   end
 

data/spec/unit/settings/server_list_setting_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'puppet/settings/server_list_setting'
+
+describe Puppet::Settings::ServerListSetting do
+
+    it "prints strings as strings" do
+      settings = Puppet::Settings.new
+      settings.define_settings(:main, neptune: {type: :server_list, desc: 'list of servers'})
+      server_list_setting = settings.setting(:neptune)
+      expect(server_list_setting.print("jupiter,mars")).to eq("jupiter,mars")
+    end
+
+    it "prints arrays as strings" do
+      settings = Puppet::Settings.new
+      settings.define_settings(:main, neptune: {type: :server_list, desc: 'list of servers'})
+      server_list_setting = settings.setting(:neptune)
+      expect(server_list_setting.print([["main", 1234],["production", 8140]])).to eq("main:1234,production:8140")
+      expect(server_list_setting.print([])).to eq("")
+    end
+
+end

data/spec/unit/ssl/validator_spec.rb

@@ -185,6 +185,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
       allow(subject).to receive(:ssl_certificates_are_present?).and_return(true)
       connection = double('Net::HTTP')
 
+      allow(connection).to receive(:address).and_return('puppet.com')
       expect(connection).to receive(:cert_store=).with(ssl_host.ssl_store)
       expect(connection).to receive(:ca_file=).with(ca_path)
       expect(connection).to receive(:cert=).with(ssl_host.certificate.content)
@@ -200,6 +201,7 @@ describe Puppet::SSL::Validator::DefaultValidator, unless: Puppet::Util::Platfor
         allow(subject).to receive(:ssl_certificates_are_present?).and_return(false)
         connection = double('Net::HTTP')
 
+        allow(connection).to receive(:address).and_return('puppet.com')
         expect(connection).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
 
         subject.setup_connection(connection, ssl_host)

data/spec/unit/util/pidlock_spec.rb

@@ -26,6 +26,18 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
         allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
       else
         allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('puppet')
+      end
+      expect(@lock).to be_locked
+    end
+
+    it "should become locked if puppet is a gem" do
+      @lock.lock
+      unless Puppet::Util::Platform.windows?
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('ruby')
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
+      else
+        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\tools\ruby25\bin\ruby.exe')
       end
       expect(@lock).to be_locked
     end
@@ -109,6 +121,18 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
         allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
       else
         allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('puppet')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('puppet')
+      end
+      expect(@lock).to be_locked
+    end
+
+    it "should return true if locked when puppet as gem" do
+      @lock.lock
+      unless Puppet::Util::Platform.windows?
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'comm=']).and_return('ruby')
+        expect(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', @lock.lock_pid, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
+      else
+        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(@lock.lock_pid).and_return('C:\tools\ruby25\bin\ruby.exe')
       end
       expect(@lock).to be_locked
     end
@@ -159,6 +183,7 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
           allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(6789).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
         else
           allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 6789, '-o', 'comm=']).and_return('puppet')
+          allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 6789, '-o', 'args=']).and_return('puppet')
         end
         @lock.lock
         expect(Puppet::FileSystem.exist?(@lockfile)).to be_truthy
@@ -188,6 +213,7 @@ describe Puppet::Util::Pidlock, if: !Puppet::Util::Platform.jruby? do
         allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(1234).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
       else
         allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).and_return('puppet')
+        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'args=']).and_return('puppet')
       end
       # lock the file
       @lock.lock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.0.9
+  version: 6.0.10
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1017,6 +1017,7 @@ files:
 - lib/puppet/provider/package/windows/package.rb
 - lib/puppet/provider/package/yum.rb
 - lib/puppet/provider/package/zypper.rb
+- lib/puppet/provider/package_targetable.rb
 - lib/puppet/provider/parsedfile.rb
 - lib/puppet/provider/service/base.rb
 - lib/puppet/provider/service/bsd.rb
@@ -1065,7 +1066,6 @@ files:
 - lib/puppet/resource/status.rb
 - lib/puppet/resource/type.rb
 - lib/puppet/resource/type_collection.rb
-- lib/puppet/rest/client.rb
 - lib/puppet/rest/errors.rb
 - lib/puppet/rest/response.rb
 - lib/puppet/rest/route.rb
@@ -1714,6 +1714,7 @@ files:
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
+- spec/integration/network/http_pool_spec.rb
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
 - spec/integration/node_spec.rb
@@ -1787,6 +1788,7 @@ files:
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/handler.rb
+- spec/lib/puppet_spec/https.rb
 - spec/lib/puppet_spec/language.rb
 - spec/lib/puppet_spec/matchers.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
@@ -2345,7 +2347,6 @@ files:
 - spec/unit/resource/type_collection_spec.rb
 - spec/unit/resource/type_spec.rb
 - spec/unit/resource_spec.rb
-- spec/unit/rest/client_spec.rb
 - spec/unit/rest/route_spec.rb
 - spec/unit/scheduler/job_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
@@ -2362,6 +2363,7 @@ files:
 - spec/unit/settings/ini_file_spec.rb
 - spec/unit/settings/path_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
+- spec/unit/settings/server_list_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
 - spec/unit/settings/terminus_setting_spec.rb
 - spec/unit/settings/value_translator_spec.rb
@@ -2920,6 +2922,7 @@ test_files:
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
+- spec/integration/network/http_pool_spec.rb
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
 - spec/integration/node_spec.rb
@@ -2993,6 +2996,7 @@ test_files:
 - spec/lib/puppet_spec/files.rb
 - spec/lib/puppet_spec/fixtures.rb
 - spec/lib/puppet_spec/handler.rb
+- spec/lib/puppet_spec/https.rb
 - spec/lib/puppet_spec/language.rb
 - spec/lib/puppet_spec/matchers.rb
 - spec/lib/puppet_spec/module_tool/shared_functions.rb
@@ -3551,7 +3555,6 @@ test_files:
 - spec/unit/resource/type_collection_spec.rb
 - spec/unit/resource/type_spec.rb
 - spec/unit/resource_spec.rb
-- spec/unit/rest/client_spec.rb
 - spec/unit/rest/route_spec.rb
 - spec/unit/scheduler/job_spec.rb
 - spec/unit/scheduler/scheduler_spec.rb
@@ -3568,6 +3571,7 @@ test_files:
 - spec/unit/settings/ini_file_spec.rb
 - spec/unit/settings/path_setting_spec.rb
 - spec/unit/settings/priority_setting_spec.rb
+- spec/unit/settings/server_list_setting_spec.rb
 - spec/unit/settings/string_setting_spec.rb
 - spec/unit/settings/terminus_setting_spec.rb
 - spec/unit/settings/value_translator_spec.rb

data/lib/puppet/rest/client.rb

@@ -1,83 +0,0 @@
-require 'httpclient'
-
-require 'puppet'
-require 'puppet/rest/response'
-require 'puppet/rest/errors'
-require 'puppet/util/ssl'
-
-module Puppet::Rest
-  class Client
-    attr_reader :dns_resolver
-
-    # Create a new HTTP client for querying the given API.
-    # @param [Puppet::Rest::SSLContext] ssl_context the SSL configuration for this client
-    # @param [Integer] receive_timeout how long in seconds this client will wait
-    #                  for a response after making a request
-    # @param [HTTPClient] client the third-party HTTP client wrapped by this
-    #                     class. This param is only used for testing.
-    def initialize(ssl_context:,
-                   receive_timeout: Puppet[:http_read_timeout],
-                   client: HTTPClient.new(agent_name: nil,
-                                          default_header: {
-                                            'User-Agent' => Puppet[:http_user_agent],
-                                            'X-PUPPET-VERSION' => Puppet::PUPPETVERSION
-                                          }))
-      @client = client
-      @client.tcp_keepalive = true
-      @client.connect_timeout = Puppet[:http_connect_timeout]
-      @client.receive_timeout = receive_timeout
-      @client.transparent_gzip_decompression = true
-
-      if Puppet[:http_debug]
-        @client.debug_dev = $stderr
-      end
-
-      @ca_path = Puppet[:ssl_client_ca_auth] || Puppet[:localcacert]
-      @verifier = Puppet::SSL::Validator::DefaultValidator.new(@ca_path)
-      configure_verify_mode(ssl_context)
-
-      @dns_resolver = Puppet::Network::Resolver.new
-    end
-
-    # Make a GET request to the specified URL with the specified params.
-    # @param [URI::HTTPS] url the full path to query
-    # @param [Hash] query any URL params to add to send to the endpoint
-    # @param [Hash] header any additional entries to add to the default header
-    # @yields [String] chunks of the response body
-    # @raise [Puppet::Rest::ResponseError] if the response status is not OK
-    def get(url, query: nil, header: nil, &block)
-      begin
-        @client.get_content(url.to_s, { query: query, header: header }) do |chunk|
-          block.call(chunk)
-        end
-      rescue HTTPClient::BadResponseError => e
-        raise Puppet::Rest::ResponseError.new(e.message, Puppet::Rest::Response.new(e.res))
-      rescue OpenSSL::OpenSSLError => e
-        Puppet::Util::SSL.handle_connection_error(e, @verifier, url.host)
-      end
-    end
-
-    # Make a PUT request to the specified URL with the specified params.
-    # @param [URI::HTTPS] url the full path to query
-    # @param [String/Hash] body the contents of the PUT request
-    # @param [Hash] query any URL params to add to send to the endpoint
-    # @param [Hash] header any additional entries to add to the default header
-    # @return [Puppet::Rest::Response]
-    def put(url, body:, query: nil, header: nil)
-      begin
-        response = @client.put(url.to_s, body: body, query: query, header: header)
-        Puppet::Rest::Response.new(response)
-      rescue OpenSSL::OpenSSLError => e
-        Puppet::Util::SSL.handle_connection_error(e, @verifier, url.host)
-      end
-    end
-
-    private
-
-    def configure_verify_mode(ssl_context)
-      @client.ssl_config.verify_callback = @verifier
-      @client.ssl_config.cert_store = ssl_context.cert_store
-      @client.ssl_config.verify_mode = ssl_context.verify_mode
-    end
-  end
-end

data/spec/unit/rest/client_spec.rb

@@ -1,166 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/rest/client'
-require 'puppet/rest/ssl_context'
-require 'puppet_spec/validators'
-require 'puppet_spec/ssl'
-
-describe Puppet::Rest::Client do
-  # Follows closely with spec/unit/network/http/connection_spec's
-  # 'ssl verifier' shared context
-  shared_examples 'connection error handling' do
-    let(:uri) { URI.parse('https://foo.com/blah') }
-
-    it 'provides a meaningful error message when cert validation fails' do
-      client.instance_variable_set(:@verifier,
-                                   ConstantErrorValidator.new(
-                                     error_string: 'foo'))
-
-      expect(http).to receive(:get_content).with(uri.to_s, query: nil, header: nil)
-        .and_raise(OpenSSL::OpenSSLError.new('certificate verify failed'))
-      expect{ client.get(uri) }.to raise_error do |error|
-        expect(error).to be_a(Puppet::Error)
-        expect(error.message).to include('foo')
-      end
-    end
-
-    it 'provides valuable error message when cert names do not match' do
-      cert = PuppetSpec::SSL.self_signed_ca(PuppetSpec::SSL.create_private_key,
-                                              '/CN=bar.com')
-      client.instance_variable_set(:@verifier,
-                                   ConstantErrorValidator.new(
-                                     peer_certs: [cert]))
-      expect(http).to receive(:get_content).with(uri.to_s, query: nil, header: nil)
-        .and_raise(OpenSSL::OpenSSLError.new('hostname does not match with server certificate'))
-      expect { client.get(uri) }.to raise_error do |error|
-        expect(error).to be_a(Puppet::Error)
-        expect(error.message).to include("Server hostname 'foo.com' did not match")
-        expect(error.message).to include('expected bar.com')
-      end
-    end
-
-    it 're-raises errors it does not understand' do
-      expect(http).to receive(:get_content).with(uri.to_s, query: nil, header: nil)
-        .and_raise(OpenSSL::OpenSSLError.new('other ssl error'))
-      expect{ client.get(uri) }.to raise_error do |error|
-        expect(error).to be_a(OpenSSL::OpenSSLError)
-        expect(error.message).to include('other ssl error')
-      end
-    end
-  end
-
-  context 'when creating a new client' do
-    let(:ssl_store) { double('store') }
-    let(:ssl_config) do
-      double(
-        'ssl config',
-        :cert_store= => nil,
-        :verify_callback= => nil,
-        :verify_mode= => nil,
-      )
-    end
-    let(:http) do
-      double(
-        'http',
-        :connect_timeout= => nil,
-        :receive_timeout= => nil,
-        :ssl_config => ssl_config,
-        :tcp_keepalive= => nil,
-        :transparent_gzip_decompression= => nil,
-      )
-    end
-
-    it 'initializes itself with basic defaults' do
-      expect(HTTPClient).to receive(:new).and_return(http)
-      allow(OpenSSL::X509::Store).to receive(:new).and_return(ssl_store)
-      # Configure connection with HTTP settings
-      Puppet[:http_read_timeout] = 120
-      Puppet[:http_connect_timeout] = 10
-      Puppet[:http_debug] = true
-
-      expect(http).to receive(:connect_timeout=).with(10)
-      expect(http).to receive(:receive_timeout=).with(120)
-      expect(http).to receive(:debug_dev=).with($stderr)
-
-      # Configure verify mode with SSL settings
-      expect(ssl_config).to receive(:cert_store=).with(ssl_store)
-      Puppet[:ssl_client_ca_auth] = '/fake/path'
-      Puppet[:hostcert] = '/fake/cert/path'
-      expect(ssl_config).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
-
-      Puppet::Rest::Client.new(ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_NONE))
-    end
-
-    it 'uses a given client and SSL store when provided' do
-      expect(ssl_config).to receive(:cert_store=).with(ssl_store)
-      Puppet::Rest::Client.new(client: http,
-                               ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_PEER, ssl_store))
-    end
-
-    it 'configures a receive timeout when provided' do
-      expect(http).to receive(:receive_timeout=).with(10)
-      Puppet::Rest::Client.new(ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_NONE),
-                               client: http, receive_timeout: 10)
-    end
-  end
-
-  context 'when making requests', focus: true do
-    let(:ssl_config) do
-      double(
-        'ssl config',
-        :cert_store= => nil,
-        :verify_callback= => nil,
-        :verify_mode= => nil,
-      )
-    end
-    let(:http) do
-      double(
-        'http',
-        :connect_timeout= => nil,
-        :receive_timeout= => nil,
-        :ssl_config => ssl_config,
-        :tcp_keepalive= => nil,
-        :transparent_gzip_decompression= => nil,
-      )
-    end
-    let(:client) { Puppet::Rest::Client.new(ssl_context: Puppet::Rest::SSLContext.new(OpenSSL::SSL::VERIFY_NONE), client: http) }
-    let(:url) { 'https://myserver.com:555/data' }
-
-    describe "#get" do
-      it 'makes a GET request given a URL, query hash, header hash, and streaming block' do
-        query = { 'environment' => 'production' }
-        header = { 'Accept' => 'text/plain' }
-        response_string = ''
-        chunk_processing = lambda { |chunk| response_string = chunk }
-        expect(http).to receive(:get_content).with(url, { query: query, header: header }).and_yield('response')
-        client.get(url, query: query, header: header, &chunk_processing)
-        expect(response_string).to eq('response')
-      end
-
-      it 'throws an exception when the response to the GET is not OK' do
-        fake_response = double('resp', :status => HTTP::Status::BAD_REQUEST)
-        expect(http).to receive(:get_content).with(url, query: nil, header: nil)
-            .and_raise(HTTPClient::BadResponseError.new('failed request', fake_response))
-        expect { client.get(url) }.to raise_error do |error|
-          expect(error.message).to eq('failed request')
-          expect(error.response).to be_a(Puppet::Rest::Response)
-          expect(error.response.status_code).to eq(400)
-        end
-      end
-
-      include_examples 'connection error handling'
-    end
-
-    describe "#put" do
-      it 'makes a PUT request given a URL, string body, query hash, and header hash' do
-        body = 'send to server'
-        query = { 'environment' => 'production' }
-        header = { 'Accept' => 'text/plain' }
-        expect(http).to receive(:put).with(url, { body: body, query: query, header: header })
-        client.put(url, body: body, query: query, header: header)
-      end
-
-      include_examples 'connection error handling'
-    end
-  end
-end