puppet 4.3.1-x86-mingw32 → 4.3.2-x86-mingw32

data/spec/unit/provider/yumrepo/inifile_spec.rb

@@ -249,6 +249,22 @@ describe Puppet::Type.type(:yumrepo).provider(:inifile) do
       expect(described_class.reposdir('/etc/yum.conf')).to include("/etc/yum/extra.repos.d")
     end
 
+    it "includes the directory if the value is split by whitespace" do
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(true)
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/misc.repos.d").returns(true)
+
+      described_class.expects(:find_conf_value).with('reposdir', '/etc/yum.conf').returns "/etc/yum/extra.repos.d /etc/yum/misc.repos.d"
+      expect(described_class.reposdir('/etc/yum.conf')).to include("/etc/yum/extra.repos.d", "/etc/yum/misc.repos.d")
+    end
+
+    it "includes the directory if the value is split by new lines" do
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(true)
+      Puppet::FileSystem.expects(:exist?).with("/etc/yum/misc.repos.d").returns(true)
+
+      described_class.expects(:find_conf_value).with('reposdir', '/etc/yum.conf').returns "/etc/yum/extra.repos.d\n/etc/yum/misc.repos.d"
+      expect(described_class.reposdir('/etc/yum.conf')).to include("/etc/yum/extra.repos.d", "/etc/yum/misc.repos.d")
+    end
+
     it "doesn't include the directory specified by the yum.conf 'reposdir' entry when the directory is absent" do
       Puppet::FileSystem.expects(:exist?).with("/etc/yum/extra.repos.d").returns(false)
 

data/spec/unit/resource_spec.rb

@@ -360,9 +360,8 @@ describe Puppet::Resource do
           Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).raises(Puppet::DataBinding::LookupError, 'Forgettabotit')
           expect {
             resource.set_default_parameters(scope)
-          }.to raise_error(Puppet::Error, /Error from DataBinding 'hiera' while looking up 'apache::port':.*Forgettabotit/)
+          }.to raise_error(Puppet::Error, /Lookup of key 'apache::port' failed: Forgettabotit/)
         end
-
       end
 
       context "when a value is provided" do
@@ -392,6 +391,17 @@ describe Puppet::Resource do
           expect(resource.set_default_parameters(scope)).to eq([])
           expect(resource[:port]).to eq('8080')
         end
+
+        it "should use the value from the data_binding terminus when provided value is undef" do
+          Puppet::DataBinding.indirection.expects(:find).with('lookup_options', any_parameters).throws(:no_such_key)
+          Puppet::DataBinding.indirection.expects(:find).with('apache::port', any_parameters).returns('443')
+
+          rs = Puppet::Parser::Resource.new("class", "apache", :scope => scope,
+            :parameters => [Puppet::Parser::Resource::Param.new({ :name => 'port', :value => nil })])
+
+          rs.resource_type.set_resource_parameters(rs, scope)
+          expect(rs[:port]).to eq('443')
+        end
       end
     end
   end

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

@@ -40,16 +40,16 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
   end
 
   describe ".sid_uri" do
-    it "should raise an error when the input is not a SID object" do
+    it "should raise an error when the input is not a SID Principal" do
       [Object.new, {}, 1, :symbol, '', nil].each do |input|
         expect {
           Puppet::Util::Windows::ADSI.sid_uri(input)
-        }.to raise_error(Puppet::Error, /Must use a valid SID object/)
+        }.to raise_error(Puppet::Error, /Must use a valid SID::Principal/)
       end
     end
 
     it "should return a SID uri for a well-known SID (SYSTEM)" do
-      sid = Win32::Security::SID.new('SYSTEM')
+      sid = Puppet::Util::Windows::SID::Principal.lookup_account_name('SYSTEM')
       expect(Puppet::Util::Windows::ADSI.sid_uri(sid)).to eq('WinNT://S-1-5-18')
     end
   end
@@ -60,12 +60,10 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
     let(:domain_username) { "#{domain}\\#{username}"}
 
     it "should generate the correct URI" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
       expect(Puppet::Util::Windows::ADSI::User.uri(username)).to eq("WinNT://./#{username},user")
     end
 
     it "should generate the correct URI for a user with a domain" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
       expect(Puppet::Util::Windows::ADSI::User.uri(username, domain)).to eq("WinNT://#{domain}/#{username},user")
     end
 
@@ -96,25 +94,33 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
     end
 
     it "should be able to check the existence of a user" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
