puppet 6.21.1 → 7.4.1

data/spec/unit/application/ssl_spec.rb

@@ -92,7 +92,7 @@ describe Puppet::Application::Ssl, unless: Puppet::Util::Platform.jruby? do
   end
 
   context 'when submitting a CSR' do
-    let(:csr_path) { File.join(Puppet[:requestdir], "#{name}.pem") }
+    let(:csr_path) { Puppet[:hostcsr] }
 
     before do
       ssl.command_line.args << 'submit_request'
@@ -318,7 +318,7 @@ describe Puppet::Application::Ssl, unless: Puppet::Util::Platform.jruby? do
     end
 
     it 'deletes the request' do
-      path = File.join(Puppet[:requestdir], "#{Puppet[:certname]}.pem")
+      path = Puppet[:hostcsr]
       File.write(path, @host[:csr].to_pem)
 
       expects_command_to_pass(%r{Removed certificate request #{path}})

data/spec/unit/certificate_factory_spec.rb

@@ -7,7 +7,7 @@ describe Puppet::CertificateFactory, :unless => RUBY_PLATFORM == 'java' do
   let :serial    do OpenSSL::BN.new('12') end
   let :name      do "example.local" end
   let :x509_name do OpenSSL::X509::Name.new([['CN', name]]) end
-  let :key       do Puppet::SSL::Key.new(name).generate end
+  let :key       do OpenSSL::PKey::RSA.new(Puppet[:keylength]) end
   let :csr       do
     csr = Puppet::SSL::CertificateRequest.new(name)
     csr.generate(key)

data/spec/unit/configurer/downloader_spec.rb

@@ -189,6 +189,8 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should return all changed file paths" do
+      Puppet[:ignore_plugin_errors] = true
+
       trans = double('transaction')
 
       catalog = double('catalog')
@@ -204,6 +206,8 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should yield the resources if a block is given" do
+      Puppet[:ignore_plugin_errors] = true
+
       trans = double('transaction')
 
       catalog = double('catalog')
@@ -221,6 +225,8 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should catch and log exceptions" do
+      Puppet[:ignore_plugin_errors] = true
+
       expect(Puppet).to receive(:log_exception)
       # The downloader creates a new catalog for each apply, and really the only object
       # that it is possible to stub for the purpose of generating a puppet error
@@ -230,8 +236,6 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "raises an exception if catalog application fails" do
-      Puppet[:ignore_plugin_errors] = false
-
       expect(@dler.file).to receive(:retrieve).and_raise(Puppet::Error, "testing")
 
       expect {

data/spec/unit/configurer/plugin_handler_spec.rb

@@ -19,30 +19,68 @@ describe Puppet::Configurer::PluginHandler do
       end
     end
 
-    it "downloads plugins, facts, and locales" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { times_called += 1 }.and_return([])
+    context "when i18n is enabled" do
+      before :each do
+        Puppet[:disable_i18n] = false
+      end
 
-      pluginhandler.download_plugins(environment)
-      expect(times_called).to eq(3)
-    end
+      it "downloads plugins, facts, and locales" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { times_called += 1 }.and_return([])
 
-    it "returns downloaded plugin, fact, and locale filenames" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
-        times_called += 1
+        pluginhandler.download_plugins(environment)
+        expect(times_called).to eq(3)
+      end
 
-        if times_called == 1
-          %w[/a]
-        elsif times_called == 2
-          %w[/b]
-        else
-          %w[/c]
+      it "returns downloaded plugin, fact, and locale filenames" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
+          times_called += 1
+
+          if times_called == 1
+            %w[/a]
+          elsif times_called == 2
+            %w[/b]
+          else
+            %w[/c]
+          end
         end
+
+        expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b /c])
+        expect(times_called).to eq(3)
+      end
+    end
+
+    context "when i18n is disabled" do
+      before :each do
+        Puppet[:disable_i18n] = true
+      end
+
+      it "downloads plugins, facts, but no locales" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { times_called += 1 }.and_return([])
+
+        pluginhandler.download_plugins(environment)
+        expect(times_called).to eq(2)
       end
 
-      expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b /c])
-      expect(times_called).to eq(3)
+      it "returns downloaded plugin, fact, and locale filenames" do
+        times_called = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
+          times_called += 1
+
+          if times_called == 1
+            %w[/a]
+          elsif times_called == 2
+            %w[/b]
+          else
+            %w[/c]
+          end
+        end
+
+        expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
+        expect(times_called).to eq(2)
+      end
     end
   end
 

