puppet 5.5.7-universal-darwin → 5.5.8-universal-darwin

data/man/man5/puppet.conf.5

@@ -938,7 +938,7 @@ The time to wait for one block to be read from an HTTP connection\. If nothing i
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: Puppet/5\.5\.7 Ruby/2\.4\.1\-p111 (x86_64\-linux)
+\fIDefault\fR: Puppet/5\.5\.8 Ruby/2\.4\.1\-p111 (x86_64\-linux)
 .
 .IP "" 0
 .

data/man/man8/puppet-config.8

@@ -47,7 +47,7 @@ Less commonly used is the \'user\' section, which affects puppet apply\. Any oth
 \fBSYNOPSIS\fR
 .
 .IP
-puppet config delete [\-\-section SECTION_NAME] (\fIsetting\fR
+puppet config delete [\-\-section SECTION_NAME] \fIsetting\fR
 .
 .IP
 \fBDESCRIPTION\fR

data/man/man8/puppet.8

@@ -16,4 +16,4 @@ Available subcommands:
 agent The puppet agent daemon apply Apply Puppet manifests locally ca Local Puppet Certificate Authority management\. (Deprecated) catalog Compile, save, view, and convert catalogs\. cert Manage certificates and requests (Deprecated) certificate Provide access to the CA for certificate management\. (Deprecated) certificate_request Manage certificate requests\. (Deprecated) certificate_revocation_list Manage the list of revoked certificates\. (Deprecated) config Interact with Puppet\'s settings\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. help Display Puppet help\. key Create, save, and remove certificate keys\. (Deprecated) lookup Interactive Hiera lookup man Display Puppet manual pages\. (Deprecated) master The puppet master daemon module Creates, installs and searches for modules on the Puppet Forge\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. report Create, display, and submit reports\. resource The resource abstraction layer shell script Run a puppet manifests as a script without compiling a catalog status View puppet server status\. (Deprecated)
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.5\.7
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.5\.8

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

@@ -118,8 +118,7 @@ describe Puppet::Util::Windows::ADSI::Group,
         # create a test group and add above 5 members by SID
         group = described_class.create(temp_groupname)
         group.commit()
-        members = users.map { |u| u[:sid] }
-        group.set_members(members.join(','))
+        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

data/spec/unit/pops/evaluator/evaluating_parser_spec.rb

@@ -1102,15 +1102,15 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
       end
 
       it 'does not map :undef to empty string in arrays' do
-        Puppet::Parser::Functions.newfunction("bazinga", :type => :rvalue) { |args| args[0][0] == :undef}
-        expect(parser.evaluate_string(scope, "$a = {} $b = [$a[nope]] bazinga($b)", __FILE__)).to eq(true)
-        expect(parser.evaluate_string(scope, "bazinga([undef])", __FILE__)).to eq(true)
+        Puppet::Parser::Functions.newfunction("bazinga", :type => :rvalue) { |args| args[0][0] }
+        expect(parser.evaluate_string(scope, "$a = {} $b = [$a[nope]] bazinga($b)", __FILE__)).to eq(:undef)
+        expect(parser.evaluate_string(scope, "bazinga([undef])", __FILE__)).to eq(:undef)
       end
 
       it 'does not map :undef to empty string in hashes' do
-        Puppet::Parser::Functions.newfunction("bazinga", :type => :rvalue) { |args| args[0]['a'] == :undef }
-        expect(parser.evaluate_string(scope, "$a = {} $b = {a => $a[nope]} bazinga($b)", __FILE__)).to eq(true)
-        expect(parser.evaluate_string(scope, "bazinga({a => undef})", __FILE__)).to eq(true)
+        Puppet::Parser::Functions.newfunction("bazinga", :type => :rvalue) { |args| args[0]['a'] }
+        expect(parser.evaluate_string(scope, "$a = {} $b = {a => $a[nope]} bazinga($b)", __FILE__)).to eq(:undef)
+        expect(parser.evaluate_string(scope, "bazinga({a => undef})", __FILE__)).to eq(:undef)
       end
     end
   end

data/spec/unit/pops/loaders/loaders_spec.rb

@@ -271,10 +271,7 @@ describe 'loaders' do
           File.stubs(:read).with(usee_metadata_path, {:encoding => 'utf-8'}).raises Errno::ENOENT
           File.stubs(:read).with(usee2_metadata_path, {:encoding => 'utf-8'}).raises Errno::ENOENT
           Puppet[:code] = "$case_number = #{case_number}\ninclude ::user"
-          catalog = compiler.compile
-          resource = catalog.resource('Notify', "case_#{case_number}")
-          expect(resource).not_to be_nil
-          expect(resource['message']).to eq(desc[:expects])
+          expect { compiler.compile }.to raise_error(Puppet::Error, /Unknown function/)
         end
       end
     end
@@ -414,35 +411,6 @@ describe 'loaders' do
 
   end
 
-  context 'when causing a 3x load followed by a 4x load' do
-    let(:env) { environment_for(mix_4x_and_3x_functions) }
-    let(:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new("test", :environment => env)) }
-    let(:scope) { compiler.topscope }
-    let(:loader) { compiler.loaders.private_loader_for_module('user') }
-
-
-    before(:each) do
-      Puppet.push_context(:current_environment => scope.environment, :global_scope => scope, :loaders => compiler.loaders)
-    end
-    after(:each) do
-      Puppet.pop_context
-    end
-
-    it 'a 3x function is loaded once' do
-      # create a 3x function that when called will do a load of "callee_ws"
-      Puppet::Parser::Functions::newfunction(:callee, :type => :rvalue, :arity => 1) do |args|
-        function_callee_ws(['passed in scope'])
-      end
-      Puppet.expects(:warning).with(any_parameters).never
-      scope['passed_in_scope'] = 'value'
-      function = loader.load_typed(typed_name(:function, 'callee')).value
-      expect(function.call(scope, 'passed in scope')).to eql("usee::callee_ws() got 'value'")
-
-      function = loader.load_typed(typed_name(:function, 'callee_ws')).value
-      expect(function.call(scope, 'passed in scope')).to eql("usee::callee_ws() got 'value'")
-    end
-  end
-
   context 'loading' do
     let(:env_name) { 'testenv' }
     let(:environments_dir) { Puppet[:environmentpath] }
