puppet 5.4.0-universal-darwin → 5.5.0-universal-darwin

data/lib/puppet/pops/types/types.rb

@@ -576,7 +576,7 @@ class PNotUndefType < PTypeWithContainedType
         n.type
       else
         n
-       end
+      end
     end
   end
 

data/lib/puppet/pops/utils.rb

@@ -105,11 +105,11 @@ module Utils
 
   # is the name absolute (i.e. starts with ::)
   def self.is_absolute? name
-    name.start_with? "::"
+    name.start_with? "::".freeze
   end
 
   def self.name_to_segments name
-    name.split("::")
+    name.split("::".freeze)
   end
 
   def self.relativize_name name

data/lib/puppet/pops/validation/checker4_0.rb

@@ -292,8 +292,8 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def check_CapabilityMapping(o)
     ok =
     case o.component
-    when Model::QualifiedName
-      name = o.component.value
+    when Model::QualifiedReference
+      name = o.component.cased_value
       acceptor.accept(Issues::ILLEGAL_CLASSREF, o.component, {:name=>name}) unless name =~ Patterns::CLASSREF_EXT
       true
     when Model::AccessExpression
@@ -908,6 +908,10 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     true
   end
 
+  def idem_MatchExpression(o)
+    false # can have side effect of setting $n match variables
+  end
+
   def idem_RelationshipExpression(o)
     # Always side effect
     false

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

@@ -92,7 +92,9 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
       cmd = [command(:modify)]
     end
     cmd << flag(param) << value
-    cmd += check_allow_dup
+    # TODO the group type only really manages gid, so there are currently no
+    # tests for this behavior
+    cmd += check_allow_dup if param == :gid
     cmd << @resource[:name]
 
     cmd

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

@@ -23,12 +23,9 @@ Puppet::Type.type(:group).provide :windows_adsi do
     # Cannot use munge of the group property to canonicalize @should
     # since the default array_matching comparison is not commutative
 
+    current_sids = current.map(&:sid)
     # dupes automatically weeded out when hashes built
-    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
+    specified_sids = Puppet::Util::Windows::ADSI::Group.name_sid_hash(should).keys.to_a
 
     if @resource[:auth_membership]
       current_sids.sort == specified_sids.sort
@@ -40,7 +37,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   def members_to_s(users)
     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)
+      sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
       if !sid
         resource.debug("#{user_name} (unresolvable to SID)")
         next user_name
@@ -58,7 +55,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def member_valid?(user_name)
-    ! Puppet::Util::Windows::SID.name_to_sid_object(user_name).nil?
+    ! Puppet::Util::Windows::SID.name_to_principal(user_name).nil?
   end
 
   def group

data/lib/puppet/provider/nameservice.rb