data/spec/unit/configurer_spec.rb

@@ -384,7 +384,7 @@ describe Puppet::Configurer do
 
     it "sets the checksum_type query param to the default supported_checksum_types in a catalog request" do
       expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything,
-        hash_including(checksum_type: 'md5.sha256.sha384.sha512.sha224'))
+        hash_including(checksum_type: 'sha256.sha384.sha512.sha224.md5'))
       configurer.run
     end
 
@@ -657,6 +657,8 @@ describe Puppet::Configurer do
       end
 
       it "should pluginsync and compile a new catalog if none is found in the cache" do
+        Puppet[:ignore_plugin_errors] = true
+
         expects_fallback_to_new_catalog(catalog)
         stub_request(:get, %r{/puppet/v3/file_metadatas?/plugins}).to_return(:status => 404)
         stub_request(:get, %r{/puppet/v3/file_metadatas?/pluginfacts}).to_return(:status => 404)
@@ -668,6 +670,8 @@ describe Puppet::Configurer do
       end
 
       it "should not attempt to retrieve a cached catalog again if the first attempt failed" do
+        Puppet[:ignore_plugin_errors] = true
+
         expect(Puppet::Node.indirection).to receive(:find).and_return(nil)
         expects_neither_new_or_cached_catalog
         expects_pluginsync
@@ -1039,11 +1043,10 @@ describe Puppet::Configurer do
     it "should select a server when it receives 200 OK response" do
       Puppet.settings[:server_list] = ["myserver:123"]
 
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 200)
+      stub_request(:get, 'https://myserver:123/status/v1/simple/server').to_return(status: 200)
 
       options = {}
       configurer.run(options)
-      expect(options[:report].master_used).to eq('myserver:123')
       expect(options[:report].server_used).to eq('myserver:123')
     end
 
@@ -1051,7 +1054,7 @@ describe Puppet::Configurer do
       Puppet.settings[:server_list] = ["myserver:123"]
       Puppet[:usecacheonfailure] = false
 
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: [500, "Internal Server Error"])
+      stub_request(:get, 'https://myserver:123/status/v1/simple/server').to_return(status: [500, "Internal Server Error"])
 
       expect {
         configurer.run
@@ -1064,8 +1067,8 @@ describe Puppet::Configurer do
       Puppet.settings[:server_list] = "myserver:123,someotherservername"
       Puppet[:usecacheonfailure] = false
 
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 400)
-      stub_request(:get, 'https://someotherservername:8140/status/v1/simple/master').to_return(status: 400)
+      stub_request(:get, 'https://myserver:123/status/v1/simple/server').to_return(status: 400)
+      stub_request(:get, 'https://someotherservername:8140/status/v1/simple/server').to_return(status: 400)
 
       expect{
         configurer.run
@@ -1076,8 +1079,8 @@ describe Puppet::Configurer do
       Puppet.settings[:server_list] = "myserver:123,someotherservername"
       Puppet[:usecacheonfailure] = true
 
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 400)
-      stub_request(:get, 'https://someotherservername:8140/status/v1/simple/master').to_return(status: 400)
+      stub_request(:get, 'https://myserver:123/status/v1/simple/server').to_return(status: 400)
+      stub_request(:get, 'https://someotherservername:8140/status/v1/simple/server').to_return(status: 400)
 
       options = {}
 
