puppet 6.0.10-x86-mingw32 → 6.1.0-x86-mingw32

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

@@ -12,7 +12,7 @@ Puppet::Type.type(:package).provide :pip3,
   These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
   or an array where each element is either a string or a hash."
 
-  has_feature :installable, :uninstallable, :upgradeable, :versionable, :install_options, :targetable
+  has_feature :installable, :uninstallable, :upgradeable, :versionable, :install_options
 
   def self.cmd
     ["pip3"]

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

@@ -16,42 +16,53 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
     pkg(['query', '-a', '%n %v %o'])
   end
 
+  def self.get_resource_info(name)
+    pkg(['query', '%n %v %o', name])
+  end
+
+  def self.cached_version_list
+    @version_list ||= get_version_list
+  end
+
   def self.get_version_list
-    pkg(['version', '-voRL='])
+    @version_list = pkg(['version', '-voRL='])
   end
 
-  def self.get_latest_version(origin, version_list)
-    if latest_version = version_list.lines.find { |l| l =~ /^#{origin} / }
+  def self.get_latest_version(origin)
+    if latest_version = cached_version_list.lines.find { |l| l =~ /^#{origin} / }
       latest_version = latest_version.split(' ').last.split(')').first
       return latest_version
     end
     nil
   end
 
+  def self.parse_pkg_query_line(line)
+    name, version, origin = line.chomp.split(' ', 3)
+    latest_version  = get_latest_version(origin) || version
+
+    {
+      :ensure   => version,
+      :name     => name,
+      :provider => self.name,
+      :origin   => origin,
+      :version  => version,
+      :latest   => latest_version
+    }
+  end
+
   def self.instances
     packages = []
     begin
       info = self.get_query
-      version_list = self.get_version_list
+      get_version_list
 
       unless info
         return packages
       end
 
       info.lines.each do |line|
-
-        name, version, origin = line.chomp.split(" ", 3)
-        latest_version  = get_latest_version(origin, version_list) || version
-
-        pkg = {
-          :ensure   => version,
-          :name     => name,
-          :provider => self.name,
-          :origin   => origin,
-          :version  => version,
-          :latest   => latest_version
-        }
-        packages << new(pkg)
+        hash = parse_pkg_query_line(line)
+        packages << new(hash)
       end
 
       return packages
@@ -113,18 +124,23 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   end
 
   def query
-    if @property_hash[:ensure] == nil
+    begin
+      output = self.class.get_resource_info(resource[:name])
+    rescue Puppet::ExecutionFailure
       return nil
-    else
-      version = @property_hash[:version]
-      return { :version => version }
     end
+
+    self.class.parse_pkg_query_line(output)
   end
 
   def version
     @property_hash[:version]
   end
 
+  def version=
+    pkg(['install', '-qfy', "#{resource[:name]}-#{resource[:version]}"])
+  end
+
   # Upgrade to the latest version
   def update
     install

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/package/gem'
+require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   desc "Puppet Ruby Gem support. This provider is useful for managing

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

@@ -155,39 +155,28 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   end
 
   def uninstall
-    query
-    # If version and release (or only version) is specified in the resource,
-    # uninstall using them, otherwise uninstall using only the name of the package.
-    name    = get(:name)
-    version = get(:version)
-    release = get(:release)
-    nav = "#{name}-#{version}"
-    nvr = "#{nav}-#{release}"
-    if @resource[:name].start_with? nvr
-      identifier = nvr
-    else
-      if @resource[:name].start_with? nav
-        identifier = nav
-      else
-        identifier = name
-      end
-    end
-    # If an arch is specified in the resource, uninstall that arch,
-    # otherwise uninstall the arch returned by query.
-    # If multiple arches are installed and arch is not specified,
-    # this will uninstall all of them after successive runs.
-    #
-    # rpm prior to 4.2.1 cannot accept architecture as part of the package name.
+    query if get(:arch) == :absent
+    nvr = "#{get(:name)}-#{get(:version)}-#{get(:release)}"
+    arch = ".#{get(:arch)}"
+    # If they specified an arch in the manifest, erase that Otherwise,
+    # erase the arch we got back from the query. If multiple arches are
+    # installed and only the package name is specified (without the
+    # arch), this will uninstall all of them on successive runs of the
+    # client, one after the other
+
+    # version of RPM prior to 4.2.1 can't accept the architecture as
+    # part of the package name.
     unless Puppet::Util::Package.versioncmp(self.class.current_version, '4.2.1') < 0
-      arch = ".#{get(:arch)}"
-      if @resource[:name].end_with? arch
-        identifier += arch
+      if @resource[:name][-arch.size, arch.size] == arch
+        nvr += arch
+      else
+        nvr += ".#{get(:arch)}"
       end
     end
 
     flag = ['-e']
     flag += uninstall_options if resource[:uninstall_options]
-    rpm flag, identifier
+    rpm flag, nvr
   end
 
   def update

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

@@ -63,11 +63,7 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     installer = Puppet::Provider::Package::Windows::Package.installer_class(resource)
 
     command = [installer.install_command(resource), install_options].flatten.compact.join(' ')
-    working_dir = File.dirname(resource[:source])
-    if !Puppet::FileSystem.exist?(working_dir) && resource[:source] =~ /\.msi"?\Z/i
-      working_dir = nil
-    end
-    output = execute(command, :failonfail => false, :combine => true, :cwd => working_dir, :suppress_window => true)
+    output = execute(command, :failonfail => false, :combine => true, :cwd => File.dirname(resource[:source]), :suppress_window => true)
 
     check_result(output.exitstatus)
   end

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

@@ -23,7 +23,6 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
   end
 
-defaultfor :operatingsystem => :amazon
 defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
 
   def self.prefetch(packages)
@@ -108,7 +107,7 @@ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => (4..7).to_a
   end
 
   def self.update_to_hash(pkgname, pkgversion)
-
+    
     # The pkgname string has two parts: name, and architecture. Architecture
     # is the portion of the string following the last "." character. All
     # characters preceding the final dot are the package name. Parse out

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

@@ -125,6 +125,21 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
     end
   end
 
+  # Define the daemon_reload? function to check if the unit is requiring to trigger a "systemctl daemon-reload"
+  # If the unit file is flagged with NeedDaemonReload=yes, then a systemd daemon-reload will be run.
+  # If multiple unit files have been updated, the first one flagged will trigger the daemon-reload for all of them.
+  # The others will be then flagged with NeedDaemonReload=no. So the command will run only once in a puppet run.
+  # This function is called only on start & restart unit options.
+  # Reference: (PUP-3483) Systemd provider doesn't scan for changed units
+  def daemon_reload?
+    cmd = [command(:systemctl), 'show', @resource[:name], '--property=NeedDaemonReload']
+    daemon_reload = execute(cmd, :failonfail => false).strip.split('=').last
+    if daemon_reload == 'yes'
+      daemon_reload_cmd = [command(:systemctl), 'daemon-reload']
+      execute(daemon_reload_cmd, :failonfail => false)
+    end
+  end
+
   def enable
     self.unmask
     systemctl_change_enable(:enable)
@@ -158,6 +173,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def restart
     begin
+      daemon_reload?
       super
     rescue Puppet::Error => e
       raise Puppet::Error.new(prepare_error_message(@resource[:name], 'restart', e))
@@ -166,6 +182,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
 
   def start
     begin
+      daemon_reload?
       super
     rescue Puppet::Error => e
       raise Puppet::Error.new(prepare_error_message(@resource[:name], 'start', e))

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

@@ -28,23 +28,11 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   # We only want to use upstart as our provider if the upstart daemon is running.
   # This can be checked by running `initctl version --quiet` on a machine that has
   # upstart installed.
-  confine :true => lambda { has_initctl? }
-
-  def self.has_initctl?
-    # Puppet::Util::Execution.execute does not currently work on jRuby.
-    # Unfortunately, since this confine is invoked whenever we check for
-    # provider suitability and since provider suitability is still checked
-    # on the master, this confine will still be invoked on the master. Thus
-    # to avoid raising an exception, we do an early return if we're running
-    # on jRuby.
-    return false if Puppet::Util::Platform.jruby?
-
-    begin
-      initctl('version', '--quiet')
-      true
-    rescue
-      false
-    end
+  confine :true => begin
+    initctl('version', '--quiet')
+    true
+  rescue
+    false
   end
 
   # upstart developer haven't implemented initctl enable/disable yet:

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

@@ -15,6 +15,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
   confine    :operatingsystem => :windows
 
   has_feature :refreshable
+  has_feature :configurable_timeout
 
   def enable
     Puppet::Util::Windows::Service.set_startup_mode( @resource[:name], :SERVICE_AUTO_START )
@@ -57,7 +58,7 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
 
   def start
     if status == :paused
-      Puppet::Util::Windows::Service.resume(@resource[:name])
+      Puppet::Util::Windows::Service.resume(@resource[:name], timeout: @resource[:timeout])
       return
     end
 
@@ -75,11 +76,11 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
         manual_start
       end
     end
-    Puppet::Util::Windows::Service.start(@resource[:name])
+    Puppet::Util::Windows::Service.start(@resource[:name], timeout: @resource[:timeout])
   end
 
   def stop
-    Puppet::Util::Windows::Service.stop(@resource[:name])
+    Puppet::Util::Windows::Service.stop(@resource[:name], timeout: @resource[:timeout])
   end
 
   def status
@@ -104,6 +105,10 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     return state
   end
 
+  def default_timeout
+    Puppet::Util::Windows::Service::DEFAULT_TIMEOUT
+  end
+
   # returns all providers for all existing services and startup state
   def self.instances
     services = []

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

@@ -302,7 +302,7 @@ Puppet::Type.type(:user).provide :directoryservice do
             merge_attribute_with_dscl('Groups', group, 'GroupMembers', @guid)
           end
         else
-          create_attribute_with_dscl('Users', @resource.name, self.class.ns_to_ds_attribute_map[attribute], value)
+          merge_attribute_with_dscl('Users', @resource.name, self.class.ns_to_ds_attribute_map[attribute], value)
         end
       end
     end
@@ -429,14 +429,11 @@ Puppet::Type.type(:user).provide :directoryservice do
   # the case we rescue the error from dscl and alert the user.
   #
   # In the event that the user doesn't HAVE a value for the attribute, the
-  # provider should use the -create option with dscl to add the attribute value
+  # provider should use the -merge option with dscl to add the attribute value
   # for the user record
   ['home', 'uid', 'gid', 'comment', 'shell'].each do |setter_method|
     define_method("#{setter_method}=") do |value|
       if @property_hash[setter_method.intern]
-        if self.class.get_os_version == '10.14' && %w(home uid).include?(setter_method)
-          raise Puppet::Error, "OS X version 10\.14 does not allow changing #{setter_method} using puppet"
-        end
         begin
           dscl '.', '-change', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], @property_hash[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
@@ -445,7 +442,7 @@ Puppet::Type.type(:user).provide :directoryservice do
         end
       else
         begin
-          dscl '.', '-create', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], value
+          dscl '.', '-merge', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
           raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
                "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
@@ -475,19 +472,10 @@ Puppet::Type.type(:user).provide :directoryservice do
     '/var/db/shadow/hash'
   end
 
-  # This method will create a given value using dscl
-  def create_attribute_with_dscl(path, username, keyname, value)
-    set_attribute_with_dscl('-create', path, username, keyname, value)
-  end
-
   # This method will merge in a given value using dscl
   def merge_attribute_with_dscl(path, username, keyname, value)
-    set_attribute_with_dscl('-merge', path, username, keyname, value)
-  end
-
-  def set_attribute_with_dscl(dscl_command, path, username, keyname, value)
     begin
-      dscl '.', dscl_command, "/#{path}/#{username}", keyname, value
+      dscl '.', '-merge', "/#{path}/#{username}", keyname, value
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, "Could not set the dscl #{keyname} key with value: #{value} - #{detail.inspect}", detail.backtrace
     end

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

@@ -105,11 +105,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # because by default duplicates are allowed.  This check is
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
-    if (!@resource.allowdupe?) && @resource.forcelocal?
-       if @resource.should(:uid) && finduser('uid', @resource.should(:uid).to_s)
+    if not @resource.allowdupe? and @resource.forcelocal?
+       if @resource.should(:uid) and finduser('uid', @resource.should(:uid).to_s)
            raise(Puppet::Error, "UID #{@resource.should(:uid).to_s} already exists, use allowdupe to force user creation")
        end
-    elsif @resource.allowdupe? && (!@resource.forcelocal?)
+    elsif @resource.allowdupe? and not @resource.forcelocal?
        return ["-o"]
     end
     []
@@ -126,16 +126,16 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
   def check_manage_home
     cmd = []
-    if @resource.managehome? && (!@resource.forcelocal?)
+    if @resource.managehome? and not @resource.forcelocal?
       cmd << "-m"
-    elsif (!@resource.managehome?) && Facter.value(:osfamily) == 'RedHat'
+    elsif not @resource.managehome? and Facter.value(:osfamily) == 'RedHat'
       cmd << "-M"
     end
     cmd
   end
 
   def check_system_users
-    if self.class.system_users? && resource.system?
+    if self.class.system_users? and resource.system?
       ["-r"]
     else
       []
@@ -149,11 +149,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     Puppet::Type.type(:user).validproperties.sort.each do |property|
       next if property == :ensure
       next if property_manages_password_age?(property)
-      next if (property == :groups) && @resource.forcelocal?
-      next if (property == :expiry) && @resource.forcelocal?
+      next if property == :groups and @resource.forcelocal?
+      next if property == :expiry and @resource.forcelocal?
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
-      if (value = @resource.should(property)) && (value != "")
+      if value = @resource.should(property) and value != ""
         cmd << flag(property) << munge(property, value)
       end
     end
@@ -167,7 +167,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     else
       cmd = [command(:add)]
     end
-    if (!@resource.should(:gid)) && Puppet::Util.gid(@resource[:name])
+    if not @resource.should(:gid) and Puppet::Util.gid(@resource[:name])
       cmd += ["-g", @resource[:name]]
     end
     cmd += add_properties
@@ -203,10 +203,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     else
       cmd = [command(:delete)]
     end
-    # Solaris `userdel -r` will fail if the homedir does not exist.
-    if @resource.managehome? && (('Solaris' != Facter.value(:operatingsystem)) || Dir.exist?(Dir.home(@resource[:name])))
-      cmd << '-r'
-    end
+    cmd += @resource.managehome? ? ['-r'] : []
     cmd << @resource[:name]
   end
 
@@ -242,10 +239,10 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       check_valid_shell
     end
      super
-     if @resource.forcelocal? && self.groups?
+     if @resource.forcelocal? and self.groups?
        set(:groups, @resource[:groups])
      end
-     if @resource.forcelocal? && @resource[:expiry]
+     if @resource.forcelocal? and @resource[:expiry]
        set(:expiry, @resource[:expiry])
      end
   end

data/lib/puppet/resource.rb

@@ -583,7 +583,9 @@ class Puppet::Resource
         delete(attribute)
       end
 
-      parameters_to_include = options[:parameters_to_include] || []
+      parameters_to_include = resource_type.parameters_to_include
+      parameters_to_include += options[:parameters_to_include] || []
+
       delete(attribute) unless properties.include?(attribute) || parameters_to_include.include?(attribute)
     end
     self