puppet 6.19.1 → 6.23.0

data/spec/unit/util/windows/sid_spec.rb

@@ -158,6 +158,12 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
       # this works in French Windows, even though the account is really AUTORITE NT\\Syst\u00E8me
       expect(subject.name_to_principal('NT AUTHORITY\SYSTEM').sid).to eq(sid)
     end
+
+    it "should print a debug message on failures" do
+      expect(Puppet).to receive(:debug).with(/Could not retrieve raw SID bytes from 'NonExistingUser'/)
+      expect(Puppet).to receive(:debug).with(/No mapping between account names and security IDs was done/)
+      subject.name_to_principal('NonExistingUser')
+    end
   end
 
   context "#ads_to_principal" do

data/spec/unit/util_spec.rb

@@ -315,7 +315,7 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(true)
+        allow(Puppet.features).to receive(:posix?).and_return(true)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
@@ -328,7 +328,7 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(false)
+        allow(Puppet.features).to receive(:posix?).and_return(false)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
       end
 
@@ -462,7 +462,7 @@ describe Puppet::Util do
 
     describe "when using platform :posix" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(true)
+        allow(Puppet.features).to receive(:posix?).and_return(true)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
@@ -501,7 +501,7 @@ describe Puppet::Util do
 
     describe "when using platform :windows" do
       before :each do
-        allow(Puppet.features).to receive(:posix).and_return(false)
+        allow(Puppet.features).to receive(:posix?).and_return(false)
         allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
       end
 
@@ -539,7 +539,6 @@ describe Puppet::Util do
       expect(Puppet::Util.uri_to_path(URI.parse('http://foo/bar%20baz'))).to eq('/bar baz')
     end
 