+      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with(username).returns nil
       Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{username},user").returns connection
+      connection.expects(:Class).returns('User')
       expect(Puppet::Util::Windows::ADSI::User.exists?(username)).to be_truthy
     end
 
     it "should be able to check the existence of a domain user" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
+      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with("#{domain}\\#{username}").returns nil
       Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://#{domain}/#{username},user").returns connection
+      connection.expects(:Class).returns('User')
       expect(Puppet::Util::Windows::ADSI::User.exists?(domain_username)).to be_truthy
     end
 
     it "should be able to confirm the existence of a user with a well-known SID" do
-
       system_user = Win32::Security::SID::LocalSystem
       # ensure that the underlying OS is queried here
       Puppet::Util::Windows::ADSI.unstub(:connect)
       expect(Puppet::Util::Windows::ADSI::User.exists?(system_user)).to be_truthy
     end
 
+    it "should return false with a well-known Group SID" do
+      group = Win32::Security::SID::BuiltinAdministrators
+      # ensure that the underlying OS is queried here
+      Puppet::Util::Windows::ADSI.unstub(:connect)
+      expect(Puppet::Util::Windows::ADSI::User.exists?(group)).to be_falsey
+    end
+
     it "should return nil with an unknown SID" do
 
       bogus_sid = 'S-1-2-3-4'
@@ -130,8 +136,6 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
     end
 
     it "should return an enumeration of IADsUser wrapped objects" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
-
       name = 'Administrator'
       wmi_users = [stub('WMI', :name => name)]
       Puppet::Util::Windows::ADSI.expects(:execquery).with('select name from win32_useraccount where localaccount = "TRUE"').returns(wmi_users)
@@ -203,20 +207,20 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
 
       describe "when given a set of groups to which to add the user" do
         let(:existing_groups) { ['group2','group3'] }
-        let(:group_sids) { existing_groups.each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i])} }
+        let(:group_sids) { existing_groups.each_with_index.map{|n,i| stub(:Name => n, :objectSID => stub(:sid => i))} }
 
         let(:groups_to_set) { 'group1,group2' }
-        let(:desired_sids) { groups_to_set.split(',').each_with_index.map{|n,i| stub(:Name => n, :objectSID => [i-1])} }
+        let(:desired_sids) { groups_to_set.split(',').each_with_index.map{|n,i| stub(:Name => n, :objectSID => stub(:sid => i-1))} }
 
         before(:each) do
-          user.expects(:group_sids).returns(group_sids.map {|s| s.objectSID})
+          user.expects(:group_sids).returns(group_sids.map {|s| s.objectSID })
         end
 
         describe "if membership is specified as inclusive" do
           it "should add the user to those groups, and remove it from groups not in the list" do
-            Puppet::Util::Windows::ADSI::User.expects(:name_sid_hash).returns(Hash[ desired_sids.map { |s| [s.objectSID.to_s, s.objectSID] }])
-            user.expects(:add_group_sids).with([-1])
-            user.expects(:remove_group_sids).with([1])
+            Puppet::Util::Windows::ADSI::User.expects(:name_sid_hash).returns(Hash[ desired_sids.map { |s| [s.objectSID.sid, s.objectSID] }])
+            user.expects(:add_group_sids).with { |value| value.sid == -1 }
+            user.expects(:remove_group_sids).with { |value| value.sid == 1 }
 
             user.set_groups(groups_to_set, false)
           end
@@ -224,7 +228,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
           it "should remove all users from a group if desired is empty" do
             Puppet::Util::Windows::ADSI::User.expects(:name_sid_hash).returns({})
             user.expects(:add_group_sids).never
-            user.expects(:remove_group_sids).with([0], [1])
+            user.expects(:remove_group_sids).with { |user1, user2| user1.sid == 0 && user2.sid == 1 }
 
             user.set_groups('', false)
           end
@@ -232,8 +236,8 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
 
         describe "if membership is specified as minimum" do
           it "should add the user to the specified groups without affecting its other memberships" do
-            Puppet::Util::Windows::ADSI::User.expects(:name_sid_hash).returns(Hash[ desired_sids.map { |s| [s.objectSID.to_s, s.objectSID] }])
-            user.expects(:add_group_sids).with([-1])
+            Puppet::Util::Windows::ADSI::User.expects(:name_sid_hash).returns(Hash[ desired_sids.map { |s| [s.objectSID.sid, s.objectSID] }])
+            user.expects(:add_group_sids).with { |value| value.sid == -1 }
             user.expects(:remove_group_sids).never
 
             user.set_groups(groups_to_set, true)
