puppet 6.20.0-x64-mingw32 → 7.4.0-x64-mingw32

data/spec/integration/util/windows/security_spec.rb

@@ -822,7 +822,7 @@ describe "Puppet::Util::Windows::Security", :if => Puppet::Util::Platform.window
     end
 
     describe "locked files" do
-      let (:explorer) { File.join(Dir::WINDOWS, "explorer.exe") }
+      let (:explorer) { File.join(ENV['SystemRoot'], "explorer.exe") }
 
       it "should get the owner" do
         expect(winsec.get_owner(explorer)).to match(/^S-1-5-/)

data/spec/lib/puppet_spec/puppetserver.rb

@@ -103,7 +103,7 @@ class PuppetSpec::Puppetserver
   end
 
   def register_mounts(mounts: {})
-    register_mount('/status/v1/simple/master', proc { |req, res|  }, nil)
+    register_mount('/status/v1/simple/server', proc { |req, res|  }, nil)
     register_mount('/puppet/v3/node', mounts[:node], NodeServlet)
     register_mount('/puppet/v3/catalog', mounts[:catalog], CatalogServlet)
     register_mount('/puppet/v3/file_metadatas', mounts[:file_metadatas], FileMetadatasServlet)

data/spec/lib/puppet_spec/settings.rb

@@ -11,6 +11,7 @@ module PuppetSpec::Settings
     :confdir      => { :type => :directory, :default => "test", :desc => "confdir" },
     :codedir      => { :type => :directory, :default => "test", :desc => "codedir" },
     :vardir       => { :type => :directory, :default => "test", :desc => "vardir" },
+    :publicdir    => { :type => :directory, :default => "test", :desc => "publicdir" },
     :rundir       => { :type => :directory, :default => "test", :desc => "rundir" },
   }.freeze
 

data/spec/spec_helper.rb

@@ -145,6 +145,7 @@ RSpec.configure do |config|
 
     base = PuppetSpec::Files.tmpdir('tmp_settings')
     Puppet[:vardir] = File.join(base, 'var')
+    Puppet[:publicdir] = File.join(base, 'public')
     Puppet[:confdir] = File.join(base, 'etc')
     Puppet[:codedir] = File.join(base, 'code')
     Puppet[:logdir] = "$vardir/log"
@@ -152,6 +153,7 @@ RSpec.configure do |config|
     Puppet[:hiera_config] = File.join(base, 'hiera')
 
     FileUtils.mkdir_p Puppet[:statedir]
+    FileUtils.mkdir_p Puppet[:publicdir]
 
     Puppet::Test::TestHelper.before_each_test()
   end

data/spec/unit/agent_spec.rb

@@ -24,8 +24,6 @@ end
 
 describe Puppet::Agent do
   before do
-    allow(Puppet::Status.indirection).to receive(:find).and_return(Puppet::Status.new("version" => Puppet.version))
-
     @agent = Puppet::Agent.new(AgentTestClient, false)
 
     # make Puppet::Application safe for stubbing; restore in an :after block; silence warnings for this.

data/spec/unit/application/facts_spec.rb

@@ -50,4 +50,90 @@ describe Puppet::Application::Facts do
     }.to exit_with(0)
      .and output(expected).to_stdout
   end
