puppet 6.14.0-x64-mingw32 → 6.15.0-x64-mingw32

data/spec/unit/provider/package/yum_spec.rb

@@ -3,6 +3,17 @@ require 'spec_helper'
 describe Puppet::Type.type(:package).provider(:yum) do
   include PuppetSpec::Fixtures
 
+  let(:resource_name) { 'myresource' }
+  let(:resource) do
+    Puppet::Type.type(:package).new(
+      :name     => resource_name,
+      :ensure   => :installed,
+      :provider => 'yum'
+    )
+  end
+
+  let(:provider) { Puppet::Type.type(:package).provider(:yum).new(resource) }
+
   it_behaves_like 'RHEL package provider', described_class, 'yum'
 
   it "should have lower specificity" do
@@ -96,7 +107,7 @@ describe Puppet::Type.type(:package).provider(:yum) do
       end
     end
 
-    describe 'with install_options' do 
+    describe 'with install_options' do
       it 'can parse disable-repo with array of strings' do
           resource[:install_options] = ['--disable-repo=dev*', '--disable-repo=prod*']
           expect(provider).to receive(:execute) do | arr|
@@ -235,5 +246,228 @@ describe Puppet::Type.type(:package).provider(:yum) do
         expect(output).not_to include("Random plugin")
       end
     end