@@ -270,7 +274,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         end
 
         it "and raise when passed a non-SID object to add" do
-          expect{ group.add_member_sids(invalid)}.to raise_error(Puppet::Error, /Must use a valid SID object/)
+          expect{ group.add_member_sids(invalid)}.to raise_error(Puppet::Error, /Must use a valid SID::Principal/)
         end
 
         it "to remove a member" do
@@ -280,7 +284,7 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         end
 
         it "and raise when passed a non-SID object to remove" do
-          expect{ group.remove_member_sids(invalid)}.to raise_error(Puppet::Error, /Must use a valid SID object/)
+          expect{ group.remove_member_sids(invalid)}.to raise_error(Puppet::Error, /Must use a valid SID::Principal/)
         end
       end
 
@@ -298,9 +302,9 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         it "should set the members of a group to only desired_members when inclusive" do
           names = ['DOMAIN\user1', 'user2']
           sids = [
-              stub(:account => 'user1', :domain => 'DOMAIN'),
-              stub(:account => 'user2', :domain => 'testcomputername'),
-              stub(:account => 'user3', :domain => 'DOMAIN2'),
+              stub(:account => 'user1', :domain => 'DOMAIN', :sid => 1),
+              stub(:account => 'user2', :domain => 'testcomputername', :sid => 2),
+              stub(:account => 'user3', :domain => 'DOMAIN2', :sid => 3),
           ]
 
           # use stubbed objectSid on member to return stubbed SID
@@ -325,9 +329,9 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         it "should add the desired_members to an existing group when not inclusive" do
           names = ['DOMAIN\user1', 'user2']
           sids = [
-              stub(:account => 'user1', :domain => 'DOMAIN'),
-              stub(:account => 'user2', :domain => 'testcomputername'),
-              stub(:account => 'user3', :domain => 'DOMAIN2'),
+              stub(:account => 'user1', :domain => 'DOMAIN', :sid => 1),
+              stub(:account => 'user2', :domain => 'testcomputername', :sid => 2),
+              stub(:account => 'user3', :domain => 'DOMAIN2', :sid => 3),
           ]
 
           # use stubbed objectSid on member to return stubbed SID
@@ -361,8 +365,8 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         it "should remove all members when desired_members is empty and inclusive" do
           names = ['DOMAIN\user1', 'user2']
           sids = [
-              stub(:account => 'user1', :domain => 'DOMAIN'),
-              stub(:account => 'user2', :domain => 'testcomputername')
+              stub(:account => 'user1', :domain => 'DOMAIN', :sid => 1 ),
+              stub(:account => 'user2', :domain => 'testcomputername', :sid => 2 ),
           ]
 
           # use stubbed objectSid on member to return stubbed SID
@@ -384,8 +388,8 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         it "should do nothing when desired_members is empty and not inclusive" do
           names = ['DOMAIN\user1', 'user2']
           sids = [
-              stub(:account => 'user1', :domain => 'DOMAIN'),
-              stub(:account => 'user2', :domain => 'testcomputername')
+              stub(:account => 'user1', :domain => 'DOMAIN', :sid => 1 ),
+              stub(:account => 'user2', :domain => 'testcomputername', :sid => 2 ),
           ]
           # use stubbed objectSid on member to return stubbed SID
           Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([0]).returns(sids[0])
@@ -409,7 +413,6 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       end
 
       it "should generate the correct URI" do
-        Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
         adsi_group.expects(:objectSID).returns([0])
         Socket.expects(:gethostname).returns('testcomputername')
         Puppet::Util::Windows::SID.expects(:octet_string_to_sid_object).with([0]).returns(stub(:account => groupname,:domain => 'testcomputername'))
@@ -418,7 +421,6 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
     end
 
     it "should generate the correct URI" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
       expect(Puppet::Util::Windows::ADSI::Group.uri("people")).to eq("WinNT://./people,group")
     end
 
@@ -435,8 +437,9 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
     end
 
     it "should be able to confirm the existence of a group" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
+      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with(groupname).returns nil
       Puppet::Util::Windows::ADSI.expects(:connect).with("WinNT://./#{groupname},group").returns connection