@@ -1091,7 +1094,7 @@ describe Puppet::Configurer do
       Puppet::Node.indirection.terminus_class = :rest
       Puppet::Resource::Catalog.indirection.terminus_class = :rest
 
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 200)
+      stub_request(:get, 'https://myserver:123/status/v1/simple/server').to_return(status: 200)
       stub_request(:post, %r{https://myserver:123/puppet/v3/catalog}).to_return(status: 200)
       node_request = stub_request(:get, %r{https://myserver:123/puppet/v3/node/}).to_return(status: 200)
 

data/spec/unit/context/trusted_information_spec.rb

@@ -4,11 +4,7 @@ require 'puppet/certificate_factory'
 require 'puppet/context/trusted_information'
 
 describe Puppet::Context::TrustedInformation, :unless => RUBY_PLATFORM == 'java' do
-  let(:key) do
-    key = Puppet::SSL::Key.new("myname")
-    key.generate
-    key
-  end
+  let(:key) { OpenSSL::PKey::RSA.new(Puppet[:keylength]) }
 
   let(:csr) do
     csr = Puppet::SSL::CertificateRequest.new("csr")
@@ -26,7 +22,7 @@ describe Puppet::Context::TrustedInformation, :unless => RUBY_PLATFORM == 'java'
 
     # The cert must be signed so that it can be successfully be DER-decoded later
     signer = Puppet::SSL::CertificateSigner.new
-    signer.sign(cert.content, key.content)
+    signer.sign(cert.content, key)
     cert
   end
 

data/spec/unit/defaults_spec.rb

@@ -65,9 +65,9 @@ describe "Defaults" do
   end
 
   describe '.default_digest_algorithm' do
-    it 'defaults to md5 when FIPS is not enabled' do
+    it 'defaults to sha256 when FIPS is not enabled' do
       allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
-      expect(Puppet.default_digest_algorithm).to eq('md5')
+      expect(Puppet.default_digest_algorithm).to eq('sha256')
     end
 
     it 'defaults to sha256 when FIPS is enabled' do
@@ -77,9 +77,9 @@ describe "Defaults" do
   end
 
   describe '.supported_checksum_types' do
-    it 'defaults to md5, sha256, sha384, sha512, sha224 when FIPS is not enabled' do
+    it 'defaults to sha256, sha384, sha512, sha224, md5 when FIPS is not enabled' do
       allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
-      expect(Puppet.default_file_checksum_types).to eq(%w[md5 sha256 sha384 sha512 sha224])
+      expect(Puppet.default_file_checksum_types).to eq(%w[sha256 sha384 sha512 sha224 md5])
     end
 
     it 'defaults to sha256, sha384, sha512, sha224 when FIPS is enabled' do
@@ -89,8 +89,8 @@ describe "Defaults" do
   end
 
   describe 'Puppet[:supported_checksum_types]' do
-    it 'defaults to md5, sha256, sha512, sha384, sha224' do
-      expect(Puppet.settings[:supported_checksum_types]).to eq(%w[md5 sha256 sha384 sha512 sha224])
+    it 'defaults to sha256, sha512, sha384, sha224, md5' do
+      expect(Puppet.settings[:supported_checksum_types]).to eq(%w[sha256 sha384 sha512 sha224 md5])
     end
 
     it 'should raise an error on an unsupported checksum type' do
@@ -182,56 +182,31 @@ describe "Defaults" do
     end
   end
 
-  describe "facterng" do
-    it "defaults to false" do
-      expect(Puppet[:facterng]).to be_falsey
-    end
-
-    it "raises an exception if facter-ng could not be loaded" do
-      allow_any_instance_of(Puppet::Settings::BooleanSetting).to receive(:require).with('facter-ng').and_raise(LoadError)
-      allow(Facter).to receive(:value).with('facterversion').and_return('3.11.4')
-
-      expect{ Puppet.settings[:facterng] = true }.to raise_exception ArgumentError, 'facter-ng could not be loaded'
-    end
-
-    context 'set logger' do
-      before do
-        @original_facter = Object.const_get(:Facter)
-
-        Object.send(:remove_const, :Facter)
-        facter = double('facter')
-        allow(facter).to receive(:value).with('facterversion').and_return('3.11.4')
-        Object.const_set(:Facter, facter)
-
-        allow_any_instance_of(Puppet::Settings::BooleanSetting).to receive(:require).with('facter-ng').and_return(true)
-        allow(Facter).to receive(:respond_to?).and_return(false)
-      end
-
-      after do
-        Object.const_set(:Facter, @original_facter)
-      end
-
-      it 'calls setup_facter_logging!' do
-        allow(Puppet::Util::Logging).to receive(:setup_facter_logging!).and_return(true)
-        Puppet.settings[:facterng] = true
-        expect(Puppet::Util::Logging).to have_received(:setup_facter_logging!).once
-      end
-    end
-  end
-
   describe "deprecated settings" do
     it 'does not issue a deprecation warning by default' do
       expect(Puppet).to receive(:deprecation_warning).never
 
       Puppet.initialize_settings
     end
+  end
 
-    it 'issues a deprecation warning when func3x_check is disabled' do
-      Puppet[:func3x_check] = false
-
-      expect(Puppet).to receive(:deprecation_warning).with("The 'func3x_check' setting is deprecated and will be removed in a future release.")
+  describe "the default cadir", :unless => Puppet::Util::Platform.windows?  do
+    it 'defaults to the puppetserver confdir when no cadir is found' do
+      Puppet.initialize_settings
+      expect(Puppet[:cadir]).to eq('/etc/puppetlabs/puppetserver/ca')
+    end
 
+    it 'returns an empty string for Windows platforms', :if => Puppet::Util::Platform.windows? do
       Puppet.initialize_settings
+      expect(Puppet[:cadir]).to eq("")
+    end
+  end
+
+  describe '#default_cadir', :unless => Puppet::Util::Platform.windows?  do
+    it 'warns when a CA dir exists in the current ssldir' do
+      cadir = File.join(Puppet[:ssldir], 'ca')
+      FileUtils.mkdir_p(cadir)
+      expect(Puppet.default_cadir).to eq(cadir)
     end
   end
 end

data/spec/unit/environments_spec.rb

@@ -661,7 +661,6 @@ config_version=$vardir/random/scripts
 
       it "evicts an environment that hasn't been recently touched" do
         Puppet[:environment_timeout] = 1
-        Puppet[:environment_timeout_mode] = :from_last_used
 
         with_environment_loaded(service) do |cached|
           future = Time.now + 60
@@ -678,7 +677,6 @@ config_version=$vardir/random/scripts
 
       it "reuses an environment that was recently touched" do
         Puppet[:environment_timeout] = 60
-        Puppet[:environment_timeout_mode] = :from_last_used
 
         with_environment_loaded(service) do |cached|
           # reuse the already cached environment
@@ -691,7 +689,6 @@ config_version=$vardir/random/scripts
 
       it "evicts a recently touched environment" do
         Puppet[:environment_timeout] = 60
-        Puppet[:environment_timeout_mode] = :from_last_used
 
         expect(service).to receive(:expired?).and_return(true)
 

data/spec/unit/face/facts_spec.rb

@@ -71,4 +71,8 @@ CONF
                                log.message =~ /Uploading facts for '.*' to 'puppet\.server\.test'/}
     end
   end
+
+  describe "#show" do
+    it { is_expected.to be_action :show }
+  end
 end

data/spec/unit/face/node_spec.rb

@@ -78,8 +78,20 @@ describe Puppet::Face[:node, '0.0.1'] do
 
       describe "when cleaning certificate", :if => Puppet.features.puppetserver_ca? do
         it "should call the CA CLI gem's clean action" do
-          expect_any_instance_of(Puppetserver::Ca::Action::Clean).to receive(:run).with({ 'certnames' => ['hostname'] }).and_return(0)
-          subject.clean_cert('hostname')
+          expect_any_instance_of(Puppetserver::Ca::Action::Clean).
+            to receive(:clean_certs).
+            with(['hostname'], anything).
+            and_return(:success)
+
+          if Puppet[:cadir].start_with?(Puppet[:ssldir])
+            expect_any_instance_of(LoggerIO).
+              to receive(:warn).
+              with(/cadir is currently configured to be inside/)
+          end
+
+          expect(Puppet).not_to receive(:warning)
+          result = subject.clean_cert('hostname')
+          expect(result).to eq(0)
         end
 
         it "should not call the CA CLI gem's clean action if the gem is missing" do

data/spec/unit/face/plugin_spec.rb

@@ -16,48 +16,88 @@ describe Puppet::Face[:plugin, :current] do
       end
     end
 
-    it "downloads plugins, external facts, and locales" do
-      receive_count = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { receive_count += 1 }.and_return([])
+    context "when i18n is enabled" do
+      before(:each) do
+        Puppet[:disable_i18n] = false
+      end
 
-      pluginface.download
-      expect(receive_count).to eq(3)
-    end
+      it "downloads plugins, external facts, and locales" do
+        receive_count = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { receive_count += 1 }.and_return([])
 
-    it "renders 'No plugins downloaded' if nothing was downloaded" do
-      receive_count = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { receive_count += 1 }.and_return([])
+        pluginface.download
+        expect(receive_count).to eq(3)
+      end
 
-      result = pluginface.download
-      expect(receive_count).to eq(3)
-      expect(render(result)).to eq('No plugins downloaded.')
-    end
+      it "renders 'No plugins downloaded' if nothing was downloaded" do
+        receive_count = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { receive_count += 1 }.and_return([])
 
-    it "renders comma separate list of downloaded file names" do
-      receive_count = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
-        receive_count += 1
-        case receive_count
-        when 1
-          %w[/a]
-        when 2
-          %w[/b]
-        when 3
-          %w[/c]
-        end
+        result = pluginface.download
+        expect(receive_count).to eq(3)
+        expect(render(result)).to eq('No plugins downloaded.')
       end
 
-      result = pluginface.download
-      expect(receive_count).to eq(3)
-      expect(render(result)).to eq('Downloaded these plugins: /a, /b, /c')
+      it "renders comma separate list of downloaded file names" do
+        receive_count = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
+          receive_count += 1
+          case receive_count
+          when 1
+            %w[/a]
+          when 2
+            %w[/b]
+          when 3
+            %w[/c]
+          end
+        end
+
+        result = pluginface.download
+        expect(receive_count).to eq(3)
+        expect(render(result)).to eq('Downloaded these plugins: /a, /b, /c')
+      end
     end
 
-    it "uses persistent HTTP pool" do
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
-        expect(Puppet.lookup(:http_pool)).to be_instance_of(Puppet::Network::HTTP::Pool)
-      end.and_return([])
+    context "when i18n is enabled" do
+      before(:each) do
+        Puppet[:disable_i18n] = true
+      end
 
-      pluginface.download
+      it "downloads only plugins and external facts, no locales" do
+        receive_count = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { receive_count += 1 }.and_return([])
+
+        pluginface.download
+        expect(receive_count).to eq(2)
+      end
+
+      it "renders 'No plugins downloaded' if nothing was downloaded, without checking for locales" do
+        receive_count = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { receive_count += 1 }.and_return([])
+
+        result = pluginface.download
+        expect(receive_count).to eq(2)
+        expect(render(result)).to eq('No plugins downloaded.')
+      end
+
+      it "renders comma separate list of downloaded file names" do
+        receive_count = 0
+        allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
+          receive_count += 1
+          case receive_count
+          when 1
+            %w[/a]
+          when 2
+            %w[/b]
+          when 3
+            %w[/c]
+          end
+        end
+
+        result = pluginface.download
+        expect(receive_count).to eq(2)
+        expect(render(result)).to eq('Downloaded these plugins: /a, /b')
+      end
     end
   end