puppet 5.5.7 → 5.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cceb57d43e4649d9d87857816df85b524c45d3004bb5a969d60d4de64b404e6
-  data.tar.gz: 280065891b1ef83fab160ab18b617bf8a887ccb57071279397f64c8078b4c5f9
+  metadata.gz: 32bd704ec12c9b090ed9beb7ad4e5bf6892224adebee36578a43d84a6fc5a378
+  data.tar.gz: 300d5a99b06571c6fb8739ba1a111a868f0224bec29bbea22be8802bf202c6e2
 SHA512:
-  metadata.gz: e25e640aad21a48ba030c166014d555394ac225131d01c49817ca28c5534153d795ae2b58f53632a2e373742eaa13ca11c88ed0614787da6343fdb73dfa4c330
-  data.tar.gz: 4d3749159a0a3ce8db3913f269d3ad9d219f511e57d887c06a4a1dce4887697c0cb1184546958d9e1a4aed940c01cef73b193757ce3d5186d32aebc15111a7cc
+  metadata.gz: 02df788b21ae421cd532aa0183e54a463dbad017fc849a427d77abce6800a2aedd6d0ffa36d06d83ca1a63ff2159ac33a9dbe36601694a489780425561fe42a9
+  data.tar.gz: 19175679dfb8d0199b157cf3919dcba6506e0cbb9bacd6c2eb71640d34e9b9054382155859b49c140476e717ffa0fcb71d99022ac9816b178f6d7b8c581e4e9a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (5.5.6)
+    puppet (5.5.8)
       CFPropertyList (~> 2.2)
       facter (>= 2.0.1, < 4)
       fast_gettext (~> 1.1.2)
@@ -52,7 +52,7 @@ GEM
     multi_json (1.13.1)
     mustache (1.1.0)
     net-ssh (4.2.0)
-    packaging (0.99.14)
+    packaging (0.99.16)
       artifactory
       rake (~> 12.3)
     parallel (1.12.1)

data/Rakefile

@@ -73,7 +73,7 @@ task(:commits) do
   %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
     # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
     # The exception tries to explain it in more full.
-    if /^\((maint|doc|docs|packaging|pup-\d+)\)|revert/i.match(commit_summary).nil?
+    if /^\((maint|doc|docs|packaging|l10n|pup-\d+)\)|revert/i.match(commit_summary).nil?
       raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
         "\n\t\t#{commit_summary}\n" \
         "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
@@ -82,6 +82,7 @@ task(:commits) do
         "\t\t(docs)(DOCUMENT-<digits>)\n" \
         "\t\t(maint)\n" \
         "\t\t(packaging)\n" \
+        "\t\t(L10n)\n" \
         "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
     else
       puts "#{commit_summary}"

data/lib/puppet/defaults.rb

@@ -1067,7 +1067,7 @@ EOT
       :mode => "0640",
       :desc => "Where the CA stores the password for the private key. This setting is deprecated and will be removed in Puppet 6.",
       :hook => proc do |value|
