puppet 5.5.6 → 5.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a7778617cb9cf5d0e6be73d57897e99c96a12505557b39f042b16f02b168bf
-  data.tar.gz: 17f9b2b1f7318506ad5923a57c663d4d396cff2d9793110072dec9605cfa9499
+  metadata.gz: 0cceb57d43e4649d9d87857816df85b524c45d3004bb5a969d60d4de64b404e6
+  data.tar.gz: 280065891b1ef83fab160ab18b617bf8a887ccb57071279397f64c8078b4c5f9
 SHA512:
-  metadata.gz: b653525202e2b80017a4fff320af1fa2b61000f313eed564174039329b775194cea7f0cd309185091ff8a9478fbd65bbbad98544bda766e907ef0e5721836956
-  data.tar.gz: dac01b8c243998b1a03618bb8b8c3cf0978daeef463f94f307f86ed1b4be20bfaf743554eefe66a9ae5d6873a6474b8b6ab9fdeb4bb48f4f6ca073cf0e73f9eb
+  metadata.gz: e25e640aad21a48ba030c166014d555394ac225131d01c49817ca28c5534153d795ae2b58f53632a2e373742eaa13ca11c88ed0614787da6343fdb73dfa4c330
+  data.tar.gz: 4d3749159a0a3ce8db3913f269d3ad9d219f511e57d887c06a4a1dce4887697c0cb1184546958d9e1a4aed940c01cef73b193757ce3d5186d32aebc15111a7cc

data/Gemfile

@@ -39,7 +39,9 @@ group(:development, :test) do
   # be removed here *yet* due to TravisCI / AppVeyor which call:
   # bundle install --without development
   # PUP-7433 describes work necessary to restructure this
-  gem "rake", '~> 12.2.1', :require => false
+  gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 12.2.1') if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
+  gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 12.2') if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0') # rubocop:disable Bundler/DuplicatedGem
+
   gem "rspec", "~> 3.1", :require => false
   gem "rspec-its", "~> 1.1", :require => false
   gem "rspec-collection_matchers", "~> 1.1", :require => false

data/Gemfile.lock

@@ -33,28 +33,28 @@ GEM
       gettext (>= 3.0.2)
       locale
     hashdiff (0.3.7)
-    hiera (3.4.3)
+    hiera (3.4.5.13)
     hiera-eyaml (2.1.0)
       highline (~> 1.6.19)
       trollop (~> 2.0)
     highline (1.6.21)
     hocon (1.2.5)
     hpricot (0.8.6)
-    json-schema (2.8.0)
+    json-schema (2.8.1)
       addressable (>= 2.4)
     locale (2.1.2)
-    memory_profiler (0.9.11)
+    memory_profiler (0.9.12)
     metaclass (0.0.4)
     method_source (0.9.0)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     msgpack (1.2.4)
     multi_json (1.13.1)
-    mustache (1.0.5)
+    mustache (1.1.0)
     net-ssh (4.2.0)
-    packaging (0.99.8)
+    packaging (0.99.14)
       artifactory
-      rake (~> 12.2.1)
+      rake (~> 12.3)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)
@@ -74,7 +74,7 @@ GEM
     racc (1.4.9)
     rack (1.6.10)
     rainbow (2.1.0)
-    rake (12.2.1)
+    rake (12.3.1)
     rdiscount (2.2.0.1)
     rdoc (4.3.0)
     redcarpet (2.3.0)
@@ -90,7 +90,7 @@ GEM
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-its (1.2.0)
@@ -101,7 +101,7 @@ GEM
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-puppet (2.6.15)
+    rspec-puppet (2.7.1)
       rspec
     rspec-support (3.8.0)
     rubocop (0.49.1)
@@ -117,7 +117,7 @@ GEM
     ruby-progressbar (1.10.0)
     safe_yaml (1.0.4)
     text (1.3.1)
-    trollop (2.1.3)
+    trollop (2.9.9)
     unicode-display_width (1.4.0)
     vcr (2.9.3)
     webmock (1.24.6)
