puppet 7.0.0-x64-mingw32 → 7.5.0-x64-mingw32

data/spec/unit/util/storage_spec.rb

@@ -143,9 +143,11 @@ describe Puppet::Util::Storage do
       end
 
       it "should raise an error if the state file does not contain valid YAML and cannot be renamed" do
+        allow(File).to receive(:rename).and_call_original
+
         write_state_file('{ invalid')
 
-        expect(File).to receive(:rename).and_raise(SystemCallError)
+        expect(File).to receive(:rename).with(@state_file, "#{@state_file}.bad").and_raise(SystemCallError)
 
         expect { Puppet::Util::Storage.load }.to raise_error(Puppet::Error, /Could not rename/)
       end

data/spec/unit/util/suidmanager_spec.rb

@@ -14,12 +14,14 @@ describe Puppet::Util::SUIDManager do
     pwent = double('pwent', :name => 'fred', :uid => 42, :gid => 42)
     allow(Etc).to receive(:getpwuid).with(42).and_return(pwent)
 
-    [:euid, :egid, :uid, :gid, :groups].each do |id|
-      allow(Process).to receive("#{id}=") {|value| xids[id] = value}
+    unless Puppet::Util::Platform.windows?
+      [:euid, :egid, :uid, :gid, :groups].each do |id|
+        allow(Process).to receive("#{id}=") {|value| xids[id] = value}
+      end
     end
   end
 
-  describe "#initgroups" do
+  describe "#initgroups", unless: Puppet::Util::Platform.windows? do
     it "should use the primary group of the user as the 'basegid'" do
       expect(Process).to receive(:initgroups).with('fred', 42)
       described_class.initgroups(42)
@@ -27,7 +29,7 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#uid" do
-    it "should allow setting euid/egid" do
+    it "should allow setting euid/egid", unless: Puppet::Util::Platform.windows? do
       Puppet::Util::SUIDManager.egid = user[:gid]
       Puppet::Util::SUIDManager.euid = user[:uid]
 
@@ -37,8 +39,7 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#asuser" do
-    it "should not get or set euid/egid when not root" do
-      allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+    it "should not get or set euid/egid when not root", unless: Puppet::Util::Platform.windows? do
       allow(Process).to receive(:uid).and_return(1)
 
       allow(Process).to receive(:egid).and_return(51)
@@ -49,13 +50,12 @@ describe Puppet::Util::SUIDManager do
       expect(xids).to be_empty
     end
 
-    context "when root and not windows" do
+    context "when root and not Windows" do
       before :each do
         allow(Process).to receive(:uid).and_return(0)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
       end
 
-      it "should set euid/egid" do
+      it "should set euid/egid", unless: Puppet::Util::Platform.windows? do
         allow(Process).to receive(:egid).and_return(51, 51, user[:gid])
         allow(Process).to receive(:euid).and_return(50, 50, user[:uid])
 
@@ -79,29 +79,23 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should just yield if user and group are nil" do
-        yielded = false
-        Puppet::Util::SUIDManager.asuser(nil, nil) { yielded = true }
-        expect(yielded).to be_truthy
+        expect { |b| Puppet::Util::SUIDManager.asuser(nil, nil, &b) }.to yield_control
         expect(xids).to eq({})
       end
 
-      it "should just change group if only group is given" do
-        yielded = false
-        Puppet::Util::SUIDManager.asuser(nil, 42) { yielded = true }
-        expect(yielded).to be_truthy
+      it "should just change group if only group is given", unless: Puppet::Util::Platform.windows? do
+        expect { |b| Puppet::Util::SUIDManager.asuser(nil, 42, &b) }.to yield_control
         expect(xids).to eq({ :egid => 42 })
       end
 
-      it "should change gid to the primary group of uid by default" do
+      it "should change gid to the primary group of uid by default", unless: Puppet::Util::Platform.windows? do
         allow(Process).to receive(:initgroups)
 
-        yielded = false
-        Puppet::Util::SUIDManager.asuser(42) { yielded = true }
-        expect(yielded).to be_truthy
+        expect { |b| Puppet::Util::SUIDManager.asuser(42, nil, &b) }.to yield_control
         expect(xids).to eq({ :euid => 42, :egid => 42 })
       end
 
-      it "should change both uid and gid if given" do
+      it "should change both uid and gid if given", unless: Puppet::Util::Platform.windows? do
         # I don't like the sequence, but it is the only way to assert on the
         # internal behaviour in a reliable fashion, given we need multiple
         # sequenced calls to the same methods. --daniel 2012-02-05
