puppet 6.29.0 → 7.0.0

data/spec/fixtures/unit/forge/bacula.json

@@ -37,7 +37,7 @@
           "license": "Apache 2.0",
           "checksums": { },
           "version": "0.0.2",
-          "source": "https://github.com/puppetlabs/puppetlabs-bacula",
+          "source": "git://github.com/puppetlabs/puppetlabs-bacula.git",
           "project_page": "https://github.com/puppetlabs/puppetlabs-bacula",
           "summary": "bacula",
           "dependencies": [ ],

data/spec/fixtures/unit/provider/user/aix/aix_passwd_file.out

@@ -6,10 +6,6 @@ test_aix_user:
 no_password_user:
         lastupdate = another_last_update
 
-tab_password_user:
-        password  =  some_password
-        lastupdate = another_last_update
-
 daemon:
         password = *
 

data/spec/integration/application/agent_spec.rb

@@ -3,7 +3,6 @@ require 'puppet_spec/files'
 require 'puppet_spec/puppetserver'
 require 'puppet_spec/compiler'
 require 'puppet_spec/https'
-require 'puppet/application/agent'
 
 describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
   include PuppetSpec::Files
@@ -26,7 +25,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
           agent.command_line.args << '--test'
           agent.run
         }.to exit_with(0)