@@ -147,7 +147,7 @@ DEPENDENCIES
   racc (= 1.4.9)
   rack (~> 1.4)
   rainbow (< 2.2.1)
-  rake (~> 12.2.1)
+  rake (~> 12.2)
   rdoc (~> 4.1)
   redcarpet (~> 2.0)
   ronn (~> 0.7.3)
@@ -164,4 +164,4 @@ DEPENDENCIES
   yarjuf (~> 2.0)
 
 BUNDLED WITH
-   1.16.2
+   1.16.5

data/Rakefile

@@ -30,6 +30,15 @@ rescue LoadError => e
   puts "Error loading packaging rake tasks: #{e}"
 end
 
+namespace :package do
+  task :bootstrap do
+    puts 'Bootstrap is no longer needed, using packaging-as-a-gem'
+  end
+  task :implode do
+    puts 'Implode is no longer needed, using packaging-as-a-gem'
+  end
+end
+
 task :default do
   sh %{rake -T}
 end

data/lib/puppet/application.rb

@@ -388,6 +388,8 @@ class Application
   end
 
   def setup_logs
+    handle_logdest_arg(Puppet[:logdest])
+
     unless options[:setdest]
       if options[:debug] || options[:verbose]
         Puppet::Util::Log.newdestination(:console)
@@ -409,7 +411,10 @@ class Application
   end
 
   def handle_logdest_arg(arg)
+    return if options[:setdest] || arg.nil?
+
     begin
+      Puppet[:logdest] = arg
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail

data/lib/puppet/application/apply.rb

@@ -312,6 +312,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
+    handle_logdest_arg(Puppet[:logdest])
     Puppet::Util::Log.newdestination(:console) unless options[:setdest]
 
     Signal.trap(:INT) do

data/lib/puppet/application/master.rb

@@ -211,20 +211,22 @@ Copyright (c) 2012 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
   def setup_logs
     set_log_level
+    handle_logdest_arg(Puppet[:logdest])
 
-    if !options[:setdest]
+    unless options[:setdest]
       if options[:node]
-        # We are compiling a catalog for a single node with '--compile' and logging
-        # has not already been configured via '--logdest' so log to the console.
+        # We are compiling a catalog for a single node with '--compile' and a
+        # logging destination has not already been explicitly specified.
         Puppet::Util::Log.newdestination(:console)
       elsif !(Puppet[:daemonize] or options[:rack])
         # We are running a webrick master which has been explicitly foregrounded
-        # and '--logdest' has not been passed, assume users want to see logging
-        # and log to the console.
+        # and a logging destination has not already been explicitly specified,
+        # assume users want to see logging and log to the console.
         Puppet::Util::Log.newdestination(:console)
       else
-        # No explicit log destination has been given with '--logdest' and we're
-        # either a daemonized webrick master or running under rack, log to syslog.
+        # No explicit log destination has been given with '--logdest', or via settings,
+        # and we're either a daemonized webrick master or running under rack, log to
+        # syslog.
         Puppet::Util::Log.newdestination(:syslog)
       end
     end

data/lib/puppet/application/script.rb

@@ -229,9 +229,9 @@ Copyright (c) 2017 Puppet Inc., LLC Licensed under the Apache 2.0 License
   end
 
   def setup
-
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
+    handle_logdest_arg(Puppet[:logdest])
     Puppet::Util::Log.newdestination(:console) unless options[:setdest]
 
     Signal.trap(:INT) do

data/lib/puppet/defaults.rb

@@ -974,6 +974,15 @@ EOT
           }
         end
       end
+    },
+    :logdest => {
+      :type      => :string,
+      :desc      => "Where to send log messages. Choose between 'syslog' (the POSIX syslog
+      service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
+      file."
+      # Sure would be nice to set the Puppet::Util::Log destination here in an :on_initialize_and_write hook,
+      # unfortunately we have a large number of tests that rely on the logging not resetting itself when the
+      # settings are initialized as they test what gets logged during settings initialization.
     }
   )
 
