puppet 5.0.0 → 6.0.0

data/spec/integration/test/test_helper_spec.rb

@@ -1,32 +1,32 @@
-#! /usr/bin/env ruby
-require 'spec_helper'
-
-describe "Windows UTF8 environment variables", :if => Puppet.features.microsoft_windows? do
-  # The Puppet::Util::Windows::Process class is used to manipulate environment variables as it is known to handle UTF8 characters. Where as the implementation of ENV in ruby does not.
-  # before and end all are used to inject environment variables before the test helper 'before_each_test' function is called
-  # Do not use before and after hooks in these tests as it may have unintended consequences
-
-  before(:all) {
-    @varname = 'test_helper_spec-test_variable'
-    @rune_utf8 = "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7"
-
-    Puppet::Util::Windows::Process.set_environment_variable(@varname, @rune_utf8)
-  }
-  after(:all) {
-    # Need to cleanup this environment variable otherwise it contaminates any subsequent tests
-    Puppet::Util::Windows::Process.set_environment_variable(@varname, nil)
-  }
-  
-  it "#after_each_test should preserve UTF8 environment variables" do
-    envhash = Puppet::Util::Windows::Process.get_environment_strings
-    expect(envhash[@varname]).to eq(@rune_utf8)
-    # Change the value in the test to force test_helper to restore the environment
-    ENV[@varname] = 'bad foo'
-
-    # Prematurely trigger the after_each_test method
-    Puppet::Test::TestHelper.after_each_test
-
-    envhash = Puppet::Util::Windows::Process.get_environment_strings
-    expect(envhash[@varname]).to eq(@rune_utf8)
-  end
-end
+#! /usr/bin/env ruby
+require 'spec_helper'
+
+describe "Windows UTF8 environment variables", :if => Puppet::Util::Platform.windows? do
+  # The Puppet::Util::Windows::Process class is used to manipulate environment variables as it is known to handle UTF8 characters. Where as the implementation of ENV in ruby does not.
+  # before and end all are used to inject environment variables before the test helper 'before_each_test' function is called
+  # Do not use before and after hooks in these tests as it may have unintended consequences
+
+  before(:all) {
+    @varname = 'test_helper_spec-test_variable'
+    @rune_utf8 = "\u16A0\u16C7\u16BB\u16EB\u16D2\u16E6\u16A6\u16EB\u16A0\u16B1\u16A9\u16A0\u16A2\u16B1\u16EB\u16A0\u16C1\u16B1\u16AA\u16EB\u16B7\u16D6\u16BB\u16B9\u16E6\u16DA\u16B3\u16A2\u16D7"
+
+    Puppet::Util::Windows::Process.set_environment_variable(@varname, @rune_utf8)
+  }
+  after(:all) {
+    # Need to cleanup this environment variable otherwise it contaminates any subsequent tests
+    Puppet::Util::Windows::Process.set_environment_variable(@varname, nil)
+  }
+
+  it "#after_each_test should preserve UTF8 environment variables" do
+    envhash = Puppet::Util::Windows::Process.get_environment_strings
+    expect(envhash[@varname]).to eq(@rune_utf8)
+    # Change the value in the test to force test_helper to restore the environment
+    ENV[@varname] = 'bad foo'
+
+    # Prematurely trigger the after_each_test method
+    Puppet::Test::TestHelper.after_each_test
+
+    envhash = Puppet::Util::Windows::Process.get_environment_strings
+    expect(envhash[@varname]).to eq(@rune_utf8)
+  end
+end

data/spec/integration/transaction/report_spec.rb

@@ -3,6 +3,11 @@ require 'spec_helper'
 require 'puppet_spec/files'
 
 describe Puppet::Transaction::Report do
+  before :each do
+    # Enable persistence during tests
+    Puppet::Transaction::Persistence.any_instance.stubs(:enabled?).returns(true)
+  end
+
   describe "when using the indirector" do
     after do
       Puppet.settings.stubs(:use)
@@ -82,7 +87,7 @@ describe Puppet::Transaction::Report do
     end
 
     def get_cc_count(report)
-      cc = report.metrics["resources"].values.each do |v|
+      report.metrics["resources"].values.each do |v|
         if v[0] == "corrective_change"
           return v[2]
         end