@@ -110,21 +104,23 @@ describe Puppet::Util::SUIDManager do
         expect(Puppet::Util::SUIDManager).to receive(:change_group).with(Puppet::Util::SUIDManager.egid, false).ordered()
         expect(Puppet::Util::SUIDManager).to receive(:change_user).with(Puppet::Util::SUIDManager.euid, false).ordered()
 
-        yielded = false
-        Puppet::Util::SUIDManager.asuser(42, 43) { yielded = true }
-        expect(yielded).to be_truthy
+        expect { |b| Puppet::Util::SUIDManager.asuser(42, 43, &b) }.to yield_control
       end
     end
 
-    it "should not get or set euid/egid on Windows", if: Puppet::Util::Platform.windows? do
-      Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) {}
-
-      expect(xids).to be_empty
+    it "should just yield on Windows", if: Puppet::Util::Platform.windows? do
+      expect { |b| Puppet::Util::SUIDManager.asuser(1, 2, &b) }.to yield_control
     end
   end
 
   describe "#change_group" do
-    describe "when changing permanently" do
+    it "raises on Windows", if: Puppet::Util::Platform.windows? do
+      expect {
+        Puppet::Util::SUIDManager.change_group(42, true)
+      }.to raise_error(NotImplementedError, /change_privilege\(\) function is unimplemented/)
+    end
+
+    describe "when changing permanently", unless: Puppet::Util::Platform.windows? do
       it "should change_privilege" do
         expect(Process::GID).to receive(:change_privilege) do |gid|
           Process.gid = gid
@@ -150,7 +146,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    describe "when changing temporarily" do
+    describe "when changing temporarily", unless: Puppet::Util::Platform.windows? do
       it "should change only egid" do
         Puppet::Util::SUIDManager.change_group(42, false)
 
@@ -161,7 +157,13 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#change_user" do
-    describe "when changing permanently" do
+    it "raises on Windows", if: Puppet::Util::Platform.windows? do
+      expect {
+        Puppet::Util::SUIDManager.change_user(42, true)
+      }.to raise_error(NotImplementedError, /initgroups\(\) function is unimplemented/)
+    end
+
+    describe "when changing permanently", unless: Puppet::Util::Platform.windows? do
       it "should change_privilege" do
         expect(Process::UID).to receive(:change_privilege) do |uid|
           Process.uid = uid
@@ -191,7 +193,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    describe "when changing temporarily" do
+    describe "when changing temporarily", unless: Puppet::Util::Platform.windows? do
       it "should change only euid and groups" do
         allow(Puppet::Util::SUIDManager).to receive(:initgroups).and_return([])
         Puppet::Util::SUIDManager.change_user(42, false)
@@ -221,12 +223,7 @@ describe Puppet::Util::SUIDManager do
   end
 
   describe "#root?" do
-    describe "on POSIX systems" do
-      before :each do
-        allow(Puppet.features).to receive(:posix?).and_return(true)
-        allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
-      end
-
+    describe "on POSIX systems", unless: Puppet::Util::Platform.windows? do
       it "should be root if uid is 0" do
         allow(Process).to receive(:uid).and_return(0)
 
@@ -240,7 +237,7 @@ describe Puppet::Util::SUIDManager do
       end
     end
 
-    describe "on Microsoft Windows", :if => Puppet::Util::Platform.windows? do
+    describe "on Windows", :if => Puppet::Util::Platform.windows? do
       it "should be root if user is privileged" do
         allow(Puppet::Util::Windows::User).to receive(:admin?).and_return(true)
 
@@ -261,13 +258,19 @@ describe 'Puppet::Util::SUIDManager#groups=' do
     Puppet::Util::SUIDManager
   end
 
-  it "(#3419) should rescue Errno::EINVAL on OS X" do
+  it "raises on Windows", if: Puppet::Util::Platform.windows? do
+    expect {
+      subject.groups = []
+    }.to raise_error(NotImplementedError, /groups=\(\) function is unimplemented/)
+  end
+
+  it "(#3419) should rescue Errno::EINVAL on OS X", unless: Puppet::Util::Platform.windows? do
     expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
     expect(subject).to receive(:osx_maj_ver).and_return('10.7').twice
     subject.groups = ['list', 'of', 'groups']
   end
 
-  it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X" do
+  it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X", unless: Puppet::Util::Platform.windows? do
     expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
     expect(subject).to receive(:osx_maj_ver).and_return(false)
     expect { subject.groups = ['list', 'of', 'groups'] }.to raise_error(Errno::EINVAL)

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

@@ -309,7 +309,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
 
@@ -322,7 +322,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
 