+
+  context 'when show action is called' do
+    let(:expected) { <<~END }
+      {
+        "filesystems": "apfs,autofs,devfs",
+        "macaddress": "64:52:11:22:03:25"
+      }
+    END
+
+    before :each do
+      Puppet::Node::Facts.indirection.terminus_class = :facter
+      allow(Facter).to receive(:resolve).and_return(values)
+      app.command_line.args = %w{show}
+    end
+
+    it 'correctly displays facts with default formatting' do
+      expect {
+        app.run
+      }.to exit_with(0)
+       .and output(expected).to_stdout
+    end
+
+    it 'displays a single fact value' do
+      app.command_line.args << 'filesystems' << '--value-only'
+      expect {
+        app.run
+      }.to exit_with(0)
+       .and output("apfs,autofs,devfs\n").to_stdout
+    end
+
+    it "warns and ignores value-only when multiple fact names are specified" do
+      app.command_line.args << 'filesystems' << 'macaddress' << '--value-only'
+      expect {
+        app.run
+      }.to exit_with(0)
+       .and output(expected).to_stdout
+       .and output(/it can only be used when querying for a single fact/).to_stderr
+    end
+
+    {
+      "type_hash" => [{'a' => 2}, "{\n  \"a\": 2\n}"],
+      "type_array" => [[], "[\n\n]"],
+      "type_string" => ["str", "str"],
+      "type_int" => [1, "1"],
+      "type_float" => [1.0, "1.0"],
+      "type_true" => [true, "true"],
+      "type_false" => [false, "false"],
+      "type_nil" => [nil, ""],
+      "type_sym" => [:sym, "sym"]
+    }.each_pair do |name, values|
+      it "renders '#{name}' as '#{values.last}'" do
+        fact_value = values.first
+        fact_output = values.last
+
+        allow(Facter).to receive(:resolve).and_return({name => fact_value})
+
+        app.command_line.args << name << '--value-only'
+        expect {
+          app.run
+        }.to exit_with(0)
+         .and output("#{fact_output}\n").to_stdout
+      end
+    end
+  end
+
+  context 'when default action is called' do
+    let(:expected) { <<~END }
+      ---
+      filesystems: apfs,autofs,devfs
+      macaddress: 64:52:11:22:03:25
+    END
+
+    before :each do
+      Puppet::Node::Facts.indirection.terminus_class = :facter
+      allow(Facter).to receive(:resolve).and_return(values)
+      app.command_line.args = %w{--render-as yaml}
+    end
+
+    it 'calls show action' do
+      expect {
+        app.run
+      }.to exit_with(0)
+       .and output(expected).to_stdout
+      expect(app.action.name).to eq(:show)
+    end
+  end
 end

data/spec/unit/application/filebucket_spec.rb

@@ -114,15 +114,15 @@ describe Puppet::Application::Filebucket do
       end
 
       it "should default to the first good server_list entry if server_list is set" do
-        stub_request(:get, "https://foo:8140/status/v1/simple/master").to_return(status: 200)
+        stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 200)
         Puppet[:server_list] = "foo,bar,baz"
         expect(Puppet::FileBucket::Dipper).to receive(:new).with(hash_including(Server: "foo"))
         @filebucket.setup
       end
 
       it "should walk server_list until it finds a good entry" do
-        stub_request(:get, "https://foo:8140/status/v1/simple/master").to_return(status: 502)
-        stub_request(:get, "https://bar:8140/status/v1/simple/master").to_return(status: 200)
+        stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 502)
+        stub_request(:get, "https://bar:8140/status/v1/simple/server").to_return(status: 200)
         Puppet[:server_list] = "foo,bar,baz"
         expect(Puppet::FileBucket::Dipper).to receive(:new).with(hash_including(Server: "bar"))
         @filebucket.setup
@@ -130,6 +130,8 @@ describe Puppet::Application::Filebucket do
 
       # FileBucket catches any exceptions raised, logs them, then just exits
       it "raises an error if there are no functional servers in server_list" do
+        stub_request(:get, "https://foo:8140/status/v1/simple/server").to_return(status: 404)
+        stub_request(:get, "https://bar:8140/status/v1/simple/server").to_return(status: 404)
         stub_request(:get, "https://foo:8140/status/v1/simple/master").to_return(status: 404)
         stub_request(:get, "https://bar:8140/status/v1/simple/master").to_return(status: 404)
         Puppet[:server] = 'horacio'
@@ -145,7 +147,7 @@ describe Puppet::Application::Filebucket do
       end
 
       it "should take both the server and port specified in server_list" do