+      connection.expects(:Class).returns('Group')
 
       expect(Puppet::Util::Windows::ADSI::Group.exists?(groupname)).to be_truthy
     end
@@ -449,6 +452,13 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
       expect(Puppet::Util::Windows::ADSI::Group.exists?(service_group)).to be_truthy
     end
 
+    it "will return true with a well-known User SID, as there is no way to resolve it with a WinNT:// style moniker" do
+      user = Win32::Security::SID::NtLocal
+      # ensure that the underlying OS is queried here
+      Puppet::Util::Windows::ADSI.unstub(:connect)
+      expect(Puppet::Util::Windows::ADSI::Group.exists?(user)).to be_truthy
+    end
+
     it "should return nil with an unknown SID" do
 
       bogus_sid = 'S-1-2-3-4'
@@ -464,8 +474,6 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
     end
 
     it "should return an enumeration of IADsGroup wrapped objects" do
-      Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
-
       name = 'Administrators'
       wmi_groups = [stub('WMI', :name => name)]
       Puppet::Util::Windows::ADSI.expects(:execquery).with('select name from win32_group where localaccount = "TRUE"').returns(wmi_groups)

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

@@ -17,8 +17,10 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
       bytes = [1, 1, 0, 0, 0, 0, 0, 5, 18, 0, 0, 0]
       converted = subject.octet_string_to_sid_object(bytes)
 
-      expect(converted).to eq(Win32::Security::SID.new('SYSTEM'))
-      expect(converted).to be_an_instance_of Win32::Security::SID
+      expect(converted).to be_an_instance_of Puppet::Util::Windows::SID::Principal
+      expect(converted.sid_bytes).to eq(bytes)
+      expect(converted.sid).to eq(sid)
+      expect(converted.account).to eq('SYSTEM')
     end
 
     it "should raise an error for non-array input" do
@@ -33,11 +35,19 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
       }.to raise_error(Puppet::Error, /Octet string must be an array of bytes/)
     end
 
+    it "should raise an error for a valid byte array with no mapping to a user" do
+      expect {
+        # S-1-1-1 which is not a valid account
+        valid_octet_invalid_user =[1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0]
+        subject.octet_string_to_sid_object(valid_octet_invalid_user)
+      }.to raise_error(Puppet::Util::Windows::Error, /Failed to call LookupAccountSidW:  No mapping between account names and security IDs was done./)
+    end
+
     it "should raise an error for a malformed byte array" do
       expect {
-        invalid_octet = [1]
+        invalid_octet = [2]
         subject.octet_string_to_sid_object(invalid_octet)
-      }.to raise_error(SystemCallError, /No mapping between account names and security IDs was done./)
+      }.to raise_error(Puppet::Util::Windows::Error, /Failed to call LookupAccountSidW:  The parameter is incorrect./)
     end
   end
 
@@ -51,12 +61,12 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
     end
 
     it "should return a SID for a passed user or group name" do
-      subject.expects(:name_to_sid_object).with('testers').returns 'S-1-5-32-547'
+      subject.expects(:name_to_sid_object).with('testers').returns stub(:sid => 'S-1-5-32-547')
       expect(subject.name_to_sid('testers')).to eq('S-1-5-32-547')
     end
 
     it "should return a SID for a passed fully-qualified user or group name" do
-      subject.expects(:name_to_sid_object).with('MACHINE\testers').returns 'S-1-5-32-547'
+      subject.expects(:name_to_sid_object).with('MACHINE\testers').returns stub(:sid => 'S-1-5-32-547')
       expect(subject.name_to_sid('MACHINE\testers')).to eq('S-1-5-32-547')
     end
 
@@ -75,6 +85,33 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
     it "should be the identity function for any sid" do
       expect(subject.name_to_sid(sid)).to eq(sid)
     end
+
+    describe "with non-US languages" do
+
+      UMLAUT = [195, 164].pack('c*').force_encoding(Encoding::UTF_8)
+      let(:username) { SecureRandom.uuid.to_s.gsub(/\-/, '')[0..13] + UMLAUT }
+
+      after(:each) {
+        Puppet::Util::Windows::ADSI::User.delete(username)
+      }
+
+      it "should properly resolve a username with an umlaut" do
+        # Ruby seems to use the local codepage when making COM calls
+        # if this fails, might want to use Windows API directly instead to ensure bytes
+        user = Puppet::Util::Windows::ADSI.create(username, 'user')
+        user.SetInfo()
+
+        # compare the new SID to the name_to_sid result
+        sid_bytes = user.objectSID.to_a
+        sid_string = ''
+        FFI::MemoryPointer.new(:byte, sid_bytes.length) do |sid_byte_ptr|
+          sid_byte_ptr.write_array_of_uchar(sid_bytes)
+          sid_string = Puppet::Util::Windows::SID.sid_ptr_to_string(sid_byte_ptr)
+        end
+
+        expect(subject.name_to_sid(username)).to eq(sid_string)
+      end
+    end
   end
 
   context "#name_to_sid_object" do