+
+    context "with subscription manager enabled " do
+      let(:check_update) { File.read(my_fixture("yum-check-update-subscription-manager.txt")) }
+      let(:output) { described_class.parse_updates(check_update) }
+
+      it "parses correctly formatted entries" do
+        expect(output['curl.x86_64']).to eq([{:name => 'curl', :epoch => '0', :version => '7.32.0', :release => '10.fc20', :arch => 'x86_64'}])
+      end
+    end
+  end
+
+  describe 'insync?' do
+    context 'when version is not a valid RPM version' do
+      let(:is) { 'a:123' }
+
+      before do
+        resource[:ensure] = is
+      end
+
+      it 'logs a debug message' do
+        expect(Puppet).to receive(:debug).with("Cannot parse #{is} as a RPM version range")
+        provider.insync?(is)
+      end
+
+      context 'when requested version equals installed version' do
+        it { expect(provider).to be_insync(is) }
+      end
+
+      context 'when requested version is different than installed versions' do
+        it { expect(provider).not_to be_insync('999') }
+      end
+    end
+
+    context 'with valid semantic versions' do
+      let(:is) { '1:1.2.3.4-5.el4' }
+
+      it 'returns true if current version matches the greater or equal semantic version in ensure' do
+        resource[:ensure] = '<=1:1.2.3.4-5.el4'
+        expect(provider).to be_insync(is)
+      end
+
+      it 'returns true if current version matches the lesser semantic version in ensure' do
+        resource[:ensure] = '>1:1.0.0'
+        expect(provider).to be_insync(is)
+      end
+
+      it 'returns true if current version matches two semantic conditions' do
+        resource[:ensure] = '>1:1.1.3.4-5.el4 <1:1.3.3.6-5.el4'
+        expect(provider).to be_insync(is)
+      end
+
+      it 'returns false if current version does not match matches two semantic conditions' do
+        resource[:ensure] = '<1:1.1.3.4-5.el4 <1:1.3.3.6-5.el4'
+        expect(provider).not_to be_insync(is)
+      end
+    end
+  end
+
+  describe 'install' do
+    before do
+      resource[:ensure] = ensure_value
+      allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return('7')
+      allow(described_class).to receive(:command).with(:cmd).and_return('/usr/bin/yum')
+      allow(provider).to receive(:query).twice.and_return(nil, ensure: '18.3.2')
+      allow(provider).to receive(:insync?).with('18.3.2').and_return(true)
+    end
+
+    context 'with version range' do
+      before do
+        allow(provider).to receive(:available_versions).and_return(available_versions)
+      end
+
+      context 'without epoch' do
+        let(:ensure_value) { '>18.1 <19' }
+        let(:available_versions) { ['17.5.2', '18.0', 'a:23', '18.3', '18.3.2', '19.0', '3:18.4'] }
+
+        it 'selects best_version' do
+          expect(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, 'myresource-18.3.2']
+          )
+          provider.install
+        end
+
+        context 'when comparing with available packages that do not have epoch' do
+          let(:ensure_value) { '>18' }
+          let(:available_versions) { ['18.3.3', '3:18.3.2'] }
+
+          it 'treats no epoch as zero' do
+            expect(provider).to receive(:execute).with(
+              ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, 'myresource-18.3.2']
+              )
+            provider.install
+          end
+        end
+      end
+
+      context 'with epoch' do
+        let(:ensure_value) { '>18.1 <3:19' }
+        let(:available_versions) { ['3:17.5.2', '3:18.0', 'a:23', '18.3.3', '3:18.3.2', '3:19.0', '19.1'] }
+
+        it 'selects best_version and removes epoch' do
+          expect(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, 'myresource-18.3.2']
+          )
+          provider.install
+        end
+      end
+
+      context 'when no suitable version in range' do
+        let(:ensure_value) { '>18.1 <19' }
+        let(:available_versions) { ['3:17.5.2', '3:18.0', 'a:23' '18.3', '3:18.3.2', '3:19.0', '19.1'] }
+
+        it 'uses requested version' do
+          expect(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, "myresource->18.1 <19"]
+          )
+          provider.install
+        end
+
+        it 'logs a debug message' do
+          allow(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, "myresource->18.1 <19"]
+          )
+
+          expect(Puppet).to receive(:debug).with(
+            "No available version for package myresource is included in range >18.1 <19"
+          )
+          provider.install
+        end
+      end
+    end
+
+    context 'with fix version' do
+      let(:ensure_value) { '1:18.12' }
+
+      it 'passes the version to yum command' do
+        expect(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, "myresource-1:18.12"]
+          )
+          provider.install
+      end
+    end
+
+    context 'when upgrading' do
+      let(:ensure_value) { '>18.1 <19' }
+      let(:available_versions) { ['17.5.2', '18.0', 'a:23' '18.3', '18.3.2', '19.0', '3:18.4'] }
+
+      before do
+        allow(provider).to receive(:available_versions).and_return(available_versions)
+        allow(provider).to receive(:query).twice
+          .and_return({ ensure: '17.0' }, { ensure: '18.3.2' })
+      end
+
+      it 'adds update flag to install command' do
+        expect(provider).to receive(:execute).with(
+          ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', 'update', 'myresource-18.3.2']
+        )
+        provider.install
+      end
+    end
+
+    context 'when dowgrading' do
+      let(:ensure_value) { '>18.1 <19' }
+      let(:available_versions) { ['17.5.2', '18.0', 'a:23' '18.3', '18.3.2', '19.0', '3:18.4'] }
+
+      before do
+        allow(provider).to receive(:available_versions).and_return(available_versions)
+        allow(provider).to receive(:query).twice
+          .and_return({ ensure: '19.0' }, { ensure: '18.3.2' })
+      end
+
+      it 'adds downgrade flag to install command' do
+        expect(provider).to receive(:execute).with(
+          ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :downgrade, 'myresource-18.3.2']
+        )
+        provider.install
+      end
+    end
+
+    context 'on failure' do
+      let(:ensure_value) { '20' }
+
+      context 'when execute command fails' do
+        before do
+          allow(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, "myresource-20"]
+          ).and_return('No package myresource-20 available.')
+        end
+
+        it 'raises Puppet::Error' do
+          expect { provider.install }.to \
+            raise_error(Puppet::Error, 'Could not find package myresource-20')
+        end
+      end
+
+      context 'when package is not found' do
+        before do
+          allow(provider).to receive(:query)
+          allow(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, "myresource-20"]
+          )
+        end
+
+        it 'raises Puppet::Error' do
+          expect { provider.install }.to \
+            raise_error(Puppet::Error, 'Could not find package myresource')
+        end
+      end
+
+      context 'when package is not installed' do
+        before do
+          allow(provider).to receive(:execute).with(
+            ['/usr/bin/yum', '-d', '0', '-e', '0', '-y', :install, "myresource-20"]
+          )
+          allow(provider).to receive(:insync?).and_return(false)
+        end
+
+        it 'raises Puppet::Error' do
+          expect { provider.install }.to \
+            raise_error(Puppet::Error, 'Failed to update to version 20, got version 18.3.2 instead')
+        end
+      end
+    end
   end
 end

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

@@ -187,9 +187,18 @@ describe 'Puppet::Type::Service::Provider::Systemd', unless: Puppet::Util::Platf
         autovt@.service
         avahi-daemon.service
         blk-availability.service
+        apparmor.service
+        umountnfs.service
+        urandom.service
       })
     end
-  end
+
+    it "should print a debug message when a service with the state `bad` is found" do
+      expect(provider_class).to receive(:systemctl).with('list-unit-files', '--type', 'service', '--full', '--all', '--no-pager').and_return(File.read(my_fixture('list_unit_files_services')))
+      expect(Puppet).to receive(:debug).with("apparmor.service marked as bad by `systemctl`. It is recommended to be further checked.")
+      provider_class.instances
+    end
+  end 
 
   describe "#start" do
     it "should use the supplied start command if specified" do