-        stub_request(:get, "https://foo:632/status/v1/simple/master").to_return(status: 200)
+        stub_request(:get, "https://foo:632/status/v1/simple/server").to_return(status: 200)
         Puppet[:server_list] = "foo:632,bar:6215,baz:351"
         expect(Puppet::FileBucket::Dipper).to receive(:new).with({ :Server => "foo", :Port => 632 })
         @filebucket.setup
@@ -185,11 +187,11 @@ describe Puppet::Application::Filebucket do
         @filebucket.get
       end
 
-      it "should call the client getfile method with the given md5" do
-        md5="DEADBEEF"
-        allow(@filebucket).to receive(:args).and_return([md5])
+      it "should call the client getfile method with the given digest" do
+        digest = 'DEADBEEF'
+        allow(@filebucket).to receive(:args).and_return([digest])
 
-        expect(@client).to receive(:getfile).with(md5)
+        expect(@client).to receive(:getfile).with(digest)
 
         @filebucket.get
       end
@@ -223,12 +225,12 @@ describe Puppet::Application::Filebucket do
     end
 
     describe "the command restore" do
-      it "should call the client getfile method with the given md5" do
-        md5="DEADBEEF"
-        file="testfile"
-        allow(@filebucket).to receive(:args).and_return([file, md5])
+      it "should call the client getfile method with the given digest" do
+        digest = 'DEADBEEF'
+        file = 'testfile'
+        allow(@filebucket).to receive(:args).and_return([file, digest])
 
-        expect(@client).to receive(:restore).with(file,md5)
+        expect(@client).to receive(:restore).with(file, digest)
 
         @filebucket.restore
       end
@@ -236,55 +238,55 @@ describe Puppet::Application::Filebucket do
 
     describe "the command diff" do
       it "should call the client diff method with 2 given checksums" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
         allow(Puppet::FileSystem).to receive(:exist?).and_return(false)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(md5a,md5b, nil, nil)
+        expect(@client).to receive(:diff).with(digest_a, digest_b, nil, nil)
 
         @filebucket.diff
       end
 
-      it "should call the clien diff with a path if the second argument is a file" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5a).and_return(false)
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5b).and_return(true)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+      it "should call the client diff with a path if the second argument is a file" do
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(true)
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(md5a, nil, nil, md5b)
+        expect(@client).to receive(:diff).with(digest_a, nil, nil, digest_b)
 
         @filebucket.diff
       end
 
-      it "should call the clien diff with a path if the first argument is a file" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5a).and_return(true)
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5b).and_return(false)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+      it "should call the client diff with a path if the first argument is a file" do
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(false)
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(nil, md5b, md5a, nil)
+        expect(@client).to receive(:diff).with(nil, digest_b, digest_a, nil)
 
         @filebucket.diff
       end
 
       it "should call the clien diff with paths if the both arguments are files" do
-        md5a="DEADBEEF"
-        md5b="BEEF"
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5a).and_return(true)
-        allow(Puppet::FileSystem).to receive(:exist?).with(md5b).and_return(true)
-        allow(@filebucket).to receive(:args).and_return([md5a, md5b])
+        digest_a = 'DEADBEEF'
+        digest_b = 'BEEF'
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_a).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(digest_b).and_return(true)
+        allow(@filebucket).to receive(:args).and_return([digest_a, digest_b])
 
-        expect(@client).to receive(:diff).with(nil, nil, md5a, md5b)
+        expect(@client).to receive(:diff).with(nil, nil, digest_a, digest_b)
 
         @filebucket.diff
       end
 
       it "should fail if only one checksum is given" do
-        md5a="DEADBEEF"
-        allow(@filebucket).to receive(:args).and_return([md5a])
+        digest_a = 'DEADBEEF'
+        allow(@filebucket).to receive(:args).and_return([digest_a])
 
         expect { @filebucket.diff }.to raise_error Puppet::Error
       end

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