@@ -981,8 +990,7 @@ EOT
     :ca,
     :ca_name => {
       :default    => "Puppet CA: $certname",
-      :desc       => "The name to use the Certificate Authority certificate. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc       => "The name to use the Certificate Authority certificate.",
     },
     :cadir => {
       :default => "$ssldir/ca",
@@ -990,8 +998,7 @@ EOT
       :owner => "service",
       :group => "service",
       :mode => "0755",
-      :desc => "The root directory for the certificate authority. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "The root directory for the certificate authority.",
     },
     :cacert => {
       :default => "$cadir/ca_crt.pem",
@@ -999,8 +1006,7 @@ EOT
       :owner => "service",
       :group => "service",
       :mode => "0644",
-      :desc => "The CA certificate. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "The CA certificate.",
     },
     :cakey => {
       :default => "$cadir/ca_key.pem",
@@ -1008,8 +1014,7 @@ EOT
       :owner => "service",
       :group => "service",
       :mode => "0640",
-      :desc => "The CA private key. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "The CA private key.",
     },
     :capub => {
       :default => "$cadir/ca_pub.pem",
@@ -1017,8 +1022,7 @@ EOT
       :owner => "service",
       :group => "service",
       :mode => "0644",
-      :desc => "The CA public key. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "The CA public key.",
     },
     :cacrl => {
       :default => "$cadir/ca_crl.pem",
@@ -1026,8 +1030,7 @@ EOT
       :owner => "service",
       :group => "service",
       :mode => "0644",
-      :desc => "The certificate revocation list (CRL) for the CA. Will be used if present but otherwise ignored. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "The certificate revocation list (CRL) for the CA. Will be used if present but otherwise ignored.",
     },
     :caprivatedir => {
       :default => "$cadir/private",
@@ -1036,7 +1039,9 @@ EOT
       :group => "service",
       :mode => "0750",
       :desc => "Where the CA stores private certificate information. This setting is deprecated and will be removed in Puppet 6.",
-      :deprecated => :completely,
+      :hook => proc do |value|
+        Puppet.deprecation_warning(_("The 'caprivatedir' setting is deprecated and will be removed in Puppet 6."))
+      end,
     },
     :csrdir => {
       :default => "$cadir/requests",
@@ -1044,8 +1049,7 @@ EOT
       :owner => "service",
       :group => "service",
       :mode  => "0755",
-      :desc => "Where the CA stores certificate requests. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "Where the CA stores certificate requests.",
     },
     :signeddir => {
       :default => "$cadir/signed",
@@ -1053,8 +1057,7 @@ EOT
       :owner => "service",
       :group => "service",
       :mode => "0755",
-      :desc => "Where the CA stores signed certificates. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "Where the CA stores signed certificates.",
     },
     :capass => {
       :default => "$caprivatedir/ca.pass",
@@ -1063,7 +1066,9 @@ EOT
       :group => "service",
       :mode => "0640",
       :desc => "Where the CA stores the password for the private key. This setting is deprecated and will be removed in Puppet 6.",
-      :deprecated => :completely,
+      :hook => proc do |value|
+        Puppet.deprecation_warning(_("The 'caprivatedir' setting is deprecated and will be removed in Puppet 6."))
+      end,
     },
     :serial => {
       :default => "$cadir/serial",
@@ -1071,17 +1076,13 @@ EOT
       :owner => "service",
       :group => "service",
       :mode => "0644",
-      :desc => "Where the serial number for certificates is stored. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc => "Where the serial number for certificates is stored.",
     },
     :autosign => {
       :default => "$confdir/autosign.conf",
       :type => :autosign,
-      :deprecated => :completely,
       :desc => "Whether (and how) to autosign certificate requests. This setting
         is only relevant on a puppet master acting as a certificate authority (CA).
-        This setting is also deprecated and will be replaced by one in Puppet Server's
-        configs in Puppet 6.
 
         Valid values are true (autosigns all certificate requests; not recommended),
         false (disables autosigning certificates), or the absolute path to a file.
@@ -1108,15 +1109,13 @@ EOT
     :allow_duplicate_certs => {
       :default    => false,
       :type       => :boolean,
-      :desc       => "Whether to allow a new certificate request to overwrite an existing certificate. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      :desc       => "Whether to allow a new certificate request to overwrite an existing certificate.",
     },
     :ca_ttl => {
       :default    => "5y",
       :type       => :duration,
       :desc       => "The default TTL for new certificates.
-      #{AS_DURATION} This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+      #{AS_DURATION}",
     },
     :keylength => {
       :default    => 4096,
@@ -1129,8 +1128,7 @@ EOT
       :owner => "service",
       :group => "service",
       :desc => "The inventory file. This is a text file to which the CA writes a
-        complete listing of all certificates. This setting is deprecated and will be replaced by one in Puppet Server's configs in Puppet 6.",
-      :deprecated => :completely,
+        complete listing of all certificates.",
     }
   )
 