@@ -609,22 +577,22 @@ describe 'loaders' do
         expect(type).to be_a(Puppet::Pops::Types::PIntegerType)
       end
 
-      it 'will resolve implicit transitive dependencies, a -> c' do
+      it 'will not resolve implicit transitive dependencies, a -> c' do
         type = Puppet::Pops::Types::TypeParser.singleton.parse('A::N', Puppet::Pops::Loaders.find_loader('a'))
         expect(type).to be_a(Puppet::Pops::Types::PTypeAliasType)
         expect(type.name).to eql('A::N')
         type = type.resolved_type
-        expect(type).to be_a(Puppet::Pops::Types::PTypeAliasType)
-        expect(type.name).to eql('C::C')
+        expect(type).to be_a(Puppet::Pops::Types::PTypeReferenceType)
+        expect(type.type_string).to eql('C::C')
       end
 
-      it 'will resolve reverse dependencies, b -> a' do
+      it 'will not resolve reverse dependencies, b -> a' do
         type = Puppet::Pops::Types::TypeParser.singleton.parse('B::X', Puppet::Pops::Loaders.find_loader('b'))
         expect(type).to be_a(Puppet::Pops::Types::PTypeAliasType)
         expect(type.name).to eql('B::X')
         type = type.resolved_type
-        expect(type).to be_a(Puppet::Pops::Types::PTypeAliasType)
-        expect(type.name).to eql('A::A')
+        expect(type).to be_a(Puppet::Pops::Types::PTypeReferenceType)
+        expect(type.type_string).to eql('A::A')
       end
 
       it 'does not resolve init_typeset when more qualified type is found in typeset' do

data/spec/unit/provider/cron/parsed_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#!/usr/bin/env ruby
 
 require 'spec_helper'
 
@@ -209,20 +209,18 @@ describe Puppet::Type.type(:cron).provider(:crontab) do
       end
 
       it "should contain no resources for a user who has no crontab" do