-
     [
       "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E",
       "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E".force_encoding(Encoding::ASCII)
@@ -589,7 +588,15 @@ describe Puppet::Util do
     end
   end
 
-  describe "safe_posix_fork" do
+  describe "safe_posix_fork on Windows and JRuby", if: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
+    it "raises not implemented error" do
+      expect {
+        Puppet::Util.safe_posix_fork
+      }.to raise_error(NotImplementedError, /fork/)
+    end
+  end
+
+  describe "safe_posix_fork", unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
     let(:pid) { 5501 }
 
     before :each do

data/tasks/generate_cert_fixtures.rake

@@ -173,12 +173,12 @@ task(:gen_cert_fixtures) do
 
   # Create a request, but replace its public key after it's signed
   tampered_csr = ca.create_request('signed')[:csr]
-  tampered_csr.public_key = OpenSSL::PKey::RSA.new(1024).public_key
+  tampered_csr.public_key = OpenSSL::PKey::RSA.new(2048).public_key
   save(dir, 'tampered-csr.pem', tampered_csr)
 
   # Create a cert issued from the real intermediate CA, but replace its
   # public key
   tampered_cert = ca.create_cert('signed', inter[:cert], inter[:private_key])[:cert]
-  tampered_cert.public_key = OpenSSL::PKey::RSA.new(1024).public_key
+  tampered_cert.public_key = OpenSSL::PKey::RSA.new(2048).public_key
   save(dir, 'tampered-cert.pem', tampered_cert)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.19.1
+  version: 6.23.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -422,6 +422,9 @@ files:
 - lib/puppet/feature/ssh.rb
 - lib/puppet/feature/telnet.rb
 - lib/puppet/feature/zlib.rb
+- lib/puppet/ffi/posix.rb
+- lib/puppet/ffi/posix/constants.rb
+- lib/puppet/ffi/posix/functions.rb
 - lib/puppet/file_bucket.rb
 - lib/puppet/file_bucket/dipper.rb
 - lib/puppet/file_bucket/file.rb
@@ -596,7 +599,9 @@ files:
 - lib/puppet/indirector/errors.rb
 - lib/puppet/indirector/exec.rb
 - lib/puppet/indirector/face.rb
+- lib/puppet/indirector/fact_search.rb
 - lib/puppet/indirector/facts/facter.rb
+- lib/puppet/indirector/facts/json.rb
 - lib/puppet/indirector/facts/memory.rb
 - lib/puppet/indirector/facts/network_device.rb
 - lib/puppet/indirector/facts/rest.rb
@@ -627,6 +632,7 @@ files:
 - lib/puppet/indirector/memory.rb
 - lib/puppet/indirector/msgpack.rb
 - lib/puppet/indirector/node/exec.rb
+- lib/puppet/indirector/node/json.rb
 - lib/puppet/indirector/node/memory.rb
 - lib/puppet/indirector/node/msgpack.rb
 - lib/puppet/indirector/node/plain.rb
@@ -635,6 +641,7 @@ files:
 - lib/puppet/indirector/node/yaml.rb
 - lib/puppet/indirector/none.rb
 - lib/puppet/indirector/plain.rb
+- lib/puppet/indirector/report/json.rb
 - lib/puppet/indirector/report/msgpack.rb
 - lib/puppet/indirector/report/processor.rb
 - lib/puppet/indirector/report/rest.rb
@@ -1139,6 +1146,7 @@ files:
 - lib/puppet/scheduler/splay_job.rb
 - lib/puppet/scheduler/timer.rb
 - lib/puppet/settings.rb
+- lib/puppet/settings/alias_setting.rb
 - lib/puppet/settings/array_setting.rb
 - lib/puppet/settings/autosign_setting.rb
 - lib/puppet/settings/base_setting.rb
@@ -1247,6 +1255,7 @@ files:
 - lib/puppet/util/errors.rb
 - lib/puppet/util/execution.rb
 - lib/puppet/util/execution_stub.rb
+- lib/puppet/util/fact_dif.rb
 - lib/puppet/util/feature.rb
 - lib/puppet/util/file_watcher.rb
 - lib/puppet/util/fileparsing.rb
@@ -1401,6 +1410,7 @@ files:
 - man/man8/puppet.8
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
+- spec/fixtures/integration/application/agent/cached_deferred_catalog.json
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -1777,6 +1787,7 @@ files:
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.out
 - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
+- spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -1800,13 +1811,13 @@ files:
 - spec/integration/agent/logging_spec.rb
 - spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
-- spec/integration/application/config_spec.rb
 - spec/integration/application/doc_spec.rb
 - spec/integration/application/filebucket_spec.rb
 - spec/integration/application/help_spec.rb
 - spec/integration/application/lookup_spec.rb
 - spec/integration/application/module_spec.rb
 - spec/integration/application/plugin_spec.rb
+- spec/integration/application/resource_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -1821,7 +1832,6 @@ files:
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
-- spec/integration/indirector/report/yaml.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -1867,10 +1877,8 @@ files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
-- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
-- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb
@@ -1967,7 +1975,6 @@ files:
 - spec/unit/environments_spec.rb
 - spec/unit/etc_spec.rb
 - spec/unit/external/pson_spec.rb
-- spec/unit/face/catalog_spec.rb
 - spec/unit/face/config_spec.rb
 - spec/unit/face/epp_face_spec.rb
 - spec/unit/face/facts_spec.rb
@@ -1979,7 +1986,6 @@ files:
 - spec/unit/face/module/search_spec.rb
 - spec/unit/face/module/uninstall_spec.rb
 - spec/unit/face/module/upgrade_spec.rb
-- spec/unit/face/module_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/plugin_spec.rb
@@ -2124,6 +2130,7 @@ files:
 - spec/unit/indirector/exec_spec.rb
 - spec/unit/indirector/face_spec.rb
 - spec/unit/indirector/facts/facter_spec.rb
+- spec/unit/indirector/facts/json_spec.rb
 - spec/unit/indirector/facts/network_device_spec.rb
 - spec/unit/indirector/facts/rest_spec.rb
 - spec/unit/indirector/facts/store_configs_spec.rb
@@ -2148,6 +2155,7 @@ files:
 - spec/unit/indirector/memory_spec.rb
 - spec/unit/indirector/msgpack_spec.rb
 - spec/unit/indirector/node/exec_spec.rb
+- spec/unit/indirector/node/json_spec.rb
 - spec/unit/indirector/node/memory_spec.rb
 - spec/unit/indirector/node/msgpack_spec.rb
 - spec/unit/indirector/node/plain_spec.rb
@@ -2156,6 +2164,7 @@ files:
 - spec/unit/indirector/node/yaml_spec.rb
 - spec/unit/indirector/none_spec.rb
 - spec/unit/indirector/plain_spec.rb
+- spec/unit/indirector/report/json_spec.rb
 - spec/unit/indirector/report/msgpack_spec.rb
 - spec/unit/indirector/report/processor_spec.rb
 - spec/unit/indirector/report/rest_spec.rb
@@ -2280,6 +2289,7 @@ files:
 - spec/unit/pops/evaluator/collections_ops_spec.rb
 - spec/unit/pops/evaluator/comparison_ops_spec.rb
 - spec/unit/pops/evaluator/conditionals_spec.rb
+- spec/unit/pops/evaluator/deferred_resolver_spec.rb
 - spec/unit/pops/evaluator/evaluating_parser_spec.rb
 - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
 - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
@@ -2670,6 +2680,7 @@ summary: Puppet, an automated configuration management tool
 test_files:
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
+- spec/fixtures/integration/application/agent/cached_deferred_catalog.json
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -3046,6 +3057,7 @@ test_files:
 - spec/fixtures/unit/provider/service/smf/svcs_fmri.out
 - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
 - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
+- spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
 - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
 - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
 - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -3069,13 +3081,13 @@ test_files:
 - spec/integration/agent/logging_spec.rb
 - spec/integration/application/agent_spec.rb
 - spec/integration/application/apply_spec.rb
-- spec/integration/application/config_spec.rb
 - spec/integration/application/doc_spec.rb
 - spec/integration/application/filebucket_spec.rb
 - spec/integration/application/help_spec.rb
 - spec/integration/application/lookup_spec.rb
 - spec/integration/application/module_spec.rb
 - spec/integration/application/plugin_spec.rb
+- spec/integration/application/resource_spec.rb
 - spec/integration/configurer_spec.rb
 - spec/integration/data_binding_spec.rb
 - spec/integration/defaults_spec.rb
@@ -3090,7 +3102,6 @@ test_files:
 - spec/integration/indirector/facts/facter_spec.rb
 - spec/integration/indirector/file_content/file_server_spec.rb
 - spec/integration/indirector/file_metadata/file_server_spec.rb
-- spec/integration/indirector/report/yaml.rb
 - spec/integration/network/authconfig_spec.rb
 - spec/integration/network/formats_spec.rb
 - spec/integration/network/http/api/indirected_routes_spec.rb
@@ -3136,10 +3147,8 @@ test_files:
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
 - spec/lib/matchers/containment_matchers.rb
-- spec/lib/matchers/include.rb
 - spec/lib/matchers/include_in_order.rb
 - spec/lib/matchers/include_in_order_spec.rb
-- spec/lib/matchers/include_spec.rb
 - spec/lib/matchers/json.rb
 - spec/lib/matchers/match_tokens2.rb
 - spec/lib/matchers/relationship_graph_matchers.rb
@@ -3236,7 +3245,6 @@ test_files:
 - spec/unit/environments_spec.rb
 - spec/unit/etc_spec.rb
 - spec/unit/external/pson_spec.rb
-- spec/unit/face/catalog_spec.rb
 - spec/unit/face/config_spec.rb
 - spec/unit/face/epp_face_spec.rb
 - spec/unit/face/facts_spec.rb
@@ -3248,7 +3256,6 @@ test_files:
 - spec/unit/face/module/search_spec.rb
 - spec/unit/face/module/uninstall_spec.rb
 - spec/unit/face/module/upgrade_spec.rb
-- spec/unit/face/module_spec.rb
 - spec/unit/face/node_spec.rb
 - spec/unit/face/parser_spec.rb
 - spec/unit/face/plugin_spec.rb
@@ -3393,6 +3400,7 @@ test_files:
 - spec/unit/indirector/exec_spec.rb
 - spec/unit/indirector/face_spec.rb
 - spec/unit/indirector/facts/facter_spec.rb
+- spec/unit/indirector/facts/json_spec.rb
 - spec/unit/indirector/facts/network_device_spec.rb
 - spec/unit/indirector/facts/rest_spec.rb
 - spec/unit/indirector/facts/store_configs_spec.rb
@@ -3417,6 +3425,7 @@ test_files:
 - spec/unit/indirector/memory_spec.rb
 - spec/unit/indirector/msgpack_spec.rb
 - spec/unit/indirector/node/exec_spec.rb
+- spec/unit/indirector/node/json_spec.rb
 - spec/unit/indirector/node/memory_spec.rb
 - spec/unit/indirector/node/msgpack_spec.rb
 - spec/unit/indirector/node/plain_spec.rb
@@ -3425,6 +3434,7 @@ test_files:
 - spec/unit/indirector/node/yaml_spec.rb
 - spec/unit/indirector/none_spec.rb
 - spec/unit/indirector/plain_spec.rb
+- spec/unit/indirector/report/json_spec.rb
 - spec/unit/indirector/report/msgpack_spec.rb
 - spec/unit/indirector/report/processor_spec.rb
 - spec/unit/indirector/report/rest_spec.rb
@@ -3549,6 +3559,7 @@ test_files:
 - spec/unit/pops/evaluator/collections_ops_spec.rb
 - spec/unit/pops/evaluator/comparison_ops_spec.rb
 - spec/unit/pops/evaluator/conditionals_spec.rb
+- spec/unit/pops/evaluator/deferred_resolver_spec.rb
 - spec/unit/pops/evaluator/evaluating_parser_spec.rb
 - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
 - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb

data/spec/integration/application/config_spec.rb

@@ -1,74 +0,0 @@
-# coding: utf-8
-require 'spec_helper'
-require 'puppet/application/config'
-
-#describe "puppet config" do
-describe Puppet::Face[:config, '0.0.1'] do
-  include PuppetSpec::Files
-
-  # different UTF-8 widths
-  # 1-byte A
-  # 2-byte ۿ - http://www.fileformat.info/info/unicode/char/06ff/index.htm - 0xDB 0xBF / 219 191
-  # 3-byte ᚠ - http://www.fileformat.info/info/unicode/char/16A0/index.htm - 0xE1 0x9A 0xA0 / 225 154 160
-  # 4-byte 𠜎 - http://www.fileformat.info/info/unicode/char/2070E/index.htm - 0xF0 0xA0 0x9C 0x8E / 240 160 156 142
-  MIXED_UTF8 = "A\u06FF\u16A0\u{2070E}" # Aۿᚠ𠜎
-
-  let(:tmp_config) { tmpfile('puppet.conf') }
-  let(:config) { Puppet::Application[:config] }
-
-  def read_utf8(path)
-    File.read(tmp_config, :encoding => 'UTF-8')
-  end
-
-  def write_utf8(path, content)
-    File.write(tmp_config, content, 0, :encoding => 'UTF-8')
-  end
-
-  it "reads a UTF-8 value" do
-    write_utf8(tmp_config, <<~EOF)
-      [main]
-      tags=#{MIXED_UTF8}
-    EOF
-
-    Puppet.initialize_settings(['--config', tmp_config])
-    config.command_line.args = ['print', 'tags' ]
-
-    expect {
-      config.run
-    }.to exit_with(0)
-     .and output("#{MIXED_UTF8}\n").to_stdout
-  end
-
-  it "sets a UTF-8 value" do
-    Puppet.initialize_settings(['--config', tmp_config])
-    config.command_line.args = ['set', 'tags', MIXED_UTF8 ]
-
-    expect {
-      config.run
-    }.to exit_with(0)
-
-    expect(read_utf8(tmp_config)).to eq(<<~EOF)
-      [main]
-      tags = #{MIXED_UTF8}
-    EOF
-  end
-
-  it "deletes a key" do
-    write_utf8(tmp_config, <<~EOF)
-      [main]
-      tags=#{MIXED_UTF8}
-    EOF
-
-    Puppet.initialize_settings(['--config', tmp_config])
-    config.command_line.args = ['delete', 'tags']
-
-    expect {
-      config.run
-    }.to exit_with(0)
-     .and output(/Deleted setting from 'main': 'tags=#{MIXED_UTF8}'/).to_stdout
-
-    expect(read_utf8(tmp_config)).to eq(<<~EOF)
-      [main]
-    EOF
-  end
-end

data/spec/lib/matchers/include.rb

@@ -1,27 +0,0 @@
-module Matchers; module Include
-  extend RSpec::Matchers::DSL
-
-  matcher :include_in_any_order do |*matchers|
-    match do |enumerable|
-      @not_matched = []
-      expected_as_array.each do |matcher|
-        if enumerable.empty?
-          break
-        end
-
-        if found = enumerable.find { |elem| matcher.matches?(elem) }
-          enumerable = enumerable.reject { |elem| elem == found }
-        else
-          @not_matched << matcher
-        end
-      end
-
-
-      @not_matched.empty? && enumerable.empty?
-    end
-
-    failure_message do |enumerable|
-      "did not match #{@not_matched.collect(&:description).join(', ')} in #{enumerable.inspect}: <#{@not_matched.collect(&:failure_message).join('>, <')}>"
-    end
-  end
-end; end

data/spec/lib/matchers/include_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'matchers/include'
-
-describe "include matchers" do
-  include Matchers::Include
-
-  context :include_in_any_order do
-    it "matches an empty list" do
-      expect([]).to include_in_any_order()
-    end
-
-    it "matches a list with a single element" do
-      expect([1]).to include_in_any_order(eq(1))
-    end
-
-    it "does not match when an expected element is missing" do
-      expect([1]).to_not include_in_any_order(eq(2))
-    end
-
-    it "matches a list with 2 elements in a different order from the expectation" do
-      expect([1, 2]).to include_in_any_order(eq(2), eq(1))
-    end
-
-    it "does not match when there are more than just the expected elements" do
-      expect([1, 2]).to_not include_in_any_order(eq(1))
-    end
-
-    it "matches multiple, equal elements when there are multiple, equal exepectations" do
-      expect([1, 1]).to include_in_any_order(eq(1), eq(1))
-    end
-  end
-end