@@ -82,12 +119,12 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
       expect(subject.name_to_sid_object(unknown_name)).to be_nil
     end
 
-    it "should return a Win32::Security::SID instance for any valid sid" do
-      expect(subject.name_to_sid_object(sid)).to be_an_instance_of(Win32::Security::SID)
+    it "should return a Puppet::Util::Windows::SID::Principal instance for any valid sid" do
+      expect(subject.name_to_sid_object(sid)).to be_an_instance_of(Puppet::Util::Windows::SID::Principal)
     end
 
     it "should accept unqualified account name" do
-      expect(subject.name_to_sid_object('SYSTEM').to_s).to eq(sid)
+      expect(subject.name_to_sid_object('SYSTEM').sid).to eq(sid)
     end
 
     it "should be case-insensitive" do
@@ -99,7 +136,7 @@ describe "Puppet::Util::Windows::SID", :if => Puppet.features.microsoft_windows?
     end
 
     it "should accept domain qualified account names" do
-      expect(subject.name_to_sid_object('NT AUTHORITY\SYSTEM').to_s).to eq(sid)
+      expect(subject.name_to_sid_object('NT AUTHORITY\SYSTEM').sid).to eq(sid)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1108,6 +1108,7 @@ files:
 - lib/puppet/util/windows/com.rb
 - lib/puppet/util/windows/error.rb
 - lib/puppet/util/windows/file.rb
+- lib/puppet/util/windows/principal.rb
 - lib/puppet/util/windows/process.rb
 - lib/puppet/util/windows/registry.rb
 - lib/puppet/util/windows/root_certs.rb
@@ -1581,6 +1582,10 @@ files:
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/unit/application/environments/production/data/common.yaml
 - spec/fixtures/unit/application/environments/production/environment.conf
+- spec/fixtures/unit/application/environments/production/manifests/site.pp
+- spec/fixtures/unit/application/environments/puppet_func_provider/environment.conf
+- spec/fixtures/unit/application/environments/puppet_func_provider/functions/data.pp
+- spec/fixtures/unit/application/environments/puppet_func_provider/manifests/site.pp
 - spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/data/bad.json
 - spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/environment.conf
 - spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/hiera.yaml
@@ -1609,7 +1614,10 @@ files:
 - spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/data/common.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/metadata.json
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/data/specific.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/environment.conf
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/hiera.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/manifests/site.pp
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/first.json
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml
@@ -1619,6 +1627,19 @@ files:
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/metadata.json
+- spec/fixtures/unit/data_providers/environments/hiera_modules/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/data/specific.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/environment.conf
+- spec/fixtures/unit/data_providers/environments/hiera_modules/hiera.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/manifests/site.pp
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/hiera.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/metadata.json
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/hiera.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/metadata.json
 - spec/fixtures/unit/data_providers/environments/production/environment.conf
 - spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb
 - spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb
@@ -1714,9 +1735,21 @@ files:
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/lib/puppet/bindings/good/default.rb
 - spec/fixtures/unit/pops/binder/config/binder_config/nolayer/binder_config.yaml
 - spec/fixtures/unit/pops/binder/config/binder_config/ok/binder_config.yaml
-- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/usee/lib/puppet/functions/usee/callee.rb
-- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/lib/puppet/functions/user/caller.rb
-- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/metadata.json
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/functions/usee_puppet.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/functions/usee/callee.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/functions/usee/usee_ruby.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/manifests/init.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee2/lib/puppet/functions/usee2/callee.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet_init.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_ruby.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/caller.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/caller2.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet_init.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_ruby.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/manifests/init.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json
@@ -1937,7 +1970,9 @@ files:
 - spec/integration/util/execution_spec.rb
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
+- spec/integration/util/windows/principal_spec.rb
 - spec/integration/util/windows/process_spec.rb