@@ -174,7 +174,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     begin
       execute(self.addcmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
       if feature?(:manages_password_age) && (cmd = passcmd)
-        execute(cmd, { :custom_environment => @custom_environment })
+        execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
       end
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not create %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
@@ -189,7 +189,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 
     begin
-      execute(self.deletecmd, { :custom_environment => @custom_environment })
+      execute(self.deletecmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not delete %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
@@ -301,7 +301,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     cmd = modifycmd(param, munge(param, value))
     raise Puppet::DevError, _("Nameservice command must be an array") unless cmd.is_a?(Array)
     begin
-      execute(cmd, { :custom_environment => @custom_environment })
+      execute(cmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
     rescue Puppet::ExecutionFailure => detail
       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

data/lib/puppet/provider/package/pacman.rb

@@ -209,9 +209,9 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     cmd << resource_name
 
     if self.class.yaourt?
-      yaourt *cmd
+      yaourt(*cmd)
     else
-      pacman *cmd
+      pacman(*cmd)
     end
   end
 
@@ -258,9 +258,9 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     cmd << "-Sy" << resource_name
 
     if self.class.yaourt?
-      yaourt *cmd
+      yaourt(*cmd)
     else
-      pacman *cmd
+      pacman(*cmd)
     end
   end
 

data/lib/puppet/provider/package/pip.rb

@@ -117,7 +117,7 @@ Puppet::Type.type(:package).provide :pip,
         args << @resource[:name]
       end
     end
-    lazy_pip *args
+    lazy_pip(*args)
   end
 
   # Uninstall a package.  Uninstall won't work reliably on Debian/Ubuntu
@@ -135,7 +135,7 @@ Puppet::Type.type(:package).provide :pip,
   # try to teach it and if even that fails, raise the error.
   private
   def lazy_pip(*args)
-    pip *args
+    pip(*args)
   rescue NoMethodError => e
     # Ensure pip can upgrade pip, which usually puts pip into a new path /usr/local/bin/pip (compared to /usr/bin/pip)
     # The path to pip needs to be looked up again in the subsequent request. Using the preferred approach as noted
@@ -145,7 +145,7 @@ Puppet::Type.type(:package).provide :pip,
     # to search for them using the PATH variable.
     if pathname = self.class.cmd.map { |c| which(c) }.find { |c| c != nil }
       self.class.commands :pip => File.basename(pathname)
-      pip *args
+      pip(*args)
     else
       raise e, "Could not locate command #{self.class.cmd.join(' and ')}.", e.backtrace
     end

data/lib/puppet/provider/package/pkgdmg.rb

@@ -90,9 +90,9 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
         elsif http_proxy_host and not http_proxy_port
           args << "--proxy" << http_proxy_host
         end
-      begin
-        curl *args
-          Puppet.debug "Success: curl transferred [#{name}] (via: curl #{args.join(" ")})"
+        begin
+          curl(*args)
+            Puppet.debug "Success: curl transferred [#{name}] (via: curl #{args.join(" ")})"
         rescue Puppet::ExecutionFailure
           Puppet.debug "curl #{args.join(" ")} did not transfer [#{name}].  Falling back to local file." # This used to fall back to open-uri. -NF
           cached_source = source

data/lib/puppet/provider/package/pkgutil.rb

@@ -152,9 +152,9 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     # get passed to pkgutil via one or more -t options
     if resource[:source]
       sources = [resource[:source]].flatten
-      pkguti *[sources.map{|src| [ "-t", src ]}, *args].flatten
+      pkguti(*[sources.map{|src| [ "-t", src ]}, *args].flatten)
     else
-      pkguti *args.flatten
+      pkguti(*args.flatten)
     end
   end
 

data/lib/puppet/provider/package/portage.rb

@@ -40,7 +40,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
       search_output = nil
       Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-        search_output = eix *(self.eix_search_arguments + ['--installed'])
+        search_output = eix(*(self.eix_search_arguments + ['--installed']))
       end
 
       packages = []
@@ -74,7 +74,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     cmd << '--update' if [:latest].include?(should)
     cmd += install_options if @resource[:install_options]
     cmd << name
-    emerge *cmd
+    emerge(*cmd)
   end
 
   def uninstall
@@ -89,10 +89,10 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     cmd << name
     if [:purged].include?(should)
       Puppet::Util.withenv :CONFIG_PROTECT => "-*" do
-        emerge *cmd
+        emerge(*cmd)
       end
     else
-      emerge *cmd
+      emerge(*cmd)
     end
   end
 
@@ -111,7 +111,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     @atom ||= begin
       package_info = {}
       # do the search
-      search_output = qatom_bin *([@resource[:name], '--format', output_format])
+      search_output = qatom_bin(*([@resource[:name], '--format', output_format]))
       # verify if the search found anything
       match = result_format.match(search_output)
       if match
@@ -146,7 +146,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
   def self.get_sets
     @sets ||= begin
-      @sets = emerge *(['--list-sets'])
+      @sets = emerge(*(['--list-sets']))
     end
   end
 
@@ -170,8 +170,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       end
 
       if @resource[:name].match(/^@/)
-         if package_sets.include?(@resource[:name][1..-1].to_s)
-           return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
+        if package_sets.include?(@resource[:name][1..-1].to_s)
+          return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
         end
       end
 
@@ -180,7 +180,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
       search_output = nil
       Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-        search_output = eix *(self.class.eix_search_arguments + ['--exact',search_field,search_value])
+        search_output = eix(*(self.class.eix_search_arguments + ['--exact',search_field,search_value]))
       end
 
       packages = []

data/lib/puppet/provider/package/zypper.rb

@@ -102,7 +102,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
     options << '--name' unless major < 1 || @resource.allow_virtual? || should
     options << wanted
 
-    zypper *options
+    zypper(*options)
 
     unless self.query
       raise Puppet::ExecutionFailure.new(
@@ -138,7 +138,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
 
       options << @resource[:name]
 
-      zypper *options
+      zypper(*options)
     end
 
   end

data/lib/puppet/provider/service/base.rb

@@ -22,7 +22,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
       'ps auxwww'
     else
       'ps -ef'
-     end
+    end
   end
   private :getps
 

data/lib/puppet/provider/service/smf.rb

@@ -25,8 +25,9 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
 
   def setupservice
       if resource[:manifest]
-        [command(:svcs), "-l", @resource[:name]]
-        if $CHILD_STATUS.exitstatus == 1
+        begin
+          svcs("-l", @resource[:name])
+        rescue Puppet::ExecutionFailure
           Puppet.notice "Importing #{@resource[:manifest]} for #{@resource[:name]}"
           svccfg :import, resource[:manifest]
         end

data/lib/puppet/provider/service/systemd.rb

@@ -25,7 +25,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   defaultfor :osfamily => :coreos
   defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2"]
   defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["8", "stretch/sid", "9", "buster/sid"]
-  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10"]
+  defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10","17.04","17.10"]
   defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"]
 
   def self.instances

data/lib/puppet/provider/user/useradd.rb

@@ -188,13 +188,17 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
   def modifycmd(param, value)
     if @resource.forcelocal?
-      cmd = [command(property_manages_password_age?(param) ? :localpassword : :localmodify)]
+      if param == :groups
+        cmd = [command(:modify)]
+      else
+        cmd = [command(property_manages_password_age?(param) ? :localpassword : :localmodify)]
+      end
       @custom_environment = Puppet::Util::Libuser.getenv
     else
       cmd = [command(property_manages_password_age?(param) ? :password : :modify)]
     end
     cmd << flag(param) << value
-    cmd += check_allow_dup
+    cmd += check_allow_dup if param == :uid
     cmd << @resource[:name]
 
     cmd

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

@@ -52,7 +52,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
   def groups_to_s(groups)
     return '' if groups.nil? || !groups.kind_of?(Array)
     groups = groups.map do |group_name|
-      sid = Puppet::Util::Windows::SID.name_to_sid_object(group_name)
+      sid = Puppet::Util::Windows::SID.name_to_principal(group_name)
       if sid.account =~ /\\/
         account, _ = Puppet::Util::Windows::ADSI::Group.parse_name(sid.account)
       else

data/lib/puppet/provider/yumrepo/inifile.rb

@@ -164,15 +164,7 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     result = self.virtual_inifile[name]
     # Create a new section if not found.
     unless result
-      dirs = reposdir()
-      if dirs.empty?
-        # If no repo directories are present, default to using yum.conf.
-        path = '/etc/yum.conf'
-      else
-        # The ordering of reposdir is [defaults, custom], and we want to use
-        # the custom directory if present.
-        path = File.join(dirs.last, "#{name}.repo")
-      end
+      path = getRepoPath(name)
       result = self.virtual_inifile.add_section(name, path)
     end
     result
@@ -196,6 +188,19 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
     end
   end
 
+  def self.getRepoPath(name)
+    dirs = reposdir()
+    if dirs.empty?
+      # If no repo directories are present, default to using yum.conf.
+      path = '/etc/yum.conf'
+    else
+      # The ordering of reposdir is [defaults, custom], and we want to use
+      # the custom directory if present.
+      path = File.join(dirs.last, "#{name}.repo")
+    end
+    path
+  end
+
   # Create a new section for the given repository and set all the specified
   # properties in the section.
   #
@@ -204,6 +209,12 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
   def create
     @property_hash[:ensure] = :present
 
+    # Check to see if the file that would be created in the
+    # default location for the yumrepo already exists on disk.
+    # If it does, read it in to the virtual inifile
+    path = self.class.getRepoPath(name)
+    self.class.virtual_inifile.read(path) if Puppet::FileSystem.file?(path)
+
     # We fetch a list of properties from the type, then iterate
     # over them, avoiding ensure.  We're relying on .should to
     # check if the property has been set and should be modified,

data/lib/puppet/provider/zfs/zfs.rb

@@ -26,7 +26,7 @@ Puppet::Type.type(:zfs).provide(:zfs) do
   end
 
   def create
-    zfs *([:create] + add_properties + [@resource[:name]])
+    zfs(*([:create] + add_properties + [@resource[:name]]))
   end
 
   def destroy

data/lib/puppet/reference/configuration.rb

@@ -34,6 +34,8 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
       val = 'Unix/Linux: /var/log/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\var\log -- Non-root user: ~/.puppetlabs/var/log'
     elsif name.to_s == 'hiera_config'
       val = '$confdir/hiera.yaml. However, if a file exists at $codedir/hiera.yaml, Puppet uses that instead.'
+    elsif name.to_s == 'certname'
+      val = "the Host's fully qualified domain name, as determined by facter"
     end
 
     # Leave out the section information; it was apparently confusing people.

data/lib/puppet/reference/type.rb

@@ -47,25 +47,25 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
   Resource types define features they can use, and providers can be tested to see
   which features they provide.
 
-    }
+  }
 
-    types.sort { |a,b|
-      a.to_s <=> b.to_s
-    }.each { |name,type|
+  types.sort { |a,b|
+    a.to_s <=> b.to_s
+  }.each { |name,type|
 
-      str << "
+    str << "
 
 ----------------
 
 "
 
-  str << markdown_header(name, 3)
-  str << scrub(type.doc) + "\n\n"
+    str << markdown_header(name, 3)
+    str << scrub(type.doc) + "\n\n"
 
-  # Handle the feature docs.
-  if featuredocs = type.featuredocs
-    str << markdown_header("Features", 4)
-    str << featuredocs
+    # Handle the feature docs.
+    if featuredocs = type.featuredocs
+      str << markdown_header("Features", 4)
+      str << featuredocs
     end
 
     docs = {}