-         .and output(%r{HTTP GET https://127.0.0.1:#{port}/status/v1/simple/master returned 200 OK}).to_stdout
+         .and output(%r{HTTP GET https://127.0.0.1:#{port}/status/v1/simple/server returned 200 OK}).to_stdout
       end
     end
 
@@ -40,10 +39,9 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
           agent.run
         }.to exit_with(0)
          .and output(%r{Notice: Applied catalog}).to_stdout
-         .and output(%r{Unable to connect to server from server_list setting: Request to https://puppet.example.com:#{port}/status/v1/simple/master failed}).to_stderr
+         .and output(%r{Unable to connect to server from server_list setting: Request to https://puppet.example.com:#{port}/status/v1/simple/server failed}).to_stderr
 
         report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
-        expect(report.master_used).to eq("127.0.0.1:#{port}")
         expect(report.server_used).to eq("127.0.0.1:#{port}")
       end
     end
@@ -76,7 +74,6 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       end
 
       report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
-      expect(report.master_used).to be_nil
       expect(report.server_used).to be_nil
     end
 
@@ -94,17 +91,16 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
          .and output(%r{Debug: Resolved service 'puppet' to https://127.0.0.1:#{port}/puppet/v3}).to_stdout
 
         report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
-        expect(report.master_used).to eq("127.0.0.1:#{port}")
         expect(report.server_used).to eq("127.0.0.1:#{port}")
       end
     end
   end
 
   context 'rich data' do
-    it "calls a deferred 4x function" do
+    it "applies deferred values" do
       catalog_handler = -> (req, res) {
         catalog = compile_to_catalog(<<-MANIFEST, node)
-          notify { 'deferred4x':
+          notify { 'deferred':
             message => Deferred('join', [[1,2,3], ':'])
           }
         MANIFEST
@@ -119,66 +115,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
           agent.command_line.args << '--test'
           agent.run
         }.to exit_with(2)
-         .and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred4x\]/message: defined 'message' as '1:2:3'}).to_stdout
-      end
-    end
-
-    it "calls a deferred 3x function" do
-      catalog_handler = -> (req, res) {
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          notify { 'deferred3x':
-            message => Deferred('sprintf', ['%s', 'I am deferred'])
-          }
-        MANIFEST
-
-        res.body = formatter.render(catalog)
-        res['Content-Type'] = formatter.mime
-      }
-
-      server.start_server(mounts: {catalog: catalog_handler}) do |port|
-        Puppet[:serverport] = port
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(2)
-         .and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred3x\]/message: defined 'message' as 'I am deferred'}).to_stdout
-      end
-    end
-
-    it "re-evaluates a deferred function in a cached catalog" do
-      Puppet[:report] = false
-      Puppet[:use_cached_catalog] = true
-      Puppet[:usecacheonfailure] = false
-
-      catalog_dir = File.join(Puppet[:client_datadir], 'catalog')
-      Puppet::FileSystem.mkpath(catalog_dir)
-      cached_catalog_path = "#{File.join(catalog_dir, Puppet[:certname])}.json"
-
-      # our catalog contains a deferred function that calls `binary_file`
-      # to read `source`. The function returns a Binary object, whose
-      # base64 value is printed to stdout
-      source = tmpfile('deferred_source')
-      catalog = File.read(my_fixture('cached_deferred_catalog.json'))
-      catalog.gsub!('__SOURCE_PATH__', source)
-      File.write(cached_catalog_path, catalog)
-
-      # verify we get a different result each time the deferred function
-      # is evaluated, and reads `source`.
-      {
-        '1234' => 'MTIzNA==',
-        '5678' => 'NTY3OA=='
-      }.each_pair do |content, base64|
-        File.write(source, content)
-
-        expect {
-          agent.command_line.args << '-t'
-          agent.run
-
-        }.to exit_with(2)
-         .and output(/Notice: #{base64}/).to_stdout
-
-        # reset state so we can run again
-        Puppet::Application.clear!
+         .and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred\]/message: defined 'message' as '1:2:3'}).to_stdout
       end
     end
 
@@ -309,7 +246,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
           agent.command_line.args << '--test'
           agent.run
         }.to exit_with(2)
-         .and output(/content changed '{md5}d41d8cd98f00b204e9800998ecf8427e' to '{md5}4cf49285ae567157ebfba72bd04ccf32'/).to_stdout
+         .and output(/content changed '{sha256}e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' to '{sha256}3bef83ad320b471d8e3a03c9b9f150749eea610fe266560395d3195cfbd8e6b8'/).to_stdout
 
         # verify puppet restored binary content
         expect(File.binread(path)).to eq(binary_content)
@@ -473,376 +410,83 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
   end
 
   context 'multiple agents running' do
-    def with_another_agent_running(&block)
+    it "exits if an agent is already running" do
       path = Puppet[:agent_catalog_run_lockfile]
 
       th = Thread.new {
-        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(5)"}
+        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(20)"}
       }
 
-      # ensure file is written before yielding
       until File.exists?(path) && File.size(path) > 0 do
         sleep 0.1
       end
 
-      begin
-        yield
-      ensure
-        th.kill # kill thread so we don't wait too much
-      end
-    end
+      expect {
+        agent.command_line.args << '--test'
+        agent.run
+      }.to exit_with(1).and output(/Run of Puppet configuration client already in progress; skipping/).to_stdout
 
-    it "exits if an agent is already running" do
-      with_another_agent_running do
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(1).and output(/Run of Puppet configuration client already in progress; skipping/).to_stdout
-      end
+      th.kill # kill thread so we don't wait too much
     end
 
     it "waits for other agent run to finish before starting" do
       server.start_server do |port|
+        script = tmpfile('wait_for_log_entry')
+        logdest = tmpfile('agent_log')
+        path = Puppet[:agent_catalog_run_lockfile]
         Puppet[:serverport] = port
         Puppet[:waitforlock] = 1
 
-        with_another_agent_running do
-          expect {
-            agent.command_line.args << '--test'
-            agent.run
-          }.to exit_with(0).and output(/Info: Will try again in #{Puppet[:waitforlock]} seconds./).to_stdout
-        end
-      end
-    end
-
-    it "exits if maxwaitforlock is exceeded" do
-      Puppet[:waitforlock] = 1
-      Puppet[:maxwaitforlock] = 0
-
-      with_another_agent_running do
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(1).and output(/Exiting now because the maxwaitforlock timeout has been exceeded./).to_stdout
-      end
-    end
-  end
-
-  context 'cached catalogs' do
-    it 'falls back to a cached catalog' do
-      catalog_handler = -> (req, res) {
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          notify { 'a message': }
-        MANIFEST
-
-        res.body = formatter.render(catalog)
-        res['Content-Type'] = formatter.mime
-      }
-
-      server.start_server(mounts: {catalog: catalog_handler}) do |port|
-        Puppet[:serverport] = port
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(2)
-         .and output(%r{Caching catalog for #{Puppet[:certname]}}).to_stdout
-      end
-
-      # reset state so we can run again
-      Puppet::Application.clear!
-
-      # --test above turns off `usecacheonfailure` so re-enable here
-      Puppet[:usecacheonfailure] = true
-
-      # run agent without server
-      expect {
-        agent.command_line.args << '--no-daemonize' << '--onetime' << '--server' << '127.0.0.1'
-        agent.run
-      }.to exit_with(2)
-       .and output(a_string_matching(
-         /Using cached catalog from environment 'production'/
-       ).and matching(
-         /Notify\[a message\]\/message:/
-       )).to_stdout
-       .and output(/Could not retrieve catalog from remote server/).to_stderr
-    end
-
-    it 'preserves the old cached catalog if validation fails with the old one' do
-      catalog_handler = -> (req, res) {
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-          exec { 'unqualified_command': }
-        MANIFEST
-
-        res.body = formatter.render(catalog)
-        res['Content-Type'] = formatter.mime
-      }
-
-      server.start_server(mounts: {catalog: catalog_handler}) do |port|
-        Puppet[:serverport] = port
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(1)
-         .and output(%r{Retrieving plugin}).to_stdout
-         .and output(%r{Validation of Exec\[unqualified_command\] failed: 'unqualified_command' is not qualified and no path was specified}).to_stderr
-      end
-
-      # cached catalog should not be updated
-      cached_catalog = "#{File.join(Puppet[:client_datadir], 'catalog', Puppet[:certname])}.json"
-      expect(File).to_not be_exist(cached_catalog)
-    end
-  end
-
-  context "reporting" do
-    it "stores a finalized report" do
-      catalog_handler = -> (req, res) {
-        catalog = compile_to_catalog(<<-MANIFEST, node)
-        notify { 'foo':
-          require => Notify['bar']
+        th = Thread.new {
+          File.write(script, <<~SCRIPT)
+            $0 = 'puppet'
+            # lock pidfile
+            File.write('#{path}', Process.pid)
+            # wait for foreground agent to fail once
+            until File.exists?("#{logdest}") && File.readlines("#{logdest}").grep(/Will try again/).any? do
+              sleep 0.1
+            end
+          SCRIPT
+          %x{ruby '#{script}'}
         }
 
-        notify { 'bar':
-          require => Notify['foo']
-        }
-        MANIFEST
-
-        res.body = formatter.render(catalog)
-        res['Content-Type'] = formatter.mime
-      }
-
-      server.start_server(mounts: {catalog: catalog_handler}) do |port|
-        Puppet[:serverport] = port
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(1)
-         .and output(%r{Applying configuration}).to_stdout
-         .and output(%r{Found 1 dependency cycle}).to_stderr
-
-        report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
-        expect(report.status).to eq("failed")
-        expect(report.metrics).to_not be_empty
-      end
-    end
-
-    it "caches a report even if the REST request fails" do
-      server.start_server do |port|
-        Puppet[:serverport] = port
-        Puppet[:report_port] = "-1"
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(0)
-         .and output(%r{Applied catalog}).to_stdout
-         .and output(%r{Could not send report}).to_stderr
-
-        report = Puppet::Transaction::Report.convert_from(:yaml, File.read(Puppet[:lastrunreport]))
-        expect(report).to be
-      end
-    end
-  end
-
-  context "environment convergence" do
-    it "falls back to making a node request if the last server-specified environment cannot be loaded" do
-      mounts = {}
-      mounts[:node] = -> (req, res) {
-        node = Puppet::Node.new('test', environment: Puppet::Node::Environment.remote('doesnotexistonagent'))
-        res.body = formatter.render(node)
-        res['Content-Type'] = formatter.mime
-      }
-
-      server.start_server(mounts: mounts) do |port|
-        Puppet[:serverport] = port
-        Puppet[:log_level] = 'debug'
+        until File.exists?(path) && File.size(path) > 0 do
+          sleep 0.1
+        end
 
         expect {
-          agent.command_line.args << '--test'
+          agent.command_line.args << '--test' << '--logdest' << logdest << '--logdest' << 'console'
           agent.run
         }.to exit_with(0)
-         .and output(a_string_matching(%r{Debug: Requesting environment from the server})).to_stdout
-
-        Puppet::Application.clear!
+         .and output(a_string_matching(
+          /Info: Will try again in #{Puppet[:waitforlock]} seconds/
+        ).and matching(
+          /Applied catalog/
+        )).to_stdout
 
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(0)
-         .and output(a_string_matching(%r{Debug: Successfully loaded last environment from the lastrunfile})).to_stdout
+        th.kill # kill thread so we don't wait too much
       end
     end
 
-    it "switches to 'newenv' environment and retries the run" do
-      first_run = true
-      libdir = File.join(my_fixture_dir, 'lib')
-
-      # we have to use the :facter terminus to reliably test that pluginsynced
-      # facts are included in the catalog request
-      Puppet::Node::Facts.indirection.terminus_class = :facter
-
-      mounts = {}
-
-      # During the first run, only return metadata for the top-level directory.
-      # During the second run, include metadata for all of the 'lib' fixtures
-      # due to the `recurse` option.
-      mounts[:file_metadatas] = -> (req, res) {
-        request = Puppet::FileServing::Metadata.indirection.request(
-          :search, libdir, nil, recurse: !first_run
-        )
-        data = Puppet::FileServing::Metadata.indirection.terminus(:file).search(request)
-        res.body = formatter.render(data)
-        res['Content-Type'] = formatter.mime
-      }
-
-      mounts[:file_content] = -> (req, res) {
-        request = Puppet::FileServing::Content.indirection.request(
-          :find, File.join(libdir, 'facter', 'agent_spec_role.rb'), nil
-        )
-        content = Puppet::FileServing::Content.indirection.terminus(:file).find(request)
-        res.body = content.content
-        res['Content-Length'] = content.content.length
-        res['Content-Type'] = 'application/octet-stream'
-      }
-
-      # During the first run, return an empty catalog referring to the newenv.
-      # During the second run, compile a catalog that depends on a fact that
-      # only exists in the second environment. If the fact is missing/empty,
-      # then compilation will fail since resources can't have an empty title.
-      mounts[:catalog] = -> (req, res) {
-        node = Puppet::Node.new('test')
-
-        code = if first_run
-                 first_run = false
-                 ''
-               else
-                 data = CGI.unescape(req.query['facts'])
-                 facts = Puppet::Node::Facts.convert_from('json', data)
-                 node.fact_merge(facts)
-                 'notify { $facts["agent_spec_role"]: }'
-               end
-
-        catalog = compile_to_catalog(code, node)
-        catalog.environment = 'newenv'
+    it "exits if maxwaitforlock is exceeded" do
+      path = Puppet[:agent_catalog_run_lockfile]
+      Puppet[:waitforlock] = 1
+      Puppet[:maxwaitforlock] = 0
 
-        res.body = formatter.render(catalog)
-        res['Content-Type'] = formatter.mime
+      th = Thread.new {
+        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(20)"}
       }
 
-      server.start_server(mounts: mounts) do |port|
-        Puppet[:serverport] = port
-        expect {
-          agent.command_line.args << '--test'
-          agent.run
-        }.to exit_with(2)
-         .and output(a_string_matching(%r{Notice: Local environment: 'production' doesn't match server specified environment 'newenv', restarting agent run with environment 'newenv'})
-         .and matching(%r{defined 'message' as 'web'})).to_stdout
-      end
-    end
-  end
-
-  context "ssl" do
-    context "bootstrapping" do
-      before :each do
-        # reconfigure ssl to non-existent dir and files to force bootstrapping
-        dir = tmpdir('ssl')
-        Puppet[:ssldir] = dir
-        Puppet[:localcacert] = File.join(dir, 'ca.pem')
-        Puppet[:hostcrl] = File.join(dir, 'crl.pem')
-        Puppet[:hostprivkey] = File.join(dir, 'cert.pem')
-        Puppet[:hostcert] = File.join(dir, 'key.pem')
-
-        Puppet[:daemonize] = false
-        Puppet[:logdest] = 'console'
-        Puppet[:log_level] = 'info'
-      end
-
-      it "exits if the agent is not allowed to wait" do
-        Puppet[:waitforcert] = 0
-
-        server.start_server do |port|
-          Puppet[:serverport] = port
-          expect {
-            agent.run
-          }.to exit_with(1)
-           .and output(%r{Exiting now because the waitforcert setting is set to 0}).to_stdout
-           .and output(%r{Failed to submit the CSR, HTTP response was 404}).to_stderr
-        end
-      end
-
-      it "exits if the maxwaitforcert time is exceeded" do
-        Puppet[:waitforcert] = 1
-        Puppet[:maxwaitforcert] = 1
-
-        server.start_server do |port|
-          Puppet[:serverport] = port
-          expect {
-            agent.run
-          }.to exit_with(1)
-            .and output(%r{Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate \(127.0.0.1\). Exiting now because the maxwaitforcert timeout has been exceeded.}).to_stdout
-            .and output(%r{Failed to submit the CSR, HTTP response was 404}).to_stderr
-        end
-      end
-    end
-
-    def copy_fixtures(sources, dest)
-      ssldir = File.join(PuppetSpec::FIXTURE_DIR, 'ssl')
-      File.open(dest, 'w') do |f|
-        sources.each do |s|
-          f.write(File.read(File.join(ssldir, s)))
-        end
+      until File.exists?(path) && File.size(path) > 0 do
+        sleep 0.1
       end
-    end
-
-    it "reloads the CRL between runs" do
-      Puppet[:localcacert] = ca = tmpfile('ca')
-      Puppet[:hostcrl] = crl = tmpfile('crl')
-      Puppet[:hostcert] = cert = tmpfile('cert')
-      Puppet[:hostprivkey] = key = tmpfile('key')
-
-      copy_fixtures(%w[ca.pem intermediate.pem], ca)
-      copy_fixtures(%w[crl.pem intermediate-crl.pem], crl)
-      copy_fixtures(%w[127.0.0.1.pem], cert)
-      copy_fixtures(%w[127.0.0.1-key.pem], key)
-
-      revoked = cert_fixture('revoked.pem')
-      revoked_key = key_fixture('revoked-key.pem')
-
-      mounts = {}
-      mounts[:catalog] = -> (req, res) {
-        catalog = compile_to_catalog(<<~MANIFEST, node)
-          file { '#{cert}':
-            ensure => file,
-            content => '#{revoked}'
-          }
-          file { '#{key}':
-            ensure => file,
-            content => '#{revoked_key}'
-          }
-        MANIFEST
 
-        res.body = formatter.render(catalog)
-        res['Content-Type'] = formatter.mime
-      }
-
-      server.start_server(mounts: mounts) do |port|
-        Puppet[:serverport] = port
-        Puppet[:daemonize] = false
-        Puppet[:runinterval] = 1
-        Puppet[:waitforcert] = 1
-        Puppet[:maxwaitforcert] = 1
-
-        # simulate two runs of the agent, then return so we don't infinite loop
-        allow_any_instance_of(Puppet::Daemon).to receive(:run_event_loop) do |instance|
-          instance.agent.run(splay: false)
-          instance.agent.run(splay: false)
-        end
+      expect {
+        agent.command_line.args << '--test'
+        agent.run
+      }.to exit_with(1).and output(/Exiting now because the maxwaitforlock timeout has been exceeded./).to_stdout
 
-        agent.command_line.args << '--verbose'
-        expect {
-          agent.run
-        }.to exit_with(1)
-         .and output(%r{Exiting now because the maxwaitforcert timeout has been exceeded}).to_stdout
-         .and output(%r{Certificate 'CN=revoked' is revoked}).to_stderr
-      end
+      th.kill # kill thread so we don't wait too much
     end
   end
 end

data/spec/integration/application/apply_spec.rb

@@ -532,7 +532,7 @@ class amod::bad_type {
       ).and matching(
          /dir1\/dir2\]\/ensure: created/
       ).and matching(
-         /dir1\/dir2\/file\]\/ensure: defined content as '{md5}51f37efb13c3a1e486106f90db6490a5'/
+         /dir1\/dir2\/file\]\/ensure: defined content as '{sha256}b37c1d77e09471b3139b2cdfee449fd8ba72ebf7634d52023aff0c0cd088cf1b'/
       )).to_stdout
 
       dest_file = File.join(base_dir, 'dir1', 'dir2', 'file')
@@ -663,23 +663,4 @@ class amod::bad_type {
       end
     end
   end
-
-  context 'rich data' do
-    it "calls a deferred 4x function" do
-      apply.command_line.args = ['-e', 'notify { "deferred3x": message => Deferred("join", [[1,2,3], ":"]) }']
-
-      expect {
-        apply.run
-      }.to exit_with(0) # for some reason apply returns 0 instead of 2
-       .and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred3x\]/message: defined 'message' as '1:2:3'}).to_stdout
-    end
-
-    it "calls a deferred 3x function" do
-      apply.command_line.args = ['-e', 'notify { "deferred4x": message => Deferred("sprintf", ["%s", "I am deferred"]) }']
-      expect {
-        apply.run
-      }.to exit_with(0) # for some reason apply returns 0 instead of 2
-       .and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred4x\]/message: defined 'message' as 'I am deferred'}).to_stdout
-    end
-  end
 end