data/spec/unit/provider/user/windows_adsi_spec.rb

@@ -78,9 +78,9 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet::Util::
     let(:group3) { double(:account => 'group3', :domain => '.', :sid => 'group3sid') }
 
     before :each do
-      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group1').and_return(group1)
-      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group2').and_return(group2)
-      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group3').and_return(group3)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group1', any_args).and_return(group1)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group2', any_args).and_return(group2)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('group3', any_args).and_return(group3)
     end
 
     it "should return true for same lists of members" do

data/spec/unit/puppet_pal_2pec.rb

@@ -708,35 +708,6 @@ describe 'Puppet Pal' do
         end
       end
 
-      context 'facts are supported such that' do
-        it 'they are obtained if they are not given' do
-          facts = Puppet::Node::Facts.new(Puppet[:certname], 'puppetversion' => Puppet.version)
-          Puppet::Node::Facts.indirection.save(facts)
-
-          testing_env_dir # creates the structure
-          result = Puppet::Pal.in_tmp_environment('pal_env', modulepath: modulepath ) do |ctx|
-            ctx.with_script_compiler {|c| c.evaluate_string("$facts =~ Hash and $facts[puppetversion] == '#{Puppet.version}'") }
-          end
-          expect(result).to eq(true)
-        end
-
-        it 'can be given as a hash when creating the environment' do
-          testing_env_dir # creates the structure
-          result = Puppet::Pal.in_tmp_environment('pal_env', modulepath: modulepath, facts: { 'myfact' => 42 }) do |ctx|
-            ctx.with_script_compiler {|c| c.evaluate_string("$facts =~ Hash and $facts[myfact] == 42") }
-          end
-          expect(result).to eq(true)
-        end
-
-        it 'can be overridden with a hash when creating a script compiler' do
-          testing_env_dir # creates the structure
-          result = Puppet::Pal.in_tmp_environment('pal_env', modulepath: modulepath, facts: { 'myfact' => 42 }) do |ctx|
-            ctx.with_script_compiler(facts: { 'myfact' => 43 }) {|c| c.evaluate_string("$facts =~ Hash and $facts[myfact] == 43") }
-          end
-          expect(result).to eq(true)
-        end
-      end
-
       context 'supports tasks such that' do
         it '"task_signature" returns the signatures of a generic task' do
           result = Puppet::Pal.in_tmp_environment('pal_env', modulepath: modulepath, facts: node_facts) do |ctx|

data/spec/unit/reports/http_spec.rb

@@ -1,101 +1,119 @@
 require 'spec_helper'
 require 'puppet/reports'
 
-processor = Puppet::Reports.report(:http)
+describe Puppet::Reports.report(:http) do
+  subject { Puppet::Transaction::Report.new.extend(described_class) }
 
-describe processor do
-  subject { Puppet::Transaction::Report.new.extend(processor) }
+  let(:url) { "https://puppet.example.com/report/upload" }
+
+  before :each do
+    Puppet[:reporturl] = url
+  end
 
   describe "when setting up the connection" do
-    let(:http) { double("http") }
-    let(:httpok) { Net::HTTPOK.new('1.1', 200, '') }
+    it "raises if the connection fails" do
+      stub_request(:post, url).to_raise(Errno::ECONNREFUSED.new('Connection refused - connect(2)'))
 
-    before :each do
-      expect(http).to receive(:post).and_return(httpok)
+      expect {
+        subject.process
+      }.to raise_error(Puppet::HTTP::HTTPError, /Request to #{url} failed after .* seconds: .*Connection refused/)
     end
 
     it "configures the connection for ssl when using https" do
-      Puppet[:reporturl] = 'https://testing:8080/the/path'
+      stub_request(:post, url)
 
-      expect(Puppet::Network::HttpPool).to receive(:connection).with(
-        'testing', 8080, hash_including(ssl_context: instance_of(Puppet::SSL::SSLContext))
-      ).and_return(http)
+      expect_any_instance_of(Net::HTTP).to receive(:start) do |http|
+        expect(http).to be_use_ssl
+        expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_PEER)
+      end
 
       subject.process
     end
 
     it "does not configure the connection for ssl when using http" do
-      Puppet[:reporturl] = 'http://testing:8080/the/path'
+      Puppet[:reporturl] = 'http://puppet.example.com:8080/the/path'
+      stub_request(:post, Puppet[:reporturl])
 