@@ -293,8 +298,8 @@ describe Puppet::Transaction::Report do
                                                            :content => "mystuff1"),
                               Puppet::Type.type(:file).new(:title => file,
                                                            :content => "mystuff2")) do
-          File.open(file, 'w') do |file|
-            file.write "some content"
+          File.open(file, 'w') do |f|
+            f.write "some content"
           end
         end
 
@@ -380,7 +385,7 @@ describe Puppet::Transaction::Report do
         expect(get_cc_count(report)).to eq(0)
       end
 
-      it "link with ensure property change present => absent", :unless => Puppet.features.microsoft_windows? do
+      it "link with ensure property change present => absent", :unless => Puppet::Util::Platform.windows? do
         file = tmpfile("test_file")
         FileUtils.symlink(file, tmpfile("test_link"))
 
@@ -435,7 +440,7 @@ describe Puppet::Transaction::Report do
         expect(get_cc_count(report)).to eq(0)
       end
 
-      it "exec with idempotence issue", :unless => Puppet.features.microsoft_windows? do
+      it "exec with idempotence issue", :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
         report = run_catalogs(Puppet::Type.type(:exec).new(:title => "exec1",
                                                            :command => "/bin/echo foo"),
                               Puppet::Type.type(:exec).new(:title => "exec1",
@@ -453,7 +458,7 @@ describe Puppet::Transaction::Report do
         expect(get_cc_count(report)).to eq(1)
       end
 
-      it "exec with no idempotence issue", :unless => Puppet.features.microsoft_windows? do
+      it "exec with no idempotence issue", :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
         report = run_catalogs(Puppet::Type.type(:exec).new(:title => "exec1",
                                                            :command => "echo foo",
                                                            :path => "/bin",

data/spec/integration/type/exec_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 require 'puppet_spec/files'
 
-describe Puppet::Type.type(:exec) do
+describe Puppet::Type.type(:exec), unless: Puppet::Util::Platform.jruby? do
   include PuppetSpec::Files
 
   let(:catalog) { Puppet::Resource::Catalog.new }

data/spec/integration/type/file_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 require 'puppet_spec/files'
 
-if Puppet.features.microsoft_windows?
+if Puppet::Util::Platform.windows?
   require 'puppet/util/windows'
   class WindowsSecurity
     extend Puppet::Util::Windows::Security
@@ -80,6 +80,9 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
   before do
     # stub this to not try to create state.yaml
     Puppet::Util::Storage.stubs(:store)
+
+    Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
+    Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
   end
 
   it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
@@ -292,13 +295,14 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
             Puppet::FileSystem.symlink(link_target, link)
           end
 
-          it "should not set the executable bit on the link nor the target" do
+          it "should not set the executable bit on the link target" do
             catalog.add_resource described_class.new(:path => link, :ensure => :link, :mode => '0666', :target => link_target, :links => :manage)
 
             catalog.apply
 
-            (Puppet::FileSystem.stat(link).mode & 07777) == 0666
-            (Puppet::FileSystem.lstat(link_target).mode & 07777) == 0444
+            expected_target_permissions = Puppet::Util::Platform.windows? ? 0700 : 0444
+
+            expect(Puppet::FileSystem.stat(link_target).mode & 07777).to eq(expected_target_permissions)
           end
 
           it "should ignore dangling symlinks (#6856)" do
@@ -413,6 +417,13 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
               expect(get_mode(path) & 07777).to eq(0600)
             end
 
+            it "should not give a deprecation warning about using a checksum in content when using source to define content" do
+              FileUtils.touch(path)
+              Puppet.expects(:puppet_deprecation_warning).never
+              catalog.add_resource described_class.new(:path => path, :source => link, :links => :follow)
+              catalog.apply
+            end
+
             context "overwriting a file" do
               before :each do
                 FileUtils.touch(path)
@@ -479,7 +490,11 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
   describe "when writing files" do
     shared_examples "files are backed up" do |resource_options|
-      it "should backup files to a filebucket when one is configured" do
+      it "should backup files to a filebucket when one is configured" do |example|
+        if Puppet::Util::Platform.windows? && ['sha512', 'sha384'].include?(example.metadata[:digest_algorithm])
+          skip "PUP-8257: Skip file bucket test on windows for #{example.metadata[:digest_algorithm]} due to long path names"
+        end
+
         filebucket = Puppet::Type.type(:filebucket).new :path => tmpfile("filebucket"), :name => "mybucket"
         file = described_class.new({:path => path, :backup => "mybucket", :content => "foo"}.merge(resource_options))
         catalog.add_resource file
@@ -537,8 +552,6 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         File.open(dest1, "w") { |f| f.puts "whatever" }
         Puppet::FileSystem.symlink(dest1, link)
 
-        d = filebucket_digest.call(File.read(file[:path]))
-
         catalog.apply
 
         expect(Puppet::FileSystem.readlink(link)).to eq(dest2)
@@ -562,7 +575,11 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         expect(File.read(File.join(backup, "foo"))).to eq("yay")
       end
 
-      it "should backup directories to filebuckets by backing up each file separately" do
+      it "should backup directories to filebuckets by backing up each file separately" do |example|
+        if Puppet::Util::Platform.windows? && ['sha512', 'sha384'].include?(example.metadata[:digest_algorithm])
+          skip "PUP-8257: Skip file bucket test on windows for #{example.metadata[:digest_algorithm]} due to long path names"
+        end
+        
         bucket = Puppet::Type.type(:filebucket).new :path => tmpfile("filebucket"), :name => "mybucket"
         file = described_class.new({:path => tmpfile("bucket_backs"), :backup => "mybucket", :content => "foo", :force => true}.merge(resource_options))
         catalog.add_resource file
@@ -585,10 +602,30 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       end
     end
 
+    it "should not give a checksum deprecation warning when given actual content" do
+      Puppet.expects(:puppet_deprecation_warning).never
+      catalog.add_resource described_class.new(:path => path, :content => 'this is content')
+      catalog.apply
+    end
+
     with_digest_algorithms do
       it_should_behave_like "files are backed up", {} do
         let(:filebucket_digest) { method(:digest) }
       end
+
+      it "should give a checksum deprecation warning" do
+        Puppet.expects(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
+        d = digest("this is some content")
+        catalog.add_resource described_class.new(:path => path, :content => "{#{digest_algorithm}}#{d}")
+        catalog.apply
+      end
+
+      it "should not give a checksum deprecation warning when no content is specified while checksum and checksum value are used" do
+        Puppet.expects(:puppet_deprecation_warning).never
+        d = digest("this is some content")
+        catalog.add_resource described_class.new(:path => path, :checksum => digest_algorithm, :checksum_value => d)
+        catalog.apply
+      end
     end
 
     CHECKSUM_TYPES_TO_TRY.each do |checksum_type, checksum|
@@ -654,13 +691,13 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       catalog.apply
 
       expect(@dirs).not_to be_empty
-      @dirs.each do |path|
-        expect(get_mode(path) & 007777).to eq(0755)
+      @dirs.each do |dir|
+        expect(get_mode(dir) & 007777).to eq(0755)
       end
 
       expect(@files).not_to be_empty
-      @files.each do |path|
-        expect(get_mode(path) & 007777).to eq(0644)
+      @files.each do |dir|
+        expect(get_mode(dir) & 007777).to eq(0644)
       end
     end
 
@@ -1022,8 +1059,8 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     before do
       source = tmpdir("generating_in_catalog_source")
 
-      s1 = file_in_dir_with_contents(source, "one", "uno")
-      s2 = file_in_dir_with_contents(source, "two", "dos")
+      file_in_dir_with_contents(source, "one", "uno")
+      file_in_dir_with_contents(source, "two", "dos")
 
       @file = described_class.new(
         :name => path,
@@ -1093,7 +1130,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       uri_path = resource.parameters[:source].uri.path
 
       # note that Windows file:// style URIs get an extra / in front of c:/ like /c:/
-      source_prefix = Puppet.features.microsoft_windows? ? '/' : ''
+      source_prefix = Puppet::Util::Platform.windows? ? '/' : ''
 
       # the URI can be round-tripped through unescape
       expect(URI.unescape(uri_path)).to eq(source_prefix + source)
@@ -1244,6 +1281,21 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
   end
 
   describe "when sourcing" do
+    it "should give a deprecation warning when the user sets source_permissions" do
+      Puppet.expects(:puppet_deprecation_warning).with(
+        'The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`.', 
+        {:file => 'my/file.pp', :line => 5})
+
+      catalog.add_resource described_class.new(:path => path, :content => 'this is content', :source_permissions => :use_when_creating)
+      catalog.apply
+    end
+
+    it "should not give a deprecation warning when the user does not set source_permissions" do
+      Puppet.expects(:puppet_deprecation_warning).never
+      catalog.add_resource described_class.new(:path => path, :content => 'this is content')
+      catalog.apply
+    end
+
     with_checksum_types "source", "default_values" do
       before(:each) do
         set_mode(0770, checksum_file)
@@ -1386,7 +1438,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       end
     end
 
-    describe "on Windows systems", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows systems", :if => Puppet::Util::Platform.windows? do
       def expects_sid_granted_full_access_explicitly(path, sid)
         inherited_ace = Puppet::Util::Windows::AccessControlEntry::INHERITED_ACE
 
@@ -1658,7 +1710,9 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
     it "should succeed the file resource if command succeeds" do
       catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env true"))
-      Puppet::Util::Execution.expects(:execute).with("/usr/bin/env true", {:combine => true, :failonfail => true}).returns ''
+      Puppet::Util::Execution.expects(:execute)
+        .with("/usr/bin/env true", {:combine => true, :failonfail => true})
+        .returns Puppet::Util::Execution::ProcessOutput.new('', 0)
       report = catalog.apply.report
       expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
       expect(Puppet::FileSystem.exist?(path)).to be_truthy
@@ -1816,7 +1870,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
   end
 
-  [:md5, :sha256, :md5lite, :sha256lite].each do |checksum|
+  [:md5, :sha256, :md5lite, :sha256lite, :sha384, :sha512, :sha224].each do |checksum|
     describe "setting checksum_value explicitly with checksum #{checksum}" do
       let(:path) { tmpfile('target') }
       let(:contents) { 'yay' }

data/spec/integration/type/package_spec.rb

@@ -105,7 +105,7 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
     end
   end
 
-  describe "from multiple providers" do
+  describe "from multiple providers", unless: Puppet::Util::Platform.jruby? do
     provider_class = Puppet::Type.type(:package).provider(:gem)
 
     before :each do

data/spec/integration/type_spec.rb

@@ -21,8 +21,7 @@ describe Puppet::Type do
 
   it "should not lose its provider parameter when it is reloaded" do
     type = Puppet::Type.newtype(:reload_test_type)
-
-    provider = type.provide(:test_provider)
+    type.provide(:test_provider)
 
     # reload it
     type = Puppet::Type.newtype(:reload_test_type)

data/spec/integration/util/autoload_spec.rb

@@ -24,6 +24,8 @@ require 'puppet_spec/files'
 describe Puppet::Util::Autoload do
   include PuppetSpec::Files
 
+  let(:env) { Puppet::Node::Environment.create(:foo, []) }
+
   def with_file(name, *path)
     path = File.join(*path)
     # Now create a file to load
@@ -49,13 +51,13 @@ describe Puppet::Util::Autoload do
   end
 
   it "should not fail when asked to load a missing file" do
-    expect(Puppet::Util::Autoload.new("foo", "bar").load(:eh)).to be_falsey
+    expect(Puppet::Util::Autoload.new("foo", "bar").load(:eh, env)).to be_falsey
   end
 
   it "should load and return true when it successfully loads a file" do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:mything, dir, "mything.rb") {
-        expect(loader.load(:mything)).to be_truthy
+        expect(loader.load(:mything, env)).to be_truthy
         expect(loader.class).to be_loaded("bar/mything")
         expect(AutoloadIntegrator).to be_thing(:mything)
       }
@@ -65,7 +67,7 @@ describe Puppet::Util::Autoload do
   it "should consider a file loaded when asked for the name without an extension" do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:noext, dir, "noext.rb") {
-        loader.load(:noext)
+        loader.load(:noext, env)
         expect(loader.class).to be_loaded("bar/noext")
       }
     }
@@ -74,7 +76,7 @@ describe Puppet::Util::Autoload do
   it "should consider a file loaded when asked for the name with an extension" do
     with_loader("foo", "bar") { |dir,loader|
       with_file(:noext, dir, "withext.rb") {
-        loader.load(:withext)
+        loader.load(:withext, env)
         expect(loader.class).to be_loaded("bar/withext.rb")
       }
     }
@@ -90,10 +92,11 @@ describe Puppet::Util::Autoload do
 
     file = File.join(libdir, "plugin.rb")
 
-    Puppet.override(:environments => Puppet::Environments::Static.new(Puppet::Node::Environment.create(:production, [modulepath]))) do
+    env = Puppet::Node::Environment.create(:production, [modulepath])
+    Puppet.override(:environments => Puppet::Environments::Static.new(env)) do
       with_loader("foo", "foo") do |dir, loader|
         with_file(:plugin, file.split("/")) do
-          loader.load(:plugin)
+          loader.load(:plugin, env)
           expect(loader.class).to be_loaded("foo/plugin.rb")
         end
       end

data/spec/integration/util/execution_spec.rb

@@ -1,23 +1,31 @@
 require 'spec_helper'
 
-describe Puppet::Util::Execution do
+describe Puppet::Util::Execution, unless: Puppet::Util::Platform.jruby? do
   include PuppetSpec::Files
 
   describe "#execpipe" do
-    it "should set LANG to C avoid localized output", :if => !Puppet.features.microsoft_windows? do
+    it "should set LANG to C avoid localized output", :if => !Puppet::Util::Platform.windows? do
       out = ""
       Puppet::Util::Execution.execpipe('echo $LANG'){ |line| out << line.read.chomp }
       expect(out).to eq("C")
     end
 
-    it "should set LC_ALL to C avoid localized output", :if => !Puppet.features.microsoft_windows? do
+    it "should set LC_ALL to C avoid localized output", :if => !Puppet::Util::Platform.windows? do
       out = ""
       Puppet::Util::Execution.execpipe('echo $LC_ALL'){ |line| out << line.read.chomp }
       expect(out).to eq("C")
     end
+
+    it "should raise an ExecutionFailure with a missing command and :failonfail set to true" do
+      expect {
+        failonfail = true
+        # NOTE: critical to return l in the block for `output` in method to be #<IO:(closed)>
+        Puppet::Util::Execution.execpipe('conan_the_librarion', failonfail) { |l| l }
+      }.to raise_error(Puppet::ExecutionFailure)
+    end
   end
 
-  describe "#execute (non-Windows)", :if => !Puppet.features.microsoft_windows? do
+  describe "#execute (non-Windows)", :if => !Puppet::Util::Platform.windows? do
     it "should execute basic shell command" do
       result = Puppet::Util::Execution.execute("ls /tmp", :failonfail => true)
       expect(result.exitstatus).to eq(0)
@@ -25,7 +33,7 @@ describe Puppet::Util::Execution do
     end
   end
 
-  describe "#execute (Windows)", :if => Puppet.features.microsoft_windows? do
+  describe "#execute (Windows)", :if => Puppet::Util::Platform.windows? do
     let(:utf8text) do
       # Japanese Lorem Ipsum snippet
       "utf8testfile" + [227, 131, 171, 227, 131, 147, 227, 131, 179, 227, 131, 132, 227,

data/spec/integration/util/rdoc/parser_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'puppet/util/rdoc'
 
-describe "RDoc::Parser", :unless => Puppet.features.microsoft_windows? do
+describe "RDoc::Parser", :unless => Puppet::Util::Platform.windows? do
   require 'puppet_spec/files'
   include PuppetSpec::Files
 
@@ -141,22 +141,21 @@ end
     Puppet::Util::RDoc.rdoc(doc_dir, [modules_dir, manifests_dir])
   end
 
-  module RdocTesters
-    def has_plugin_rdoc(module_name, type, name)
-      file_exists_and_matches_content(plugin_path(module_name, type, name), /The .*?#{name}.*?\s*#{type} comment/m, /Type.*?#{type}/m)
+  describe "rdoc2 support" do
+    def module_path(module_name)
+      "#{doc_dir}/#{module_name}.html"
     end
-  end
 
-  shared_examples_for :an_rdoc_site do
-    # PUP-3274 / PUP-3638 not sure if this should be kept or not - it is now broken
-#    it "documents the __site__ module" do
-#      has_module_rdoc("__site__")
-#    end
+    def plugin_path(module_name, type, name)
+      "#{doc_dir}/#{module_name}/__#{type}s__.html"
+    end
 
-    # PUP-3274 / PUP-3638 not sure if this should be kept or not - it is now broken
-#    it "documents the a_module module" do
-#      has_module_rdoc("a_module", /The .*?a_module.*? .*?README.*?docs/m)
-#    end
+    def has_plugin_rdoc(module_name, type, name)
+      file_exists_and_matches_content(
+        plugin_path(module_name, type, name),
+        /The .*?#{name}.*?\s*#{type} comment/m, /Type.*?#{type}/m
+      )
+    end
 
     it "documents the a_module::a_plugin type" do
       has_plugin_rdoc("a_module", :type, 'a_plugin')
@@ -170,13 +169,4 @@ end
       has_plugin_rdoc("a_module", :fact, 'a_fact')
     end
   end
-
-  describe "rdoc2 support" do
-    def module_path(module_name); "#{doc_dir}/#{module_name}.html" end
-    def plugin_path(module_name, type, name); "#{doc_dir}/#{module_name}/__#{type}s__.html" end
-
-    include RdocTesters
-
-    it_behaves_like :an_rdoc_site
-  end
 end

data/spec/integration/util/settings_spec.rb

@@ -30,6 +30,7 @@ describe Puppet::Settings do
   end
 
   it "should make its directories with the correct modes" do
+    Puppet[:manage_internal_file_permissions] = true
     define_settings(:main,
         :maindir => {
             :default => tmpfile("main"),
@@ -70,7 +71,7 @@ environment=#{rune_utf8}
     expect(settings[:environment]).to eq(rune_utf8)
   end
 
-  it "reparses configuration if configuration file is touched", :if => !Puppet.features.microsoft_windows? do
+  it "reparses configuration if configuration file is touched", :if => !Puppet::Util::Platform.windows? do
     config = tmpfile("config")
     define_settings(:main,
       :config => {

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'puppet/util/windows'
 
 describe Puppet::Util::Windows::ADSI::User,
-  :if => Puppet.features.microsoft_windows? do
+  :if => Puppet::Util::Platform.windows? do
 
   describe ".initialize" do
     it "cannot reference BUILTIN accounts like SYSTEM due to WinNT moniker limitations" do
@@ -13,7 +13,7 @@ describe Puppet::Util::Windows::ADSI::User,
       #     HRESULT error code:0x800708ad
       #           The user name could not be found.
       # Matching on error code alone is sufficient
-      expect { system.native_user }.to raise_error(/0x800708ad/)
+      expect { system.native_object }.to raise_error(/0x800708ad/)
     end
   end
 
@@ -59,7 +59,7 @@ describe Puppet::Util::Windows::ADSI::User,
 end
 
 describe Puppet::Util::Windows::ADSI::Group,
-  :if => Puppet.features.microsoft_windows? do
+  :if => Puppet::Util::Platform.windows? do
 
   let (:administrator_bytes) { [1, 2, 0, 0, 0, 0, 0, 5, 32, 0, 0, 0, 32, 2, 0, 0] }
   let (:administrators_principal) { Puppet::Util::Windows::SID::Principal.lookup_account_sid(administrator_bytes) }
@@ -81,6 +81,91 @@ describe Puppet::Util::Windows::ADSI::Group,
   end
 
   describe '.members' do
+    it 'should return a list of members resolvable with Puppet::Util::Windows::ADSI::Group.name_sid_hash' do
+      temp_groupname = "g#{SecureRandom.uuid}"
+      temp_username  = "u#{SecureRandom.uuid}"[0..12]
+
+      # select a virtual account that requires an authority to be able to resolve to SID
+      # the Dhcp service is chosen for no particular reason aside from it's a service available on all Windows versions
+      dhcp_virtualaccount = Puppet::Util::Windows::SID.name_to_principal('NT SERVICE\Dhcp')
+
+      # adding :SidTypeGroup as a group member will cause error in IAdsUser::Add
+      # adding :SidTypeDomain (such as S-1-5-80 / NT SERVICE or computer name) won't error
+      #   but also won't be returned as a group member
+      # uncertain how to obtain :SidTypeComputer (perhaps AD? the local machine is :SidTypeDomain)
+      users = [
+        # Use sid_to_name to get localized names of SIDs - BUILTIN, SYSTEM, NT AUTHORITY, Everyone are all localized
+        # :SidTypeWellKnownGroup
+        # SYSTEM is prefixed with the NT Authority authority, resolveable with or without authority
+        { :sid => 'S-1-5-18', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-5-18') },
+        # Everyone is not prefixed with an authority, resolveable with or without NT AUTHORITY authority
+        { :sid => 'S-1-1-0', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-1-0') },
+        # Dhcp service account is prefixed with NT SERVICE authority, requires authority to resolve SID
+        # behavior is similar to IIS APPPOOL\DefaultAppPool
+        { :sid => dhcp_virtualaccount.sid, :name => dhcp_virtualaccount.domain_account },
+
+        # :SidTypeAlias with authority component
+        # Administrators group is prefixed with BUILTIN authority, can be resolved with or without authority
+        { :sid => 'S-1-5-32-544', :name => Puppet::Util::Windows::SID.sid_to_name('S-1-5-32-544') },
+      ]
+
+      begin
+        # :SidTypeUser as user on localhost, can be resolved with or without authority prefix
+        user = Puppet::Util::Windows::ADSI::User.create(temp_username)
+        user.commit()
+        users.push({ :sid => user.sid.sid, :name => Puppet::Util::Windows::ADSI.computer_name + '\\' + temp_username })
+
+        # create a test group and add above 5 members by SID
+        group = described_class.create(temp_groupname)
+        group.commit()
+        group.set_members(users.map { |u| u[:sid]} )
+
+        # most importantly make sure that all name are convertible to SIDs
+        expect { described_class.name_sid_hash(group.members) }.to_not raise_error
+
+        # also verify the names returned are as expected
+        expected_usernames = users.map { |u| u[:name] }
+        expect(group.members.map(&:domain_account)).to eq(expected_usernames)
+      ensure
+        described_class.delete(temp_groupname) if described_class.exists?(temp_groupname)
+        Puppet::Util::Windows::ADSI::User.delete(temp_username) if Puppet::Util::Windows::ADSI::User.exists?(temp_username)
+      end
+    end
+
+    it 'should return a list of Principal objects even with unresolvable SIDs' do
+      members = [
+        # NULL SID is not localized
+        stub('WIN32OLE', {
+          :objectSID => [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+          :Name => 'NULL SID',
+          :ole_respond_to? => true,
+        }),
+        # unresolvable SID is a different story altogether
+        stub('WIN32OLE', {
+          # completely valid SID, but Name is just a stringified version
+          :objectSID => [1, 5, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 5, 113, 65, 218, 15, 127, 9, 57, 219, 4, 84, 126, 88, 4, 0, 0],
+          :Name => 'S-1-5-21-3661721861-956923663-2119435483-1112',
+          :ole_respond_to? => true,
+        })
+      ]
+
+      admins_name = Puppet::Util::Windows::SID.sid_to_name('S-1-5-32-544')
+      admins = Puppet::Util::Windows::ADSI::Group.new(admins_name)
+
+      # touch the native_object member to have it lazily loaded, so COM objects can be stubbed
+      admins.native_object
+      admins.native_object.stubs(:Members).returns(members)
+
+      # well-known NULL SID
+      expect(admins.members[0].sid).to eq('S-1-0-0')
+      expect(admins.members[0].account_type).to eq(:SidTypeWellKnownGroup)
+
+      # unresolvable SID
+      expect(admins.members[1].sid).to eq('S-1-5-21-3661721861-956923663-2119435483-1112')
+      expect(admins.members[1].account).to eq('S-1-5-21-3661721861-956923663-2119435483-1112 (unresolvable)')
+      expect(admins.members[1].account_type).to eq(:SidTypeUnknown)
+    end
+
     it 'should return a list of members with UTF-8 names' do
       begin
         original_codepage = Encoding.default_external
@@ -88,7 +173,7 @@ describe Puppet::Util::Windows::ADSI::Group,
 
         # lookup by English name Administrators is not OK on localized Windows
         admins = Puppet::Util::Windows::ADSI::Group.new(administrators_principal.account)
-        admins.members.each do |name|
+        admins.members.map(&:domain_account).each do |name|
           expect(name.encoding).to be(Encoding::UTF_8)
         end
       ensure