-        Puppet.deprecation_warning(_("The 'caprivatedir' setting is deprecated and will be removed in Puppet 6."))
+        Puppet.deprecation_warning(_("The 'capass' setting is deprecated and will be removed in Puppet 6."))
       end,
     },
     :serial => {
@@ -1305,8 +1305,10 @@ EOT
     :ca => {
       :default    => true,
       :type       => :boolean,
-      :deprecated  => :completely,
       :desc       => "Whether the master should function as a certificate authority.",
+      :hook => proc do |value|
+        Puppet.deprecation_warning(_("The 'ca' setting is deprecated and will be removed in Puppet 6."))
+      end,
     },
     :trusted_oid_mapping_file => {
       :default    => "$confdir/custom_trusted_oid_mapping.yaml",

data/lib/puppet/face/config.rb

@@ -210,7 +210,7 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
 
   action(:delete) do
     summary _("Delete a Puppet setting.")
-    arguments _("(<setting>")
+    arguments _("<setting>")
     #TRANSLATORS 'main' is a specific section name and should not be translated
     description "Deletes a setting from the specified section. (The default is the section 'main')."
     notes <<-'EOT'

data/lib/puppet/file_bucket/dipper.rb

@@ -77,7 +77,7 @@ class Puppet::FileBucket::Dipper
           tmp_file.unlink
         end
       else
-        raise Puppet::Error, _("Please provide a file or checksum do diff with")
+        raise Puppet::Error, _("Please provide a file or checksum to diff with")
       end
     elsif file_a
       if checksum_b

data/lib/puppet/functions.rb

@@ -385,7 +385,6 @@ module Puppet::Functions
     end
   end
 
-
   # Public api methods of the DispatcherBuilder are available within dispatch()
   # blocks declared in a Puppet::Function.create_function() call.
   #
@@ -680,128 +679,6 @@ module Puppet::Functions
     end
   end
 
-  class Function3x < InternalFunction
-
-    # Table of optimized parameter names - 0 to 5 parameters
-    PARAM_NAMES = [
-      [],
-      ['p0'.freeze].freeze,
-      ['p0'.freeze, 'p1'.freeze].freeze,
-      ['p0'.freeze, 'p1'.freeze, 'p2'.freeze].freeze,
-      ['p0'.freeze, 'p1'.freeze, 'p2'.freeze, 'p3'.freeze].freeze,
-      ['p0'.freeze, 'p1'.freeze, 'p2'.freeze, 'p3'.freeze, 'p4'.freeze].freeze,
-    ]
-
-    # Creates an anonymous Function3x class that wraps a 3x function
-    #
-    # @api private
-    def self.create_function(func_name, func_info, loader)
-      func_name = func_name.to_s
-
-      # Creates an anonymous class to represent the function
-      # The idea being that it is garbage collected when there are no more
-      # references to it.
-      #
-      # (Do not give the class the block here, as instance variables should be set first)
-      the_class = Class.new(Function3x)
-
-      unless loader.nil?
-        the_class.instance_variable_set(:'@loader', loader.private_loader)
-      end
-
-      the_class.instance_variable_set(:'@func_name', func_name)
-      the_class.instance_variable_set(:'@method3x', :"function_#{func_name}")
-
-      # Make the anonymous class appear to have the class-name <func_name>
-      # Even if this class is not bound to such a symbol in a global ruby scope and
-      # must be resolved via the loader.
-      # This also overrides any attempt to define a name method in the given block
-      # (Since it redefines it)
-      #
-      the_class.instance_eval do
-        def name
-          @func_name
-        end
-
-        def loader
-          @loader
-        end
-
-        def method3x
-          @method3x
-        end
-      end
-
-      # Add the method that is called - it simply delegates to
-      # the 3.x function by calling it via the calling scope using the @method3x symbol
-      # :"function_#{name}".
-      #
-      # When function is not an rvalue function, make sure it produces nil
-      #
-      the_class.class_eval do
-
-        # Bypasses making the  call via the dispatcher to make sure errors
-        # are reported exactly the same way as in 3x. The dispatcher is still needed as it is
-        # used to support other features than calling.
-        #
-        def call(scope, *args, &block)
-          begin
-            result = catch(:return) do
-              mapped_args = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.map_args(args, scope, '')
-              # this is the scope.function_xxx(...) call
-              return scope.send(self.class.method3x, mapped_args)
-            end
-            return result.value
-          rescue Puppet::Pops::Evaluator::Next => jumper
-            begin
-              throw :next, jumper.value
-            rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-              raise Puppet::ParseError.new("next() from context where this is illegal", jumper.file, jumper.line)
-            end
-          rescue Puppet::Pops::Evaluator::Return => jumper
-            begin
-              throw :return, jumper
-            rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-              raise Puppet::ParseError.new("return() from context where this is illegal", jumper.file, jumper.line)
-            end
-          end
-        end
-      end
-
-      # Create a dispatcher based on func_info
-      type, names = Puppet::Functions.any_signature(*from_to_names(func_info))
-      last_captures_rest = (type.size_range[1] == Float::INFINITY)
-
-      # The method '3x_function' here is a dummy as the dispatcher is not used for calling, only for information.
-      the_class.dispatcher.add(Puppet::Pops::Functions::Dispatch.new(type, '3x_function', names, last_captures_rest))
-      # The function class is returned as the result of the create function method
-      the_class
-    end
-
-    # Compute min and max number of arguments and a list of constructed
-    # parameter names p0 - pn (since there are no parameter names in 3x functions).
-    #
-    # @api private
-    def self.from_to_names(func_info)
-      arity = func_info[:arity]
-      if arity.nil?
-        arity = -1
-      end
-      if arity < 0
-        from = -arity - 1 # arity -1 is 0 min param, -2 is min 1 param
-        to = :default     # infinite range
-        count = -arity    # the number of named parameters
-      else
-        count = from = to = arity
-      end
-      # Names of parameters, up to 5 are optimized and use frozen version
-      # Note that (0..count-1) produces expected empty array for count == 0, 0-n for count >= 1
-      names = count <= 5 ? PARAM_NAMES[count] : (0..count-1).map {|n| "p#{n}" }
-      [from, to, names]
-    end
-  end
-
-
   # Injection and Weaving of parameters
   # ---
   # It is possible to inject and weave a set of well known parameters into a call.

data/lib/puppet/loaders.rb

@@ -13,7 +13,6 @@ module Puppet
       require 'puppet/pops/loader/static_loader'
       require 'puppet/pops/loader/runtime3_type_loader'
       require 'puppet/pops/loader/ruby_function_instantiator'
-      require 'puppet/pops/loader/ruby_legacy_function_instantiator'
       require 'puppet/pops/loader/ruby_data_type_instantiator'
       require 'puppet/pops/loader/puppet_function_instantiator'
       require 'puppet/pops/loader/type_definition_instantiator'

data/lib/puppet/parser/functions.rb

@@ -171,9 +171,7 @@ module Puppet::Parser::Functions
           elsif arity < 0 and args[0].size < (arity+1).abs
             raise ArgumentError, _("%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})") % { name: name, arg_count: args[0].size, min_arg_count: (arity+1).abs }
           end
-          r = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.convert_return(self.send(real_fname, args[0]))
-          # avoid leaking aribtrary value if not being an rvalue function
-          options[:type] == :rvalue ? r : nil
+          self.send(real_fname, args[0])
         else
           raise ArgumentError, _("custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)")
         end

data/lib/puppet/pops/evaluator/runtime3_converter.rb

@@ -196,22 +196,6 @@ class Runtime3FunctionArgumentConverter < Runtime3Converter
     o.to_s
   end
 
-  # Converts result back to 4.x by replacing :undef with nil in Array and Hash objects
-  #
-  def self.convert_return(val3x)
-    if val3x == :undef
-      nil
-    elsif val3x.is_a?(Array)
-      val3x.map {|v| convert_return(v) }
-    elsif val3x.is_a?(Hash)
-      hsh = {}
-      val3x.each_pair {|k,v| hsh[convert_return(k)] = convert_return(v)}
-      hsh
-    else
-      val3x
-    end
-  end
-
   @instance = self.new
 end
 

data/lib/puppet/pops/evaluator/runtime3_support.rb

@@ -305,14 +305,15 @@ module Runtime3Support
         return Kernel.eval('_func.call(scope, *args, &block)'.freeze, Kernel.binding, file || '', line)
       end
     end
-    # Call via 3x API if function exists there without having been autoloaded
+    # Call via 3x API if function exists there
     fail(Issues::UNKNOWN_FUNCTION, o, {:name => name}) unless Puppet::Parser::Functions.function(name)
 
     # Arguments must be mapped since functions are unaware of the new and magical creatures in 4x.
     # NOTE: Passing an empty string last converts nil/:undef to empty string
     mapped_args = Runtime3FunctionArgumentConverter.map_args(args, scope, '')
-    # The 3x function performs return value mapping and returns nil if it is not of rvalue type
-    Puppet::Pops::PuppetStack.stack(file, line, scope, "function_#{name}", [mapped_args], &block)
+    result = Puppet::Pops::PuppetStack.stack(file, line, scope, "function_#{name}", [mapped_args], &block)
+    # Prevent non r-value functions from leaking their result (they are not written to care about this)
+    Puppet::Parser::Functions.rvalue?(name) ? result : nil
   end
 
   # The o is used for source reference

data/lib/puppet/pops/loader/loader.rb

@@ -29,7 +29,7 @@ class Loader
   attr_reader :loader_name
 
   # Describes the kinds of things that loaders can load
-  LOADABLE_KINDS = [:func_4x, :func_4xpp, :func_3x, :datatype, :type_pp, :resource_type_pp, :plan, :task].freeze
+  LOADABLE_KINDS = [:func_4x, :func_4xpp, :datatype, :type_pp, :resource_type_pp, :plan, :task].freeze
 
   # @param [String] name the name of the loader. Must be unique among all loaders maintained by a {Loader} instance
   def initialize(loader_name)

data/lib/puppet/pops/loader/loader_paths.rb

@@ -25,9 +25,7 @@ module LoaderPaths
         if loader.loadables.include?(:func_4xpp)
           result << FunctionPathPP.new(loader)
         end
-        if loader.loadables.include?(:func_3x)
-          result << FunctionPath3x.new(loader)
-        end
+        # When wanted also add FunctionPath3x to load 3x functions
     when :plan
       result << PlanPathPP.new(loader)
     when :task

data/lib/puppet/pops/loader/module_loaders.rb

@@ -31,7 +31,7 @@ module ModuleLoaders
                                                        nil,
                                                        puppet_lib,   # may or may not have a 'lib' above 'puppet'
                                                        'puppet_system',
-                                                        [:func_4x, :func_3x, :datatype]   # only load ruby functions and types from "puppet"
+                                                        [:func_4x, :datatype]   # only load ruby functions and types from "puppet"
                                                        )
   end
 

data/lib/puppet/pops/loaders.rb

@@ -505,8 +505,8 @@ class Loaders
         nil
       else
         module_data.private_loader =
-          if module_data.restrict_to_dependencies?
-            create_loader_with_dependencies_first(module_data)
+          if module_data.restrict_to_dependencies? && !Puppet[:tasks]
+            create_loader_with_only_dependencies_visible(module_data)
           else
             create_loader_with_all_modules_visible(module_data)
           end
@@ -516,13 +516,29 @@ class Loaders
     private
 
     def create_loader_with_all_modules_visible(from_module_data)
+      Puppet.debug{"ModuleLoader: module '#{from_module_data.name}' has unknown dependencies - it will have all other modules visible"}
+
       @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", all_module_loaders()))
     end
 
-    def create_loader_with_dependencies_first(from_module_data)
+    def create_loader_with_only_dependencies_visible(from_module_data)
+      if from_module_data.unmet_dependencies?
+        if Puppet[:strict] != :off
+          msg = "ModuleLoader: module '#{from_module_data.name}' has unresolved dependencies" \
+              " - it will only see those that are resolved." \
+              " Use 'puppet module list --tree' to see information about modules"
+          case Puppet[:strict]
+          when :error
+              raise LoaderError.new(msg)
+          when :warning
+            Puppet.warn_once(:unresolved_module_dependencies,
+                             "unresolved_dependencies_for_module_#{from_module_data.name}",
+                             msg)
+          end
+        end
+      end
       dependency_loaders = from_module_data.dependency_names.collect { |name| @index[name].public_loader }
-      visible_loaders = dependency_loaders + (all_module_loaders() - dependency_loaders)
-      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", visible_loaders))
+      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", dependency_loaders))
     end
   end
 end

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

@@ -53,10 +53,30 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
 
       group_hash
     end
+
+    # Define some Puppet Property => AIX Attribute (and vice versa)
+    # conversion functions here. This is so we can unit test them.
+
+    def members_to_users(provider, members)
+      members = members.split(',') if members.is_a?(String)
+      unless provider.resource[:auth_membership]
+        current_members = provider.members
+        current_members = [] if current_members == :absent
+        members = (members + current_members).uniq
+      end
+
+      members.join(',')
+    end
+
+    def users_to_members(users)
+      users.split(',')
+    end
   end
 
   mapping puppet_property: :members,
-          aix_attribute: :users
+          aix_attribute: :users,
+          property_to_attribute: method(:members_to_users),
+          attribute_to_property: method(:users_to_members)
 
   numeric_mapping puppet_property: :gid,
                   aix_attribute: :id
@@ -65,4 +85,14 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   # the resource methods (property getters + setters for our mapped
   # properties + a getter for the attributes property).
   mk_resource_methods
+
+  # We could add this to the top-level members property since the
+  # implementation is not platform-specific; however, it is best
+  # to do it this way so that we do not accidentally break something.
+  # This is ok for now, since we do plan on moving this and the
+  # auth_membership management over to the property class in a future
+  # Puppet release.
+  def members_insync?(current, should)
+    current.sort == @resource.parameter(:members).actual_should(current, should)
+  end
 end

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

@@ -9,10 +9,7 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
   defaultfor :operatingsystem => [:freebsd, :dragonfly]
   confine    :operatingsystem => [:freebsd, :dragonfly]
 
-  options :members,
-          :flag    => "-M",
-          :method  => :mem,
-          :unmunge => proc { |members| members.join(',') }
+  options :members, :flag => "-M", :method => :mem
 
   verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
@@ -29,6 +26,9 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
 
     if members = @resource.should(:members)
       unless members == :absent
+        if members.is_a?(Array)
+          members = members.join(",")
+        end
         cmd << "-M" << members
       end
     end
@@ -39,6 +39,10 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
   end
 
   def modifycmd(param, value)
+    # members may be an array, need a comma separated list
+    if param == :members and value.is_a?(Array)
+      value = value.join(",")
+    end
     super(param, value)
   end
 end