-      expect(Puppet::Network::HttpPool).to receive(:connection).with(
-        'testing', 8080, use_ssl: false, ssl_context: nil
-      ).and_return(http)
+      expect_any_instance_of(Net::HTTP).to receive(:start) do |http|
+        expect(http).to_not be_use_ssl
+      end
 
       subject.process
     end
   end
 
   describe "when making a request" do
-    let(:connection) { double("connection") }
-    let(:httpok) { Net::HTTPOK.new('1.1', 200, '') }
-    let(:options) { {:metric_id => [:puppet, :report, :http]} }
+    it "uses the path specified by the 'reporturl' setting" do
+      req = stub_request(:post, url)
+
+      subject.process
 
-    before :each do
-      expect(Puppet::Network::HttpPool).to receive(:connection).and_return(connection)
+      expect(req).to have_been_requested
     end
 
-    it "should use the path specified by the 'reporturl' setting" do
-      report_path = URI.parse(Puppet[:reporturl]).path
-      expect(connection).to receive(:post).with(report_path, anything, anything, options).and_return(httpok)
+    it "uses the username and password specified by the 'reporturl' setting" do
+      Puppet[:reporturl] = "https://user:pass@puppet.example.com/report/upload"
+
+      req = stub_request(:post, %r{/report/upload}).with(basic_auth: ['user', 'pass'])
 
       subject.process
+
+      expect(req).to have_been_requested
     end
 
-    it "should use the username and password specified by the 'reporturl' setting" do
-      Puppet[:reporturl] = "https://user:pass@myhost.mydomain:1234/report/upload"
+    it "passes metric_id options" do
+      stub_request(:post, url)
 
-      expect(connection).to receive(:post).with(anything, anything, anything,
-                                                {:metric_id => [:puppet, :report, :http],
-                                                 :basic_auth => {
-                                                   :user => 'user',
-                                                   :password => 'pass'
-                                                 }}).and_return(httpok)
+      expect(Puppet.runtime['http']).to receive(:post).with(anything, anything, hash_including(options: hash_including(metric_id: [:puppet, :report, :http]))).and_call_original
 
       subject.process
     end
 
-    it "should give the body as the report as YAML" do
-      expect(connection).to receive(:post).with(anything, subject.to_yaml, anything, options).and_return(httpok)
+    it "passes the report as YAML" do
+      req = stub_request(:post, url).with(body: subject.to_yaml)
 
       subject.process
+
+      expect(req).to have_been_requested
     end
 
-    it "should set content-type to 'application/x-yaml'" do
-      expect(connection).to receive(:post).with(anything, anything, hash_including("Content-Type" => "application/x-yaml"), options).and_return(httpok)
+    it "sets content-type to 'application/x-yaml'" do
+      req = stub_request(:post, url).with(headers: {'Content-Type' => 'application/x-yaml'})
 
       subject.process
+
+      expect(req).to have_been_requested
     end
 
-    Net::HTTPResponse::CODE_TO_OBJ.each do |code, klass|
-      if code.to_i >= 200 and code.to_i < 300
-        it "should succeed on http code #{code}" do
-          response = klass.new('1.1', code, '')
-          expect(connection).to receive(:post).and_return(response)
+    it "doesn't log anything if the request succeeds" do
+      req = stub_request(:post, url).to_return(status: [200, "OK"])
 
-          expect(Puppet).not_to receive(:err)
-          subject.process
-        end
-      end
+      subject.process
 
-      if code.to_i >= 300 && ![301, 302, 307].include?(code.to_i)
-        it "should log error on http code #{code}" do
-          response = klass.new('1.1', code, '')
-          expect(connection).to receive(:post).and_return(response)
+      expect(req).to have_been_requested
+      expect(@logs).to eq([])
+    end
 
-          expect(Puppet).to receive(:err)
-          subject.process
-        end
-      end
+    it "follows redirects" do
+      location = {headers: {'Location' => url}}
+
+      req = stub_request(:post, url)
+              .to_return(**location, status: [301, "Moved Permanently"]).then
+              .to_return(**location, status: [302, "Found"]).then
+              .to_return(**location, status: [307, "Temporary Redirect"]).then
+              .to_return(status: [200, "OK"])
+
+      subject.process
+
+      expect(req).to have_been_requested.times(4)
+    end
+
+    it "logs an error if the request fails" do
+      stub_request(:post, url).to_return(status: [500, "Internal Server Error"])
+
+      subject.process
+
+      expect(@logs).to include(having_attributes(level: :err, message: "Unable to submit report to #{url} [500] Internal Server Error"))
     end
   end
 end