puppet 6.0.3-universal-darwin → 6.0.4-universal-darwin

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.0.3'
+  PUPPETVERSION = '6.0.4'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.0.2-87-gd2c9723\n"
+"Project-Id-Version: Puppet automation framework 6.0.3-60-g553a5ff\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2018-10-18 18:20+0000\n"
-"PO-Revision-Date: 2018-10-18 18:20+0000\n"
+"POT-Creation-Date: 2018-10-30 23:20+0000\n"
+"PO-Revision-Date: 2018-10-30 23:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -826,7 +826,7 @@ msgid "Delete a Puppet setting."
 msgstr ""
 
 #: ../lib/puppet/face/config.rb:213
-msgid "(<setting>"
+msgid "<setting>"
 msgstr ""
 
 #. TRANSLATORS 'main' is a specific section name and should not be translated
@@ -1552,7 +1552,7 @@ msgid "Diff is not supported on this platform"
 msgstr ""
 
 #: ../lib/puppet/file_bucket/dipper.rb:80
-msgid "Please provide a file or checksum do diff with"
+msgid "Please provide a file or checksum to diff with"
 msgstr ""
 
 #: ../lib/puppet/file_bucket/dipper.rb:96
@@ -5551,12 +5551,13 @@ msgstr ""
 msgid "The code loaded from %{source_ref} does not seem to be a Puppet 3x API function - no 'newfunction' call."
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:36
-msgid "The code loaded from %{source_ref} did not produce the expected 3x function info Hash when evaluated. Got '%{klass}'"
+#. TRANSLATORS - the word 'newfunction' shoud not be translated as it is a method name.
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:37
+msgid "Illegal legacy function definition! The code loaded from %{source_ref} did not return the result of calling 'newfunction'. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:39
-msgid "The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got %{created_name}"
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:40
+msgid "The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got '%{created_name}'"
 msgstr ""
 
 #: ../lib/puppet/pops/loader/task_instantiator.rb:27
@@ -6259,7 +6260,7 @@ msgstr ""
 msgid "aix.object_info(): Could not find %{resource}[%{name}]"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:180 ../lib/puppet/provider/nameservice/directoryservice.rb:423
+#: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:180 ../lib/puppet/provider/nameservice/directoryservice.rb:421
 msgid "Could not create %{resource} %{name}: %{detail}"
 msgstr ""
 
@@ -6323,7 +6324,7 @@ msgstr ""
 msgid "No AIX group exists with a group name or gid of %{group}!"
 msgstr ""
 
-#: ../lib/puppet/provider/group/groupadd.rb:13 ../lib/puppet/provider/group/pw.rb:17
+#: ../lib/puppet/provider/group/groupadd.rb:13 ../lib/puppet/provider/group/pw.rb:14
 msgid "GID must be an integer"
 msgstr ""
 
@@ -6356,7 +6357,7 @@ msgstr ""
 msgid "autogen_id() does not support auto generation of id for resource type %{resource_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:169 ../lib/puppet/provider/nameservice/directoryservice.rb:378
+#: ../lib/puppet/provider/nameservice.rb:169 ../lib/puppet/provider/nameservice/directoryservice.rb:376
 msgid "already exists"
 msgstr ""
 
@@ -6368,7 +6369,7 @@ msgstr ""
 msgid "Nameservice command must be an array"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:282 ../lib/puppet/provider/nameservice/directoryservice.rb:337 ../lib/puppet/provider/nameservice/directoryservice.rb:368
+#: ../lib/puppet/provider/nameservice.rb:282 ../lib/puppet/provider/nameservice/directoryservice.rb:337 ../lib/puppet/provider/nameservice/directoryservice.rb:366
 msgid "Could not set %{param} on %{resource}[%{name}]: %{detail}"
 msgstr ""
 
@@ -6393,15 +6394,15 @@ msgstr ""
 msgid "Invalid id_type %{id_type}. Only 'uid' and 'gid' supported"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:395
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:393
 msgid "Could not set GeneratedUID for %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:443
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:441
 msgid "Could not remove %{member} from group: %{resource}, %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:457
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:455
 msgid "Could not add %{new_member} to group: %{name}, %{detail}"
 msgstr ""
 