@@ -456,7 +456,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
 
@@ -495,7 +495,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
 
@@ -533,7 +533,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)
@@ -583,7 +582,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.5.0
 platform: x64-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -148,6 +148,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: scanf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -431,6 +445,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/ffi/windows.rb
 - lib/puppet/ffi/windows/api_types.rb
 - lib/puppet/ffi/windows/constants.rb
@@ -723,6 +740,9 @@ files:
 - lib/puppet/network/http/api/master.rb
 - lib/puppet/network/http/api/master/v3.rb
 - lib/puppet/network/http/api/master/v3/environments.rb
+- lib/puppet/network/http/api/server.rb
+- lib/puppet/network/http/api/server/v3.rb
+- lib/puppet/network/http/api/server/v3/environments.rb
 - lib/puppet/network/http/connection.rb
 - lib/puppet/network/http/error.rb
 - lib/puppet/network/http/handler.rb
@@ -1128,6 +1148,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
@@ -1371,6 +1392,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
@@ -1834,10 +1856,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
@@ -2162,8 +2182,9 @@ files:
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/formats_spec.rb
 - spec/unit/network/http/api/indirected_routes_spec.rb
-- spec/unit/network/http/api/master/v3/environments_spec.rb
-- spec/unit/network/http/api/master/v3_spec.rb
+- spec/unit/network/http/api/master_spec.rb
+- spec/unit/network/http/api/server/v3/environments_spec.rb
+- spec/unit/network/http/api/server/v3_spec.rb
 - spec/unit/network/http/api_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
@@ -2226,6 +2247,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
@@ -2256,10 +2278,8 @@ files:
 - spec/unit/pops/parser/evaluating_parser_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
 - spec/unit/pops/parser/locator_spec.rb
-- spec/unit/pops/parser/parse_application_spec.rb
 - spec/unit/pops/parser/parse_basic_expressions_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
-- spec/unit/pops/parser/parse_capabilities_spec.rb
 - spec/unit/pops/parser/parse_conditionals_spec.rb
 - spec/unit/pops/parser/parse_containers_spec.rb
 - spec/unit/pops/parser/parse_functions_spec.rb
@@ -2267,7 +2287,6 @@ files:
 - spec/unit/pops/parser/parse_lambda_spec.rb
 - spec/unit/pops/parser/parse_plan_spec.rb
 - spec/unit/pops/parser/parse_resource_spec.rb
-- spec/unit/pops/parser/parse_site_spec.rb
 - spec/unit/pops/parser/parser_rspec_helper.rb
 - spec/unit/pops/parser/parser_spec.rb
 - spec/unit/pops/parser/parsing_typed_parameters_spec.rb
@@ -2609,6 +2628,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
@@ -3072,10 +3092,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
@@ -3400,8 +3418,9 @@ test_files:
 - spec/unit/network/format_support_spec.rb
 - spec/unit/network/formats_spec.rb
 - spec/unit/network/http/api/indirected_routes_spec.rb
-- spec/unit/network/http/api/master/v3/environments_spec.rb
-- spec/unit/network/http/api/master/v3_spec.rb
+- spec/unit/network/http/api/master_spec.rb
+- spec/unit/network/http/api/server/v3/environments_spec.rb
+- spec/unit/network/http/api/server/v3_spec.rb
 - spec/unit/network/http/api_spec.rb
 - spec/unit/network/http/connection_spec.rb
 - spec/unit/network/http/error_spec.rb
@@ -3464,6 +3483,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
@@ -3494,10 +3514,8 @@ test_files:
 - spec/unit/pops/parser/evaluating_parser_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
 - spec/unit/pops/parser/locator_spec.rb
-- spec/unit/pops/parser/parse_application_spec.rb
 - spec/unit/pops/parser/parse_basic_expressions_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
-- spec/unit/pops/parser/parse_capabilities_spec.rb
 - spec/unit/pops/parser/parse_conditionals_spec.rb
 - spec/unit/pops/parser/parse_containers_spec.rb
 - spec/unit/pops/parser/parse_functions_spec.rb
@@ -3505,7 +3523,6 @@ test_files:
 - spec/unit/pops/parser/parse_lambda_spec.rb
 - spec/unit/pops/parser/parse_plan_spec.rb
 - spec/unit/pops/parser/parse_resource_spec.rb
-- spec/unit/pops/parser/parse_site_spec.rb
 - spec/unit/pops/parser/parser_rspec_helper.rb
 - spec/unit/pops/parser/parser_spec.rb
 - spec/unit/pops/parser/parsing_typed_parameters_spec.rb