puppet 6.10.1 → 6.11.0

data/spec/unit/type/package_spec.rb

@@ -375,6 +375,11 @@ describe Puppet::Type.type(:package) do
       expect(pkg[:allow_virtual]).to eq true
     end
 
+    it "defaults to false on dpkg provider" do
+      pkg = Puppet::Type.type(:package).new(:name => 'yay', :provider => :dpkg)
+      expect(pkg[:allow_virtual]).to be_nil
+    end
+
     it "defaults to false on platforms that do not support virtual packages" do
       pkg = Puppet::Type.type(:package).new(:name => 'yay', :provider => :apple)
       expect(pkg[:allow_virtual]).to be_nil

data/spec/unit/util/execution_spec.rb

@@ -128,6 +128,13 @@ describe Puppet::Util::Execution, if: !Puppet::Util::Platform.jruby? do
 
           call_exec_posix('test command', { :cwd => cwd }, @stdin, @stdout, @stderr)
         end
+
+        it "should not change the current working directory if cwd is unspecified" do
+          expect(Dir).to receive(:chdir).never
+          expect(Kernel).to receive(:exec).with('test command')
+
+          call_exec_posix('test command', {}, @stdin, @stdout, @stderr)
+        end
       end
 
       it "should return the pid of the child process" do
@@ -171,6 +178,15 @@ describe Puppet::Util::Execution, if: !Puppet::Util::Platform.jruby? do
 
           call_exec_windows('test command', { :cwd => cwd }, @stdin, @stdout, @stderr)
         end
+
+        it "should not change the current working directory if cwd is unspecified" do
+          expect(Dir).to receive(:chdir).never
+          expect(Process).to receive(:create) do |args|
+            expect(args[:cwd]).to be_nil
+          end
+
+          call_exec_windows('test command', {}, @stdin, @stdout, @stderr)
+        end
       end
 
       context 'suppress_window option' do

data/spec/unit/util/http_proxy_spec.rb

@@ -60,6 +60,64 @@ describe Puppet::Util::HttpProxy do
         expects_direct_connection_to(http, www)
       end
     end
+
+    context 'when setting no_proxy' do
+      before :each do
+        Puppet[:http_proxy_host] = host
+        Puppet[:http_proxy_port] = port
+      end
+
+      it 'connects directly to the server when HTTP_PROXY environment variable is set, but server matches no_proxy setting' do
+        Puppet[:no_proxy] = www.host
+
+        Puppet::Util.withenv('HTTP_PROXY' => "http://#{host}:#{port}") do
+          http = subject.proxy(www)
+          expects_direct_connection_to(http, www)
+        end
+      end
+
+      it 'connects directly to the server when no_proxy matches wildcard domain' do
+        Puppet[:no_proxy] = '*.example.com'
+
+        http = subject.proxy(www)
+        expects_direct_connection_to(http, www)
+      end
+
+      it 'connects directly to the server when no_proxy matches dotted domain' do
+        Puppet[:no_proxy] = '.example.com'
+
+        http = subject.proxy(www)
+        expects_direct_connection_to(http, www)
+      end
+
+      it 'connects directly to the server when no_proxy matches a domain suffix like ruby does' do
+        Puppet[:no_proxy] = 'example.com'
+
+        http = subject.proxy(www)
+        expects_direct_connection_to(http, www)
+      end
+
+      it 'connects directly to the server when no_proxy matches a partial suffix like ruby does' do
+        Puppet[:no_proxy] = 'ample.com'
+
+        http = subject.proxy(www)
+        expects_direct_connection_to(http, www)
+      end
+
+      it 'connects directly to the server when it is a subdomain of no_proxy' do
+        Puppet[:no_proxy] = '*.com'
+
+        http = subject.proxy(www)
+        expects_direct_connection_to(http, www)
+      end
+
+      it 'connects directly to the server when no_proxy is *' do
+        Puppet[:no_proxy] = '*'
+
+        http = subject.proxy(www)
+        expects_direct_connection_to(http, www)
+      end
+    end
   end
 
   describe ".http_proxy_env" do