-        # `crontab...` does only capture stdout here. On vixie-cron-4.1
-        # STDERR shows "no crontab for foobar" but stderr is ignored as
-        # well as the exitcode.
-        described_class.target_object('foobar').expects(:`).with('crontab -u foobar -l 2>/dev/null').returns ""
+        Puppet::Util::Execution.expects(:execute)
+          .with('crontab -u foobar -l', { failonfail: true, combine: true })
+          .returns("")
         expect(described_class.instances.select { |resource|
           resource.get('target') == 'foobar'
         }).to be_empty
       end
 
       it "should contain no resources for a user who is absent" do
-        # `crontab...` does only capture stdout. On vixie-cron-4.1
-        # STDERR shows "crontab:  user `foobar' unknown" but stderr is
-        # ignored as well as the exitcode
-        described_class.target_object('foobar').expects(:`).with('crontab -u foobar -l 2>/dev/null').returns ""
+        Puppet::Util::Execution.expects(:execute)
+          .with('crontab -u foobar -l', { failonfail: true, combine: true })
+          .returns("")
         expect(described_class.instances.select { |resource|
           resource.get('target') == 'foobar'
         }).to be_empty

data/spec/unit/provider/group/aix_spec.rb

@@ -54,4 +54,37 @@ describe 'Puppet::Type::Group::Provider::Aix' do
       expect(provider_class.find(1, ia_module_args)).to eql(expected_group)
     end
   end
+
+  describe '.users_to_members' do
+    it 'converts the users attribute to the members property' do
+      expect(provider_class.users_to_members('foo,bar'))
+        .to eql(['foo', 'bar'])
+    end
+  end
+
+  describe '.members_to_users' do
+    context 'when auth_membership == true' do
+      before(:each) do
+        resource[:auth_membership] = true
+      end
+
+      it 'returns only the passed-in members' do
+        expect(provider_class.members_to_users(provider, ['user1', 'user2']))
+          .to eql('user1,user2')
+      end
+    end
+
+    context 'when auth_membership == false' do
+      before(:each) do
+        resource[:auth_membership] = false
+
+        provider.stubs(:members).returns(['user3', 'user1'])
+      end
+
+      it 'adds the passed-in members to the current list of members, filtering out any duplicates' do
+        expect(provider_class.members_to_users(provider, ['user1', 'user2']))
+          .to eql('user1,user2,user3')
+      end
+    end
+  end
 end

data/spec/unit/provider/group/pw_spec.rb

@@ -71,5 +71,11 @@ describe provider_class do
       provider.expects(:execute).with(all_of(includes("-M"), includes("user2")), has_entry(:custom_environment, {}))
       provider.members = "user2"
     end
+
+    it "should use -M with all the given users when the members property is changed with an array" do
+      resource[:members] = ["user1", "user2"]
+      provider.expects(:execute).with(all_of(includes("-M"), includes("user3,user4")), has_entry(:custom_environment, {}))
+      provider.members = ["user3", "user4"]
+    end
   end
 end

data/spec/unit/provider/group/windows_adsi_spec.rb

@@ -50,7 +50,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
       it "should return true for same lists of members" do
         current = [
           'user1',
-          'user2'
+          'user2',
         ]
         expect(provider.members_insync?(current, ['user1', 'user2'])).to be_truthy
       end
@@ -58,7 +58,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
       it "should return true for same lists of unordered members" do
         current = [
           'user1',
-          'user2'
+          'user2',
         ]
         expect(provider.members_insync?(current, ['user2', 'user1'])).to be_truthy
       end
@@ -67,7 +67,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         current = [
           'user1',
           'user2',
-          'user2'
+          'user2',
         ]
         expect(provider.members_insync?(current, ['user2', 'user1', 'user1'])).to be_truthy
       end
@@ -93,7 +93,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
           current = [
             'user1',
             'user2',
-            'user3'
+            'user3',
           ]
           expect(provider.members_insync?(current, ['user3', 'user1', 'user2'])).to be_truthy
         end
@@ -104,21 +104,21 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
 
         it "should return false when should is nil" do
           current = [
-            'user1'
+            'user1',
           ]
           expect(provider.members_insync?(current, nil)).to be_falsey
         end
 
         it "should return false when current contains different users than should" do
           current = [
-            'user1'
+            'user1',
           ]
           expect(provider.members_insync?(current, ['user2'])).to be_falsey
         end
 
         it "should return false when current contains members and should is empty" do
           current = [
-            'user1'
+            'user1',
           ]
           expect(provider.members_insync?(current, [])).to be_falsey
         end
@@ -130,7 +130,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         it "should return false when should user(s) are not the only items in the current" do
           current = [
             'user1',
-            'user2'
+            'user2',
           ]
           expect(provider.members_insync?(current, ['user1'])).to be_falsey
         end
@@ -138,7 +138,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         it "should return false when current user(s) is not empty and should is an empty list" do
           current = [
             'user1',
-            'user2'
+            'user2',
           ]
           expect(provider.members_insync?(current, [])).to be_falsey
         end
@@ -156,21 +156,21 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
 
         it "should return true when should is nil" do
           current = [
-            'user1'
+            'user1',
           ]
           expect(provider.members_insync?(current, nil)).to be_truthy
         end
 
         it "should return false when current contains different users than should" do
           current = [
-            'user1'
+            'user1',
           ]
           expect(provider.members_insync?(current, ['user2'])).to be_falsey
         end
 
         it "should return true when current contains members and should is empty" do
           current = [
-            'user1'
+            'user1',
           ]
           expect(provider.members_insync?(current, [])).to be_truthy
         end
@@ -182,7 +182,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         it "should return true when current user(s) contains at least the should list" do
           current = [
             'user1',
-            'user2'
+            'user2',
           ]
           expect(provider.members_insync?(current, ['user1'])).to be_truthy
         end
@@ -190,7 +190,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
         it "should return true when current user(s) is not empty and should is an empty list" do
           current = [
             'user1',
-            'user2'
+            'user2',
           ]
           expect(provider.members_insync?(current, [])).to be_truthy
         end
@@ -199,7 +199,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
           current = [
             'user3',
             'user1',
-            'user2'
+            'user2',
           ]
           expect(provider.members_insync?(current, ['user2','user1'])).to be_truthy
         end
@@ -232,20 +232,31 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
   end
 
   describe "when managing members" do
+    let(:user1) { stub(:account => 'user1', :domain => '.', :sid => 'user1sid') }
+    let(:user2) { stub(:account => 'user2', :domain => '.', :sid => 'user2sid') }
+    let(:user3) { stub(:account => 'user3', :domain => '.', :sid => 'user3sid') }
+
     before :each do
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user1').returns(user1)
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user2').returns(user2)
+      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user3').returns(user3)
+
       resource[:auth_membership] = true
     end
 
     it "should be able to provide a list of members" do
-      provider.group.stubs(:members).returns ['user1', 'user2', 'user3']
-      Puppet::Util::Windows::ADSI::User.stubs(:name_sid_hash)
-        .with(provider.group.members)
-        .returns({ 'user1' => '', 'user2' => '', 'user3' => '' })
+      provider.group.stubs(:members).returns [
+        'user1',
+        'user2',
+        'user3',
+      ]
 
-      expect(provider.members).to match_array(['user1', 'user2', 'user3'])
+      expect(provider.members).to match_array([user1.sid, user2.sid, user3.sid])
     end
 
     it "should be able to set group members" do
+      provider.group.stubs(:members).returns ['user1', 'user2']
+
       member_sids = [
         stub(:account => 'user1', :domain => 'testcomputername', :sid => 1),
         stub(:account => 'user2', :domain => 'testcomputername', :sid => 2),
@@ -260,7 +271,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
       provider.group.expects(:remove_member_sids).with(member_sids[0])
       provider.group.expects(:add_member_sids).with(member_sids[2])
 
-      provider.members = 'user2,user3'
+      provider.members = ['user2', 'user3']
     end
   end
 
@@ -269,13 +280,12 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
       resource[:members] = ['user1', 'user2']
 
       group = stub 'group'
-      group.stubs(:members).returns([])
       Puppet::Util::Windows::ADSI::Group.expects(:create).with('testers').returns group
 
       create = sequence('create')
       group.expects(:commit).in_sequence(create)
       # due to PUP-1967, defaultto false will set the default to nil
-      group.expects(:set_members).with('user1,user2', nil).in_sequence(create)
+      group.expects(:set_members).with(['user1', 'user2'], nil).in_sequence(create)
 
       provider.create
     end

data/spec/unit/provider/nameservice/directoryservice_spec.rb

@@ -17,13 +17,13 @@ end
 
     it "[#6009] should handle nested arrays of members" do
       current = ["foo", "bar", "baz"]
-      desired = "foo,quux,qorp"
+      desired = ["foo", ["quux"], "qorp"]
       group   = 'example'
 
       @resource.stubs(:[]).with(:name).returns(group)
       @resource.stubs(:[]).with(:auth_membership).returns(true)
       @provider.instance_variable_set(:@property_value_cache_hash,
-                                      { :members => current.join(',') })
+                                      { :members => current })
 
       %w{bar baz}.each do |del|
         @provider.expects(:execute).once.

data/spec/unit/provider/package/dnf_spec.rb

@@ -23,6 +23,21 @@ context 'default' do
       expect(provider_class).to be_default
     end
   end
+
+  it "should not be the default provider on rhel7" do
+      Facter.stubs(:value).with(:osfamily).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7")
+      expect(provider_class).to_not be_default
+  end
+
+  it "should be the default provider on rhel8" do
+      Facter.stubs(:value).with(:osfamily).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+      Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8")
+      expect(provider_class).to be_default
+  end
+
 end
 
 describe provider_class do

data/spec/unit/provider/user/useradd_spec.rb

@@ -138,10 +138,10 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         provider.create
       end
 
-      it "should not use -e with luseradd, should call lusermod with -e after luseradd when expiry is set" do
+      it "should not use -e with luseradd, should call usermod with -e after luseradd when expiry is set" do
         resource[:expiry] = '2038-01-24'
         provider.expects(:execute).with(all_of(includes('/usr/sbin/luseradd'), Not(includes('-e'))), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.expects(:execute).with(all_of(includes('/usr/sbin/lusermod'), includes('-e')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        provider.expects(:execute).with(all_of(includes('/usr/sbin/usermod'), includes('-e')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
         provider.create
       end