@@ -1464,7 +1462,20 @@ EOT
         with the running configuration.  In the case of puppet master,
         this file reflects the state discovered through interacting
         with clients."
-      },
+    },
+    :statettl => {
+      :default => "32d",
+      :type    => :ttl,
+      :desc    => "How long the Puppet agent should cache when a resource was last checked or synced.
+      #{AS_DURATION}
+      A value of `0` or `unlimited` will disable cache pruning.
+
+      This setting affects the usage of `schedule` resources, as the information
+      about when a resource was last checked (and therefore when it needs to be
+      checked again) is stored in the `statefile`. The `statettl` needs to be
+      large enough to ensure that a resource will not trigger multiple times
+      during a schedule due to its entry expiring from the cache."
+    },
     :transactionstorefile => {
       :default => "$statedir/transactionstore.yaml",
       :type => :file,
@@ -1805,7 +1816,16 @@ EOT
       Regardless of this setting's value, Puppet will always obey explicit
       dependencies set with the before/require/notify/subscribe metaparameters
       and the `->`/`~>` chaining arrows; this setting only affects the relative
-      ordering of _unrelated_ resources."
+      ordering of _unrelated_ resources.
+
+      This setting is deprecated, and will always have a value of `manifest` in
+      6.0 and up.",
+      :call_hook => :on_initialize_and_write,
+      :hook => proc { |value|
+        if value != "manifest"
+          Puppet.deprecation_warning(_('Setting %{name} is deprecated.') % { name: 'ordering' }, 'setting-ordering')
+        end
+      }
     }
   )
 

data/lib/puppet/etc.rb

@@ -103,6 +103,26 @@ module Puppet::Etc
       override_field_values_to_utf8(::Etc.getpwuid(id))
     end
 
+    # Etc::group returns a Ruby iterator that executes a block for
+    # each entry in the /etc/group file. The code-block is passed
+    # a Group struct. See getgrent above for more details.
+    def group
+      # The implementation here duplicates the logic in https://github.com/ruby/etc/blob/master/ext/etc/etc.c#L523-L537
+      # Note that we do not call ::Etc.group directly, because we
+      # want to use our wrappers for methods like getgrent, setgrent,
+      # endgrent, etc.
+      return getgrent unless block_given?
+
+      setgrent
+      begin
+        while cur_group = getgrent
+          yield cur_group
+        end
+      ensure
+        endgrent
+      end
+    end
+
     private
 
     # @api private

data/lib/puppet/file_serving/fileset.rb

@@ -122,7 +122,7 @@ class Puppet::FileServing::Fileset
     def children
       return [] unless directory?
 
-      Dir.entries(path).
+      Dir.entries(path, encoding: Encoding::UTF_8).
         reject { |child| ignore?(child) }.
         collect { |child| down_level(child) }
     end

data/lib/puppet/functions.rb

@@ -385,6 +385,7 @@ module Puppet::Functions
     end
   end
 
+
   # Public api methods of the DispatcherBuilder are available within dispatch()
   # blocks declared in a Puppet::Function.create_function() call.
   #
@@ -679,6 +680,128 @@ 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.