@@ -291,22 +349,22 @@ describe Puppet::Util::HttpProxy do
 
   describe '.request_with_redirects' do
     let(:dest) { URI.parse('http://mydomain.com/some/path') }
-    let(:http_ok) { double('http ok', :code => 200, :message => 'HTTP OK') }
 
     it 'generates accept and accept-encoding headers' do
-      allow_any_instance_of(Net::HTTP).to receive(:head).and_return(http_ok)
-      expect_any_instance_of(Net::HTTP).to receive(:get) do |_, _, headers|
-        expect(headers)
-          .to match({'Accept' => '*/*',
-                     'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-                     'User-Agent' => /Puppet/})
-      end.and_return(http_ok)
+      stub_request(:head, dest)
+
+      headers = {
+        'Accept' => '*/*',
+        'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+        'User-Agent' => /Puppet/
+      }
+      stub_request(:get, dest).with(headers: headers)
 
       subject.request_with_redirects(dest, :get, 0)
     end
 
     it 'can return a compressed response body' do
-      allow_any_instance_of(Net::HTTP).to receive(:head).and_return(http_ok)
+      stub_request(:head, dest)
 
       compressed_body = [
         0x1f, 0x8b, 0x08, 0x08, 0xe9, 0x08, 0x7a, 0x5a, 0x00, 0x03,
@@ -314,9 +372,7 @@ describe Puppet::Util::HttpProxy do
         0x00, 0x7a, 0x7a, 0x6f, 0xed, 0x03, 0x00, 0x00, 0x00
       ].pack('C*')
 
-      response = double('http ok', :code => 200, :message => 'HTTP OK', :body => compressed_body)
-      allow(response).to receive(:[]).with('content-encoding').and_return('gzip')
-      expect_any_instance_of(Net::HTTP).to receive(:get).and_return(response)
+      stub_request(:get, dest).to_return(status: 200, body: compressed_body, headers: { 'Content-Encoding' => 'gzip' })
 
       expect(
         uncompress_body(subject.request_with_redirects(dest, :get, 0))
@@ -324,13 +380,14 @@ describe Puppet::Util::HttpProxy do
     end
 
     it 'generates accept and accept-encoding headers when a block is provided' do
-      allow_any_instance_of(Net::HTTP).to receive(:head).and_return(http_ok)
-      expect_any_instance_of(Net::HTTP).to receive(:request_get) do |_, _, headers, &block|
-        expect(headers)
-          .to match({'Accept' => '*/*',
-                     'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-                     'User-Agent' => /Puppet/})
-      end.and_return(http_ok)
+      stub_request(:head, dest)
+
+      headers = {
+        'Accept' => '*/*',
+        'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+        'User-Agent' => /Puppet/
+      }
+      stub_request(:get, dest).with(headers: headers)
 
       subject.request_with_redirects(dest, :get, 0) do
         # unused
@@ -338,7 +395,7 @@ describe Puppet::Util::HttpProxy do
     end
 
     it 'only makes a single HEAD request' do
-      expect_any_instance_of(Net::HTTP).to receive(:head).with(anything, anything).and_return(http_ok)
+      stub_request(:head, dest)
 
       subject.request_with_redirects(dest, :head, 0)
     end
@@ -346,13 +403,8 @@ describe Puppet::Util::HttpProxy do
     it 'preserves query parameters' do
       url = URI.parse('http://mydomain.com/some/path?foo=bar')
 
-      expect_any_instance_of(Net::HTTP).to receive(:head) do |_method, path, _headers|
-        expect(path).to eq(url)
-      end.and_return(http_ok)
-
-      expect_any_instance_of(Net::HTTP).to receive(:request_get) do |_http, path, _headers, &block|
-        expect(path).to eq(url)
-      end.and_return(http_ok)
+      stub_request(:head, url)
+      stub_request(:get, url)
 
       subject.request_with_redirects(url, :get, 0) do
         # unused

data/spec/unit/util/log/destinations_spec.rb

@@ -46,13 +46,15 @@ describe Puppet::Util::Log.desttypes[:file] do
 
     describe "on POSIX systems", :if => Puppet.features.posix? do
       describe "with a normal file" do
+        let (:parent) { Pathname.new('/tmp') }
         let (:abspath) { '/tmp/log' }
         let (:relpath) { 'log' }
 
         it_behaves_like "file destination"
 
         it "logs an error if it can't chown the file owner & group" do
-          expect(File).to receive(:exists?).with(abspath).and_return(false)
+          allow(File).to receive(:exist?).with(parent).and_return(true)
+          expect(File).to receive(:exist?).with(Pathname.new(abspath)).and_return(false)
           expect(FileUtils).to receive(:chown).with(Puppet[:user], Puppet[:group], abspath).and_raise(Errno::EPERM)
           expect(Puppet.features).to receive(:root?).and_return(true)
           expect(Puppet).to receive(:err).with("Unable to set ownership to #{Puppet[:user]}:#{Puppet[:group]} for log file: #{abspath}")
@@ -61,7 +63,8 @@ describe Puppet::Util::Log.desttypes[:file] do
         end
 
         it "doesn't attempt to chown when running as non-root" do
-          expect(File).to receive(:exists?).with(abspath).and_return(false)
+          allow(File).to receive(:exist?).with(parent).and_return(true)
+          expect(File).to receive(:exist?).with(Pathname.new(abspath)).and_return(false)
           expect(FileUtils).not_to receive(:chown).with(Puppet[:user], Puppet[:group], abspath)
           expect(Puppet.features).to receive(:root?).and_return(false)
 
@@ -69,7 +72,8 @@ describe Puppet::Util::Log.desttypes[:file] do
         end
 
         it "doesn't attempt to chown when file already exists" do
-          expect(File).to receive(:exists?).with(abspath).and_return(true)
+          allow(File).to receive(:exist?).with(parent).and_return(true)
+          expect(File).to receive(:exist?).with(Pathname.new(abspath)).and_return(true)
           expect(FileUtils).not_to receive(:chown).with(Puppet[:user], Puppet[:group], abspath)
           expect(Puppet.features).to receive(:root?).and_return(true)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.10.1
+  version: 6.11.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -148,6 +148,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Puppet, an automated configuration management tool
 email: info@puppetlabs.com
 executables:
@@ -540,6 +554,18 @@ files:
 - lib/puppet/graph/relationship_graph.rb
 - lib/puppet/graph/sequential_prioritizer.rb
 - lib/puppet/graph/simple_graph.rb
+- lib/puppet/http.rb
+- lib/puppet/http/client.rb
+- lib/puppet/http/errors.rb
+- lib/puppet/http/redirector.rb
+- lib/puppet/http/resolver.rb
+- lib/puppet/http/resolver/settings.rb
+- lib/puppet/http/resolver/srv.rb
+- lib/puppet/http/response.rb
+- lib/puppet/http/retry_after_handler.rb
+- lib/puppet/http/service.rb
+- lib/puppet/http/service/ca.rb
+- lib/puppet/http/session.rb
 - lib/puppet/indirector.rb
 - lib/puppet/indirector/catalog/compiler.rb
 - lib/puppet/indirector/catalog/json.rb
@@ -838,7 +864,6 @@ files:
 - lib/puppet/pops/loader/loader.rb
 - lib/puppet/pops/loader/loader_paths.rb
 - lib/puppet/pops/loader/module_loaders.rb
-- lib/puppet/pops/loader/null_loader.rb
 - lib/puppet/pops/loader/predefined_loader.rb
 - lib/puppet/pops/loader/puppet_function_instantiator.rb
 - lib/puppet/pops/loader/puppet_plan_instantiator.rb
@@ -1006,6 +1031,7 @@ files:
 - lib/puppet/provider/package/aptrpm.rb
 - lib/puppet/provider/package/blastwave.rb
 - lib/puppet/provider/package/dnf.rb
+- lib/puppet/provider/package/dnfmodule.rb
 - lib/puppet/provider/package/dpkg.rb
 - lib/puppet/provider/package/fink.rb
 - lib/puppet/provider/package/freebsd.rb
@@ -1093,6 +1119,7 @@ files:
 - lib/puppet/rest/response.rb
 - lib/puppet/rest/route.rb
 - lib/puppet/rest/routes.rb
+- lib/puppet/runtime.rb
 - lib/puppet/scheduler.rb
 - lib/puppet/scheduler/job.rb
 - lib/puppet/scheduler/scheduler.rb
@@ -1156,6 +1183,7 @@ files:
 - lib/puppet/transaction/persistence.rb
 - lib/puppet/transaction/report.rb
 - lib/puppet/transaction/resource_harness.rb
+- lib/puppet/trusted_external.rb
 - lib/puppet/type.rb
 - lib/puppet/type/component.rb
 - lib/puppet/type/exec.rb
@@ -1298,19 +1326,6 @@ files:
 - lib/puppet/util/windows/user.rb
 - lib/puppet/util/yaml.rb
 - lib/puppet/vendor.rb
-- lib/puppet/vendor/deep_merge/CHANGELOG
-- lib/puppet/vendor/deep_merge/Gemfile
-- lib/puppet/vendor/deep_merge/LICENSE
-- lib/puppet/vendor/deep_merge/PUPPET_README.md
-- lib/puppet/vendor/deep_merge/README.md
-- lib/puppet/vendor/deep_merge/Rakefile
-- lib/puppet/vendor/deep_merge/deep_merge.gemspec
-- lib/puppet/vendor/deep_merge/lib/deep_merge.rb
-- lib/puppet/vendor/deep_merge/lib/deep_merge/core.rb
-- lib/puppet/vendor/deep_merge/lib/deep_merge/deep_merge_hash.rb
-- lib/puppet/vendor/deep_merge/lib/deep_merge/rails_compat.rb
-- lib/puppet/vendor/deep_merge/test/test_deep_merge.rb
-- lib/puppet/vendor/load_deep_merge.rb
 - lib/puppet/vendor/load_pathspec.rb
 - lib/puppet/vendor/pathspec/CHANGELOG.md
 - lib/puppet/vendor/pathspec/LICENSE
@@ -1681,6 +1696,7 @@ files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -1732,9 +1748,6 @@ files:
 - spec/fixtures/unit/util/filetype/suntab_output
 - spec/fixtures/unit/util/monkey_patches/x509.pem
 - spec/fixtures/unit/util/rdoc/basic.pp
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_get/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_head/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_post/should_yield_to_the_block.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml
@@ -2051,6 +2064,11 @@ files:
 - spec/unit/graph/simple_graph_spec.rb
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/hiera_puppet_spec.rb
+- spec/unit/http/client_spec.rb
+- spec/unit/http/resolver_spec.rb
+- spec/unit/http/service/ca_spec.rb
+- spec/unit/http/service_spec.rb
+- spec/unit/http/session_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
 - spec/unit/indirector/catalog/json_spec.rb
 - spec/unit/indirector/catalog/msgpack_spec.rb
@@ -2340,6 +2358,7 @@ files:
 - spec/unit/provider/package/aptrpm_spec.rb
 - spec/unit/provider/package/base_spec.rb
 - spec/unit/provider/package/dnf_spec.rb
+- spec/unit/provider/package/dnfmodule_spec.rb
 - spec/unit/provider/package/dpkg_spec.rb
 - spec/unit/provider/package/freebsd_spec.rb
 - spec/unit/provider/package/gem_spec.rb
@@ -2926,6 +2945,7 @@ test_files:
 - spec/fixtures/unit/provider/cron/crontab/vixie_header.txt
 - spec/fixtures/unit/provider/cron/parsed/managed
 - spec/fixtures/unit/provider/cron/parsed/simple
+- spec/fixtures/unit/provider/package/dnfmodule/dnf-module-list-installed.txt
 - spec/fixtures/unit/provider/package/gem/gem-list-single-package
 - spec/fixtures/unit/provider/package/gem/line-with-1.8.5-warning
 - spec/fixtures/unit/provider/package/openbsd/pkginfo.detail
@@ -2977,9 +2997,6 @@ test_files:
 - spec/fixtures/unit/util/filetype/suntab_output
 - spec/fixtures/unit/util/monkey_patches/x509.pem
 - spec/fixtures/unit/util/rdoc/basic.pp
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_get/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_head/should_yield_to_the_block.yml
-- spec/fixtures/vcr/cassettes/Puppet_Network_HTTP_Connection/when_handling_requests/_request_post/should_yield_to_the_block.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_fetch_if_not_on_the_local_disk.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_not_update_if_content_on_disk_is_up-to-date.yml
 - spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_md5/should_update_if_content_differs_on_disk.yml
@@ -3296,6 +3313,11 @@ test_files:
 - spec/unit/graph/simple_graph_spec.rb
 - spec/unit/hiera/scope_spec.rb
 - spec/unit/hiera_puppet_spec.rb
+- spec/unit/http/client_spec.rb
+- spec/unit/http/resolver_spec.rb
+- spec/unit/http/service/ca_spec.rb
+- spec/unit/http/service_spec.rb
+- spec/unit/http/session_spec.rb
 - spec/unit/indirector/catalog/compiler_spec.rb
 - spec/unit/indirector/catalog/json_spec.rb
 - spec/unit/indirector/catalog/msgpack_spec.rb
@@ -3585,6 +3607,7 @@ test_files:
 - spec/unit/provider/package/aptrpm_spec.rb
 - spec/unit/provider/package/base_spec.rb
 - spec/unit/provider/package/dnf_spec.rb
+- spec/unit/provider/package/dnfmodule_spec.rb
 - spec/unit/provider/package/dpkg_spec.rb
 - spec/unit/provider/package/freebsd_spec.rb
 - spec/unit/provider/package/gem_spec.rb

data/lib/puppet/pops/loader/null_loader.rb

@@ -1,60 +0,0 @@
-# The null loader is empty and delegates everything to its parent if it has one.
-#
-class Puppet::Pops::Loader::NullLoader < Puppet::Pops::Loader::Loader
-  attr_reader :loader_name
-
-  # Construct a NullLoader, optionally with a parent loader
-  #
-  def initialize(parent_loader=nil, loader_name = "null-loader")
-    super(loader_name)
-    @parent = parent_loader
-  end
-
-  # Has parent if one was set when constructed
-  def parent
-    @parent
-  end
-
-  def find(typed_name)
-    if @parent.nil?
-      nil
-    else
-      @parent.find(typed_name)
-    end
-  end
-
-  def load_typed(typed_name)
-    if @parent.nil?
-      nil
-    else
-      @parent.load_typed(typed_name)
-    end
-  end
-
-  def loaded_entry(typed_name, check_dependencies = false)
-    if @parent.nil?
-      nil
-    else
-      @parent.loaded_entry(typed_name, check_dependencies)
-    end
-  end
-
-  # Has no entries on its own - always nil
-  def get_entry(typed_name)
-    nil
-  end
-
-  # Finds nothing, there are no entries
-  def find(name)
-    nil
-  end
-
-  # Cannot store anything
-  def set_entry(typed_name, value, origin = nil)
-    nil
-  end
-
-  def to_s()
-    "(NullLoader '#{loader_name}')"
-  end
-end