@@ -8128,26 +8129,14 @@ msgstr ""
 msgid "Could not create %{type} filebucket: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/group.rb:61
+#: ../lib/puppet/type/group.rb:60
 msgid "GID cannot be deleted"
 msgstr ""
 
-#: ../lib/puppet/type/group.rb:73
+#: ../lib/puppet/type/group.rb:72
 msgid "Invalid GID %{gid}"
 msgstr ""
 
-#: ../lib/puppet/type/group.rb:92
-msgid "The members property must be specified as either an array of strings, or as a single string consisting of a comma-separated list of members"
-msgstr ""
-
-#: ../lib/puppet/type/group.rb:96
-msgid "User names must be provided, not UID numbers."
-msgstr ""
-
-#: ../lib/puppet/type/group.rb:100
-msgid "User names must not be empty. If you want to specify \"no users\" pass an empty array"
-msgstr ""
-
 #: ../lib/puppet/type/package.rb:114 ../lib/puppet/type/package.rb:128
 msgid "Could not update: %{detail}"
 msgstr ""
@@ -8396,15 +8385,15 @@ msgstr ""
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:563
+#: ../lib/puppet/util.rb:567
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:567
+#: ../lib/puppet/util.rb:571
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
-#: ../lib/puppet/util.rb:638
+#: ../lib/puppet/util.rb:642
 msgid "Is a directory: %{directory}"
 msgstr ""
 
@@ -8781,23 +8770,23 @@ msgstr ""
 msgid "Writing %{path} to RAM"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:178
+#: ../lib/puppet/util/filetype.rb:184
 msgid "Could not retrieve user %{user}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:233 ../lib/puppet/util/filetype.rb:276
+#: ../lib/puppet/util/filetype.rb:200 ../lib/puppet/util/filetype.rb:249 ../lib/puppet/util/filetype.rb:292
 msgid "User %{path} not authorized to use cron"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:235 ../lib/puppet/util/filetype.rb:278
+#: ../lib/puppet/util/filetype.rb:202 ../lib/puppet/util/filetype.rb:251 ../lib/puppet/util/filetype.rb:294
 msgid "Could not read crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:243 ../lib/puppet/util/filetype.rb:286
+#: ../lib/puppet/util/filetype.rb:259 ../lib/puppet/util/filetype.rb:302
 msgid "Could not remove crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:258 ../lib/puppet/util/filetype.rb:302
+#: ../lib/puppet/util/filetype.rb:274 ../lib/puppet/util/filetype.rb:318
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
@@ -8928,7 +8917,7 @@ msgstr ""
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:100
+#: ../lib/puppet/util/log/destinations.rb:101
 msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
 msgstr ""
 

data/man/man5/puppet.conf.5

@@ -868,7 +868,7 @@ The time to wait for data to be read from an HTTP connection\. If nothing is rea
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: Puppet/6\.0\.3 Ruby/2\.4\.1\-p111 (x86_64\-linux)
+\fIDefault\fR: Puppet/6\.0\.4 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

@@ -25,4 +25,4 @@ Specialized:
 catalog Compile, save, view, and convert catalogs\. 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\. node View and manage node definitions\. parser Interact directly with the parser\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
 .
 .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 v6\.0\.3
+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 v6\.0\.4

data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/bad_func_load.rb

@@ -0,0 +1,11 @@
+module Puppet::Parser::Functions
+  newfunction(:bad_func_load, :type => :rvalue, :doc => <<-EOS
+    A function using the 3x API
+  EOS
+  ) do |arguments|
+    "the returned value"
+  end
+
+  def method_here_is_illegal()
+  end
+end

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/loaders/loaders_spec.rb

@@ -423,6 +423,24 @@ 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 with code outside body is reported as an error" do
+      expect { loader.load_typed(typed_name(:function, 'bad_func_load')) }.to raise_error(/Illegal legacy function definition/)
+    end
+  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)) }

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::Util:
       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::Util:
       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::Util:
         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::Util:
           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::Util:
 
         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::Util:
         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::Util:
         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::Util:
 
         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::Util:
         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::Util:
         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::Util:
           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::Util:
   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::Util:
       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::Util:
       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