puppet 4.1.0 → 5.0.0

data/lib/puppet/provider/group/aix.rb

@@ -33,7 +33,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   # Valid attributes to be managed by this provider.
   # It is a list with of hash
   #  :aix_attr      AIX command attribute name
-  #  :puppet_prop   Puppet propertie name
+  #  :puppet_prop   Puppet property name
   #  :to            Method to adapt puppet property to aix command value. Optional.
   #  :from          Method to adapt aix command value to puppet property. Optional
   self.attribute_mapping = [
@@ -94,11 +94,11 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
 
 
   #--------------
-  # Overwrite get_arguments to add the attributes arguments
+  # Overwrite get_arguments to add the attributes' arguments
   def get_arguments(key, value, mapping, objectinfo)
-    # In the case of attributes, return a list of key=vlaue
+    # In the case of attributes, return a list of key=value
     if key == :attributes
-      raise Puppet::Error, "Attributes must be a list of pairs key=value on #{@resource.class.name}[#{@resource.name}]" \
+      raise Puppet::Error, _("Attributes must be a list of pairs key=value on %{resource}[%{name}]") % { resource: @resource.class.name, name: @resource.name } \
         unless value and value.is_a? Hash
       return value.select { |k,v| true }.map { |pair| pair.join("=") }
     end
@@ -106,7 +106,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   end
 
   def filter_attributes(hash)
-    # Return only not managed attributtes.
+    # Return only not managed attributes.
     hash.select {
         |k,v| !self.class.attribute_mapping_from.include?(k) and
                 !self.class.attribute_ignore.include?(k)
@@ -127,7 +127,7 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
       begin
         execute(cmd)
       rescue Puppet::ExecutionFailure  => detail
-        raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
+        raise Puppet::Error, _("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
       end
     end
   end

data/lib/puppet/provider/group/directoryservice.rb

@@ -9,4 +9,14 @@ Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider
   confine :operatingsystem => :darwin
   defaultfor :operatingsystem => :darwin
   has_feature :manages_members
+
+  def members_insync?(current, should)
+    return false unless current
+    if current == :absent
+      return should.empty?
+    else
+      return current.sort.uniq == should.sort.uniq
+    end
+  end
+
 end

data/lib/puppet/provider/group/groupadd.rb

@@ -10,7 +10,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   has_feature :system_groups unless %w{HP-UX Solaris}.include? Facter.value(:operatingsystem)
 
-  verify :gid, "GID must be an integer" do |value|
+  verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
   end
 
@@ -56,7 +56,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     # using both useradd and luseradd
     if not @resource.allowdupe? and @resource.forcelocal?
        if @resource.should(:gid) and findgroup('gid', @resource.should(:gid).to_s)
-           raise(Puppet::Error, "GID #{@resource.should(:gid).to_s} already exists, use allowdupe to force group creation")
+           raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
        end
     elsif @resource.allowdupe? and not @resource.forcelocal?
        return ["-o"]

data/lib/puppet/provider/group/pw.rb

@@ -7,10 +7,11 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
   has_features :manages_members
 
   defaultfor :operatingsystem => [:freebsd, :dragonfly]
+  confine    :operatingsystem => [:freebsd, :dragonfly]
 
   options :members, :flag => "-M", :method => :mem
 
-  verify :gid, "GID must be an integer" do |value|
+  verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
   end
 

data/lib/puppet/provider/group/windows_adsi.rb

@@ -27,10 +27,13 @@ Puppet::Type.type(:group).provide :windows_adsi do
     current_users = Puppet::Util::Windows::ADSI::Group.name_sid_hash(current)
     specified_users = Puppet::Util::Windows::ADSI::Group.name_sid_hash(should)
 
+    current_sids = current_users.keys.to_a
+    specified_sids = specified_users.keys.to_a
+
     if @resource[:auth_membership]
-      current_users == specified_users
+      current_sids.sort == specified_sids.sort
     else
-      (specified_users.keys.to_a & current_users.keys.to_a) == specified_users.keys.to_a
+      (specified_sids & current_sids) == specified_sids
     end
   end
 
@@ -38,17 +41,26 @@ Puppet::Type.type(:group).provide :windows_adsi do
     return '' if users.nil? or !users.kind_of?(Array)
     users = users.map do |user_name|
       sid = Puppet::Util::Windows::SID.name_to_sid_object(user_name)
+      if !sid
+        resource.debug("#{user_name} (unresolvable to SID)")
+        next user_name
+      end
+
       if sid.account =~ /\\/
         account, _ = Puppet::Util::Windows::ADSI::User.parse_name(sid.account)
       else
         account = sid.account
       end
-      resource.debug("#{sid.domain}\\#{account} (#{sid.to_s})")
+      resource.debug("#{sid.domain}\\#{account} (#{sid.sid})")
       "#{sid.domain}\\#{account}"
     end
     return users.join(',')
   end
 
+  def member_valid?(user_name)
+    ! Puppet::Util::Windows::SID.name_to_sid_object(user_name).nil?
+  end
+
   def group
     @group ||= Puppet::Util::Windows::ADSI::Group.new(@resource[:name])
   end

data/lib/puppet/provider/host/parsed.rb

@@ -30,7 +30,7 @@ Puppet::Type.type(:host).provide(:parsed,:parent => Puppet::Provider::ParsedFile
     },
     :to_line  => proc { |hash|
       [:ip, :name].each do |n|
-        raise ArgumentError, "#{n} is a required attribute for hosts" unless hash[n] and hash[n] != :absent
+        raise ArgumentError, _("%{attr} is a required attribute for hosts") % { attr: n } unless hash[n] and hash[n] != :absent
       end
       str = "#{hash[:ip]}\t#{hash[:name]}"
       if hash.include? :host_aliases and !hash[:host_aliases].nil? and hash[:host_aliases] != :absent

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -1,5 +1,5 @@
 require 'facter'
-require 'plist'
+require 'puppet/util/plist' if Puppet.features.cfpropertylist?
 require 'puppet'
 require 'tempfile'
 
@@ -12,6 +12,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
   commands :security => "/usr/bin/security"
 
   confine :operatingsystem => :darwin
+  confine :feature         => :cfpropertylist
 
   defaultfor :operatingsystem => :darwin
 
@@ -50,8 +51,8 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     end
 
     def populate_rules_rights
-      auth_plist = Plist::parse_xml(AuthDB)
-      raise Puppet::Error.new("Cannot parse: #{AuthDB}") if not auth_plist
+      auth_plist = Puppet::Util::Plist.parse_plist(AuthDB)
+      raise Puppet::Error.new(_("Cannot parse: %{auth}") % { auth: AuthDB }) if not auth_plist
       self.rights = auth_plist["rights"].dup
       self.rules = auth_plist["rules"].dup
       self.parsed_auth_db = self.rights.dup
@@ -92,7 +93,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     when :rule
       destroy_rule
     else
-      raise Puppet::Error.new("Must specify auth_type when destroying.")
+      raise Puppet::Error.new(_("Must specify auth_type when destroying."))
     end
   end
 
@@ -110,7 +111,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       when :rule
         flush_rule
       else
-        raise Puppet::Error.new("flush requested for unknown type.")
+        raise Puppet::Error.new(_("flush requested for unknown type."))
       end
       @property_hash.clear
     end
@@ -124,14 +125,14 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
   end
 
   def destroy_rule
-    authdb = Plist::parse_xml(AuthDB)
+    authdb = Puppet::Util::Plist.parse_plist(AuthDB)
     authdb_rules = authdb["rules"].dup
     if authdb_rules[resource[:name]]
       begin
         authdb["rules"].delete(resource[:name])
-        Plist::Emit.save_plist(authdb, AuthDB)
+        Puppet::Util::Plist.write_plist_file(authdb, AuthDB)
       rescue Errno::EACCES => e
-        raise Puppet::Error.new("Error saving #{AuthDB}: #{e}", e)
+        raise Puppet::Error.new(_("Error saving %{auth}: %{error}") % { auth: AuthDB, error: e }, e)
       end
     end
   end
@@ -140,11 +141,11 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     # first we re-read the right just to make sure we're in sync for
     # values that weren't specified in the manifest. As we're supplying
     # the whole plist when specifying the right it seems safest to be
-    # paranoid given the low cost of quering the db once more.
+    # paranoid given the low cost of querying the db once more.
     cmds = []
     cmds << :security << "authorizationdb" << "read" << resource[:name]
     output = execute(cmds, :failonfail => false, :combine => false)
-    current_values = Plist::parse_xml(output)
+    current_values = Puppet::Util::Plist.parse_plist(output)
     current_values ||= {}
     specified_values = convert_plist_to_native_attributes(@property_hash)
 
@@ -155,7 +156,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
   end
 
   def flush_rule
-    authdb = Plist::parse_xml(AuthDB)
+    authdb = Puppet::Util::Plist.parse_plist(AuthDB)
     authdb_rules = authdb["rules"].dup
     current_values = {}
     current_values = authdb_rules[resource[:name]] if authdb_rules[resource[:name]]
@@ -171,12 +172,12 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     values = convert_plist_to_native_attributes(values)
     tmp = Tempfile.new('puppet_macauthorization')
     begin
-      Plist::Emit.save_plist(values, tmp.path)
+      Puppet::Util::Plist.write_plist_file(values, tmp.path)
       cmds = []
       cmds << :security << "authorizationdb" << "write" << name
       execute(cmds, :failonfail => false, :combine => false, :stdinfile => tmp.path.to_s)
     rescue Errno::EACCES => e
-      raise Puppet::Error.new("Cannot save right to #{tmp.path}: #{e}", e)
+      raise Puppet::Error.new(_("Cannot save right to %{path}: %{error}") % { path: tmp.path, error: e }, e)
     ensure
       tmp.close
       tmp.unlink
@@ -189,13 +190,13 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
     # support modifying rules at all so we have to twiddle the whole
     # plist... :( See Apple Bug #6386000
     values = convert_plist_to_native_attributes(values)
-    authdb = Plist::parse_xml(AuthDB)
+    authdb = Puppet::Util::Plist.parse_plist(AuthDB)
     authdb["rules"][name] = values
 
     begin
-      Plist::Emit.save_plist(authdb, AuthDB)
+      Puppet::Util::Plist.write_plist_file(authdb, AuthDB)
     rescue
-      raise Puppet::Error.new("Error writing to: #{AuthDB}")
+      raise Puppet::Error.new(_("Error writing to: %{auth_db}") % { auth_db: AuthDB })
     end
   end
 
@@ -228,7 +229,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
 
   def retrieve_value(resource_name, attribute)
     # We set boolean values to symbols when retrieving values
-    raise Puppet::Error.new("Cannot find #{resource_name} in auth db") if not self.class.parsed_auth_db.has_key?(resource_name)
+    raise Puppet::Error.new(_("Cannot find %{resource_name} in auth db") % { resource_name: resource_name }) if not self.class.parsed_auth_db.has_key?(resource_name)
 
     if PuppetToNativeAttributeMap.has_key?(attribute)
       native_attribute = PuppetToNativeAttributeMap[attribute]
@@ -283,10 +284,10 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
       elsif self.class.rules.has_key?(resource[:name])
         return :rule
       else
-        raise Puppet::Error.new("#{resource[:name]} is unknown type.")
+        raise Puppet::Error.new(_("%{resource} is unknown type.") % { resource: resource[:name] })
       end
     else
-      raise Puppet::Error.new("auth_type required for new resources.")
+      raise Puppet::Error.new(_("auth_type required for new resources."))
     end
   end
 

data/lib/puppet/provider/mailalias/aliases.rb

@@ -34,7 +34,7 @@ Puppet::Type.type(:mailalias).provide(
       if record[:recipient]
 	dest = record[:recipient].collect do |d|
 	  # Quote aliases that have non-alpha chars
-	  if d =~ /[^-\w@.]/
+	  if d =~ /[^-+\w@.]/
 	    '"%s"' % d
 	  else
 	    d

data/lib/puppet/provider/maillist/mailman.rb

@@ -52,12 +52,12 @@ Puppet::Type.type(:maillist).provide(:mailman) do
     if val = @resource[:admin]
       args << val
     else
-      raise ArgumentError, "Mailman lists require an administrator email address"
+      raise ArgumentError, _("Mailman lists require an administrator email address")
     end
     if val = @resource[:password]
       args << val
     else
-      raise ArgumentError, "Mailman lists require an administrator password"
+      raise ArgumentError, _("Mailman lists require an administrator password")
     end
     newlist(*args)
   end

data/lib/puppet/provider/mcx/mcxcontent.rb

@@ -36,7 +36,7 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
 
   def self.instances
     mcx_list = []
-    TypeMap.keys.each do |ds_type|
+    TypeMap.each_key do |ds_type|
       ds_path = "/Local/Default/#{TypeMap[ds_type]}"
       output = dscl 'localhost', '-list', ds_path
       member_list = output.split
@@ -116,7 +116,8 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
       dscl 'localhost', '-mcxdelete', ds_path
     end
 
-    tmp = Tempfile.new('puppet_mcx')
+    # val being passed in is resource[:content] which should be UTF-8
+    tmp = Tempfile.new('puppet_mcx', :encoding => Encoding::UTF_8)
     begin
       tmp << val
       tmp.flush
@@ -133,13 +134,13 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
     ds_type = name.split('/')[1]
     unless ds_type
       raise MCXContentProviderException,
-      "Coult not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
+      _("Could not parse ds_type from resource name '%{name}'.  Specify with ds_type parameter.") % { name: name }
     end
     # De-pluralize and downcase.
     ds_type = ds_type.chop.downcase.to_sym
     unless TypeMap.key? ds_type
       raise MCXContentProviderException,
-      "Coult not parse ds_type from resource name '#{name}'.  Specify with ds_type parameter."
+      _("Could not parse ds_type from resource name '%{name}'.  Specify with ds_type parameter.") % { name: name }
     end
     ds_type
   end
@@ -149,7 +150,7 @@ Puppet::Type.type(:mcx).provide :mcxcontent, :parent => Puppet::Provider do
     ds_name = name.split('/')[2]
     unless ds_name
       raise MCXContentProviderException,
-      "Could not parse ds_name from resource name '#{name}'.  Specify with ds_name parameter."
+      _("Could not parse ds_name from resource name '%{name}'.  Specify with ds_name parameter.") % { name: name }
     end
     ds_name
   end

data/lib/puppet/provider/mount/parsed.rb

@@ -61,7 +61,7 @@ Puppet::Type.type(:mount).provide(
           ret[filesystem_index] = filesystem_stanza.join("\n") if filesystem_stanza
           filesystem_stanza = Array(line)
           filesystem_index = i
-          # Eat the preceeding blank line
+          # Eat the preceding blank line
           ret[i-1] = nil if i > 0 and ret[i-1] and ret[i-1].match(%r{^\s*$})
           nil
         elsif line.match(%r{^(\s*\*.*|\s*)$})
@@ -123,11 +123,13 @@ Puppet::Type.type(:mount).provide(
         result[:options] = [result[:options],special_options.sort].flatten.compact.join(',')
         if ! result[:device]
           result[:device] = :absent
-          Puppet.err "Prefetch: Mount[#{result[:name]}]: Field 'device' is missing"
+          #TRANSLATORS "prefetch" is a program name and should not be translated
+          Puppet.err _("Prefetch: Mount[%{name}]: Field 'device' is missing") % { name: result[:name] }
         end
         if ! result[:fstype]
           result[:fstype] = :absent
-          Puppet.err "Prefetch: Mount[#{result[:name]}]: Field 'fstype' is missing"
+          #TRANSLATORS "prefetch" is a program name and should not be translated
+          Puppet.err _("Prefetch: Mount[%{name}]: Field 'fstype' is missing") % { name: result[:name] }
         end
       end
       def to_line(result)
@@ -138,7 +140,7 @@ Puppet::Type.type(:mount).provide(
         elsif result[:device] and result[:device] != :absent
           if ! result[:device].match(%{^.+:/})
             # Just skip this entry; it was malformed to begin with
-            Puppet.err "Mount[#{result[:name]}]: Field 'device' must be in the format of <absolute path> or <host>:<absolute path>"
+            Puppet.err _("Mount[%{name}]: Field 'device' must be in the format of <absolute path> or <host>:<absolute path>") % { name: result[:name] }
             return result[:line]
           end
           nodename, path = result[:device].split(":")
@@ -146,14 +148,14 @@ Puppet::Type.type(:mount).provide(
           output << "\tnodename\t= #{nodename}"
         else
           # Just skip this entry; it was malformed to begin with
-          Puppet.err "Mount[#{result[:name]}]: Field 'device' is required"
+          Puppet.err _("Mount[%{name}]: Field 'device' is required") % { name: result[:name] }
           return result[:line]
         end
         if result[:fstype] and result[:fstype] != :absent
           output << "\tvfs\t\t= #{result[:fstype]}"
         else
           # Just skip this entry; it was malformed to begin with
-          Puppet.err "Mount[#{result[:name]}]: Field 'device' is required"
+          Puppet.err _("Mount[%{name}]: Field 'device' is required") % { name: result[:name] }
           return result[:line]
         end
         if result[:options]
@@ -178,7 +180,21 @@ Puppet::Type.type(:mount).provide(
       end
     end
   else
-    record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => optional_fields
+    record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => optional_fields, :block_eval => :instance do
+      def pre_gen(record)
+        if !record[:options] || record[:options].empty?
+          if Facter.value(:kernel) == 'Linux'
+            record[:options] = 'defaults'
+          else
+            raise Puppet::Error, _("Mount[%{name}]: Field 'options' is required") % { name: record[:name] }
+          end
+        end
+        if !record[:fstype] || record[:fstype].empty?
+          raise Puppet::Error, _("Mount[%{name}]: Field 'fstype' is required") % { name: record[:name] }
+        end
+        record
+      end
+    end
   end
 
   # Every entry in fstab is :unmounted until we can prove different
@@ -252,7 +268,7 @@ Puppet::Type.type(:mount).provide(
       if match = regex.match(line) and name = match.captures.first
         instances << {:name => name, :mounted => :yes} # Only :name is important here
       else
-        raise Puppet::Error, "Could not understand line #{line} from mount output"
+        raise Puppet::Error, _("Could not understand line %{line} from mount output") % { line: line }
       end
     end
     instances

data/lib/puppet/provider/mount.rb

@@ -24,7 +24,8 @@ module Puppet::Provider::Mount
   end
 
   def remount
-    info "Remounting"
+    #TRANSLATORS refers to remounting a file system
+    info _("Remounting")
     if resource[:remounts] == :true
       mountcmd "-o", "remount", resource[:name]
     elsif ["FreeBSD", "DragonFly", "OpenBSD"].include?(Facter.value(:operatingsystem))

data/lib/puppet/provider/naginator.rb

@@ -23,7 +23,7 @@ class Puppet::Provider::Naginator < Puppet::Provider::ParsedFile
   def self.parse(text)
       Nagios::Parser.new.parse(text.gsub(NAME_STRING, "_naginator_name"))
   rescue => detail
-      raise Puppet::Error, "Could not parse configuration for #{resource_type.name}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not parse configuration for %{resource}: %{detail}") % { resource: resource_type.name, detail: detail }, detail.backtrace
   end
 
   def self.to_file(records)