+- spec/integration/util/windows/registry_spec.rb
 - spec/integration/util/windows/security_spec.rb
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
@@ -2628,7 +2663,6 @@ files:
 - spec/unit/util/windows/access_control_list_spec.rb
 - spec/unit/util/windows/adsi_spec.rb
 - spec/unit/util/windows/api_types_spec.rb
-- spec/unit/util/windows/registry_spec.rb
 - spec/unit/util/windows/root_certs_spec.rb
 - spec/unit/util/windows/security_descriptor_spec.rb
 - spec/unit/util/windows/sid_spec.rb
@@ -2713,6 +2747,10 @@ test_files:
 - spec/fixtures/stdlib.tgz
 - spec/fixtures/unit/application/environments/production/data/common.yaml
 - spec/fixtures/unit/application/environments/production/environment.conf
+- spec/fixtures/unit/application/environments/production/manifests/site.pp
+- spec/fixtures/unit/application/environments/puppet_func_provider/environment.conf
+- spec/fixtures/unit/application/environments/puppet_func_provider/functions/data.pp
+- spec/fixtures/unit/application/environments/puppet_func_provider/manifests/site.pp
 - spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/data/bad.json
 - spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/environment.conf
 - spec/fixtures/unit/data_providers/environments/hiera_bad_syntax_json/hiera.yaml
@@ -2741,7 +2779,10 @@ test_files:
 - spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/data/common.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/hiera_misc/modules/one/metadata.json
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/data/specific.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/environment.conf
+- spec/fixtures/unit/data_providers/environments/hiera_module_config/hiera.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/manifests/site.pp
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/first.json
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/data1/name.yaml
@@ -2751,6 +2792,19 @@ test_files:
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/hiera.yaml
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/manifests/init.pp
 - spec/fixtures/unit/data_providers/environments/hiera_module_config/modules/one/metadata.json
+- spec/fixtures/unit/data_providers/environments/hiera_modules/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/data/specific.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/environment.conf
+- spec/fixtures/unit/data_providers/environments/hiera_modules/hiera.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/manifests/site.pp
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/hiera.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/one/metadata.json
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/data/common.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/hiera.yaml
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/manifests/init.pp
+- spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/metadata.json
 - spec/fixtures/unit/data_providers/environments/production/environment.conf
 - spec/fixtures/unit/data_providers/environments/production/lib/puppet/functions/environment/data.rb
 - spec/fixtures/unit/data_providers/environments/production/modules/abc/lib/puppet/bindings/abc/default.rb
@@ -2846,9 +2900,21 @@ test_files:
 - spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/lib/puppet/bindings/good/default.rb
 - spec/fixtures/unit/pops/binder/config/binder_config/nolayer/binder_config.yaml
 - spec/fixtures/unit/pops/binder/config/binder_config/ok/binder_config.yaml
-- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/usee/lib/puppet/functions/usee/callee.rb
-- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/lib/puppet/functions/user/caller.rb
-- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/user/metadata.json
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/functions/usee_puppet.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/functions/usee/callee.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/lib/puppet/functions/usee/usee_ruby.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee/manifests/init.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/usee2/lib/puppet/functions/usee2/callee.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_puppet_init.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/functions/puppet_calling_ruby.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/caller.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/caller2.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_puppet_init.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/lib/puppet/functions/user/ruby_calling_ruby.rb
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/manifests/init.pp
+- spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/metadata.json
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb
 - spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json
@@ -3069,7 +3135,9 @@ test_files:
 - spec/integration/util/execution_spec.rb
 - spec/integration/util/rdoc/parser_spec.rb
 - spec/integration/util/settings_spec.rb
+- spec/integration/util/windows/principal_spec.rb
 - spec/integration/util/windows/process_spec.rb
+- spec/integration/util/windows/registry_spec.rb
 - spec/integration/util/windows/security_spec.rb
 - spec/integration/util/windows/user_spec.rb
 - spec/integration/util_spec.rb
@@ -3760,7 +3828,6 @@ test_files:
 - spec/unit/util/windows/access_control_list_spec.rb
 - spec/unit/util/windows/adsi_spec.rb
 - spec/unit/util/windows/api_types_spec.rb
-- spec/unit/util/windows/registry_spec.rb
 - spec/unit/util/windows/root_certs_spec.rb
 - spec/unit/util/windows/security_descriptor_spec.rb
 - spec/unit/util/windows/sid_spec.rb