puppet 6.10.1 → 6.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428bcd2ac83546e3a664b136e4cc2c0009da9ed3d2f3e34106ab34e72059622f
-  data.tar.gz: 8a65ce1247102bee99541b5aad563819ea627ef9ff980f38c34821175c908d5b
+  metadata.gz: c9c78b91c0c5bcc7c31e47239c9dd73a9f64630eed25caf800c36a770dabdc8a
+  data.tar.gz: 221e916941b66c0355aa14b1271b96a6f10778189fa7ff93cf718c5f710ae55c
 SHA512:
-  metadata.gz: 572d25a4582ec7e5e89e930f6a420fc42938b901d737b9b797adbb9a21196f1286557c4ba55ee067089cf678392a1d7a6e4bdc96a6affa312fde56400dd16f7c
-  data.tar.gz: 25ab2853f59cad59e23f277ee7a99cddd9336ee70d27be1ebe40c96b94446937fca34e97754a7d5c7f86bcc831b83a0876851b2a930a267793350ec3f0dd608b
+  metadata.gz: cde9c9209c8a8e338177d16ecdc412f6737dd7b6f4457e3fcdd43b5d264136872f754e939c6d75002a57244ae0f6f90418dc842deb06f12e59c665396ed92519
+  data.tar.gz: 7a27be17e1bab2e6e74767634d5612276e2c86d8352ef05ea7dded32c372d891d6a513a7feddfd63e67333edb1b85988767448862fddb7516384850a893a80d6

data/Gemfile

@@ -20,7 +20,7 @@ gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.
 
 group(:features) do
   gem 'diff-lcs', '~> 1.3', require: false
-  gem 'hiera-eyaml', require: false
+  gem 'hiera-eyaml', *location_for(ENV['HIERA_EYAML_LOCATION'])
   gem 'hocon', '~> 1.0', require: false
   # requires native libshadow headers/libs
   #gem 'ruby-shadow', '~> 2.5', require: false, platforms: [:ruby]
@@ -39,8 +39,8 @@ group(:test) do
   gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 12.2')
   gem "rspec", "~> 3.1", require: false
   gem "rspec-its", "~> 1.1", require: false
-  gem 'vcr', '~> 2.9', require: false
-  gem 'webmock', '~> 1.24', require: false
+  gem 'vcr', '~> 5.0', require: false
+  gem 'webmock', '~> 3.0', require: false
   gem 'yard', require: false
 
   gem 'rubocop', '~> 0.49', require: false, platforms: [:ruby]
@@ -65,7 +65,7 @@ group(:documentation) do
   gem 'ronn', '~> 0.7.3', require: false, platforms: [:ruby]
 end
 
-if File.exists? "#{__FILE__}.local"
+if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
 

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    puppet (6.10.1)
+    puppet (6.11.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
@@ -24,7 +25,10 @@ GEM
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    csv (3.1.2)
+    deep_merge (1.2.1)
     diff-lcs (1.3)
+    docopt (0.6.1)
     facter (2.5.6)
     fast_gettext (1.1.2)
     gettext (3.2.9)
@@ -35,12 +39,12 @@ GEM
       gettext (>= 3.0.2)
       locale
     hashdiff (1.0.0)
-    hiera (3.5.0)
-    hiera-eyaml (3.0.0)
+    hiera (3.6.0)
+    hiera-eyaml (3.1.1)
       highline (~> 1.6.19)
       optimist
     highline (1.6.21)
-    hocon (1.2.5)
+    hocon (1.3.0)
     hpricot (0.8.6)
     httpclient (2.8.3)
     json-schema (2.8.1)
@@ -50,13 +54,14 @@ GEM
     method_source (0.9.2)
     minitar (0.9)
     msgpack (1.3.1)
-    multi_json (1.14.0)
+    multi_json (1.14.1)
     mustache (1.1.0)
     optimist (3.0.0)
-    packaging (0.99.45)
+    packaging (0.99.48)
       artifactory (~> 2)
       rake (>= 12.3)
-    parallel (1.18.0)
+      release-metrics
+    parallel (1.19.0)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -74,6 +79,9 @@ GEM
     rake (12.3.3)
     rdiscount (2.2.0.1)
     rdoc (6.2.0)
+    release-metrics (1.1.0)
+      csv
+      docopt
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
@@ -109,11 +117,11 @@ GEM
     semantic_puppet (1.0.2)
     text (1.3.1)
     unicode-display_width (1.6.0)
-    vcr (2.9.3)
-    webmock (1.24.6)
+    vcr (5.0.0)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.20)
 
 PLATFORMS
@@ -143,8 +151,8 @@ DEPENDENCIES
   rubocop-i18n (~> 1.2.0)
   ruby-prof (>= 0.16.0)
   semantic_puppet (~> 1.0)
-  vcr (~> 2.9)
-  webmock (~> 1.24)
+  vcr (~> 5.0)
+  webmock (~> 3.0)
   yard
 
 BUNDLED WITH

data/ext/project_data.yaml

@@ -26,6 +26,7 @@ gem_runtime_dependencies:
   httpclient: '~> 2.8'
   puppet-resource_api: '~>1.5'
   concurrent-ruby: '~> 1.0'
+  deep_merge: '~> 1.0'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
@@ -38,7 +39,7 @@ gem_platform_dependencies:
       CFPropertyList: '~> 2.2'
   x86-mingw32:
     gem_runtime_dependencies:
-      ffi: '~> 1.9.25'
+      ffi: ['> 1.9.24', '< 2']
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
       win32-process: '= 0.7.5'
@@ -48,7 +49,7 @@ gem_platform_dependencies:
       minitar: '~> 0.9'
   x64-mingw32:
     gem_runtime_dependencies:
-      ffi: '~> 1.9.25'
+      ffi: ['> 1.9.24', '< 2']
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
       win32-process: '= 0.7.5'

data/ext/regexp_nodes/regexp_nodes.rb

@@ -159,7 +159,7 @@ class ExternalNode
     log("list of patterns for #{filepath}: #{patternlist}")
 
     if matchthis =~ Regexp.union(patternlist)
-      log("matched #{$~.to_s} in #{matchthis}, returning true")
+      log("matched #{$~} in #{matchthis}, returning true")
       return true
 
     else  # hostname didn't match anything in patternlist
@@ -181,7 +181,7 @@ class ExternalNode
       log("Attempting to match [#{@hostname}] in [#{filepath}]")
       if matched_in_patternfile?(filepath,@hostname)
         @classes << patternfile.to_s
-        log("Appended #{patternfile.to_s} to classes instance variable")
+        log("Appended #{patternfile} to classes instance variable")
       end
     end
   end
@@ -198,7 +198,7 @@ class ExternalNode
       log("Attempting to match [#{@hostname}] in [#{filepath}]")
       if matched_in_patternfile?(filepath,@hostname)
         @environment = patternfile.to_s
-        log("Wrote #{patternfile.to_s} to environment instance variable")
+        log("Wrote #{patternfile} to environment instance variable")
       end
     end
   end
@@ -230,7 +230,7 @@ class ExternalNode
         log("Attempting to match [#{@hostname}] in [#{secondlevel}]")
         if matched_in_patternfile?(secondlevel, @hostname)
           @parameters[ parametername.to_s ] = patternfile.to_s
-          log("Set @parameters[#{parametername.to_s}] = #{patternfile.to_s}")
+          log("Set @parameters[#{parametername}] = #{patternfile}")
         end
       end
     end

data/ext/windows/service/daemon.rb

@@ -27,6 +27,9 @@ class WindowsDaemon < Win32::Daemon
   end
 
   def service_main(*argsv)
+    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    load_env(base_dir)
+
     argsv = (argsv << ARGV).flatten.compact
     args = argsv.join(' ')
     @loglevel = LEVELS.index(argsv.index('--debug') ? :debug : :notice)
@@ -37,7 +40,6 @@ class WindowsDaemon < Win32::Daemon
       FileUtils.mkdir_p(File.dirname(LOG_FILE))
       args = args.gsub("--logtofile","")
     end
-    basedir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
     # The puppet installer registers a 'Puppet' event source.  For the moment events will be logged with this key, but
     # it may be a good idea to split the Service and Puppet events later so it's easier to read in the windows Event Log.
@@ -54,25 +56,29 @@ class WindowsDaemon < Win32::Daemon
     #   )
     # end
 
-    puppet = File.join(basedir, 'bin', 'puppet.bat')
-    unless File.exists?(puppet)
+    puppet = File.join(base_dir, 'puppet', 'bin', 'puppet')
+    ruby = File.join(base_dir, 'puppet', 'bin', 'ruby.exe')
+    ruby_puppet_cmd = "\"#{ruby}\" \"#{puppet}\""
+
+    unless File.exist?(puppet)
       log_err("File not found: '#{puppet}'")
       return
     end
     log_debug("Using '#{puppet}'")
 
     cmdline_debug = argsv.index('--debug') ? :debug : nil
-    @loglevel = parse_log_level(puppet, cmdline_debug)
+    @loglevel = parse_log_level(ruby_puppet_cmd, cmdline_debug)
     log_notice('Service started')
 
     service = self
     @run_thread = Thread.new do
       begin
         while service.running? do
-          runinterval = service.parse_runinterval(puppet)
+          runinterval = service.parse_runinterval(ruby_puppet_cmd)
+
           if service.state == RUNNING or service.state == IDLE
             service.log_notice("Executing agent with arguments: #{args}")
-            pid = Process.create(:command_line => "\"#{puppet}\" agent --onetime #{args}", :creation_flags => CREATE_NEW_CONSOLE).process_id
+            pid = Process.create(:command_line => "#{ruby_puppet_cmd} agent --onetime #{args}", :creation_flags => CREATE_NEW_CONSOLE).process_id
             service.log_debug("Process created: #{pid}")
           else
             service.log_debug("Service is paused.  Not invoking Puppet agent")
@@ -153,7 +159,7 @@ class WindowsDaemon < Win32::Daemon
 
   def parse_runinterval(puppet_path)
     begin
-      runinterval = %x{ "#{puppet_path}" agent --configprint runinterval }.to_i
+      runinterval = %x{ #{puppet_path} agent --configprint runinterval }.to_i
       if runinterval == 0
         runinterval = 1800
         log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
@@ -168,7 +174,7 @@ class WindowsDaemon < Win32::Daemon
 
   def parse_log_level(puppet_path,cmdline_debug)
     begin
-      loglevel = %x{ "#{puppet_path}" agent --configprint log_level}.chomp
+      loglevel = %x{ #{puppet_path} agent --configprint log_level}.chomp
       unless loglevel
         loglevel = :notice
         log_err("Failed to determine loglevel, defaulting to #{loglevel}")
@@ -180,6 +186,25 @@ class WindowsDaemon < Win32::Daemon
 
     LEVELS.index(cmdline_debug ? cmdline_debug : loglevel.to_sym)
   end
+
+  private
+
+  def load_env(base_dir)
+    # ENV that uses backward slashes
+    ENV['FACTER_env_windows_installdir'] = base_dir.tr('/', '\\')
+    ENV['PL_BASEDIR'] = base_dir.tr('/', '\\')
+    ENV['PUPPET_DIR'] = File.join(base_dir, 'puppet').tr('/', '\\')
+    ENV['OPENSSL_CONF'] = File.join(base_dir, 'puppet', 'ssl', 'openssl.cnf').tr('/', '\\')
+    ENV['SSL_CERT_DIR'] = File.join(base_dir, 'puppet', 'ssl', 'certs').tr('/', '\\')
+    ENV['SSL_CERT_FILE'] = File.join(base_dir, 'puppet', 'ssl', 'cert.pem').tr('/', '\\')
+    ENV['Path'] = [
+      File.join(base_dir, 'puppet', 'bin'),
+      File.join(base_dir, 'bin'),
+    ].join(';').tr('/', '\\') + ';' + ENV['Path']
+
+    # ENV that uses forward slashes
+    ENV['RUBYLIB'] = "#{File.join(base_dir, 'puppet','lib')};#{ENV['RUBYLIB']}"
+  end
 end
 
 if __FILE__ == $0

data/install.rb

@@ -122,12 +122,12 @@ def check_prereqs
         facter_version = Facter.version.to_f
         if facter_version < MIN_FACTER_VERSION
           puts "Facter version: #{facter_version}; minimum required: #{MIN_FACTER_VERSION}; cannot install"
-          exit (-1)
+          exit(-1)
         end
       end
     rescue LoadError
       puts "Could not load #{pre}; cannot install"
-      exit (-1)
+      exit(-1)
     end
   }
 end
@@ -248,7 +248,7 @@ def prepare_installation
       require 'win32/dir'
     rescue LoadError => e
       puts "Cannot run on Microsoft Windows without the win32-process, win32-dir & win32-service gems: #{e}"
-      exit (-1)
+      exit(-1)
     end
   end
 
@@ -437,13 +437,13 @@ def install_binfile(from, op_file, target)
   if $operatingsystem == "windows" && InstallOptions.batch_files
     installed_wrapper = false
 
-    unless File.extname(from).match(/\.(cmd|bat)/)
-      if File.exists?("#{from}.bat")
+    unless File.extname(from) =~ /\.(cmd|bat)/
+      if File.exist?("#{from}.bat")
         FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
         installed_wrapper = true
       end
 
-      if File.exists?("#{from}.cmd")
+      if File.exist?("#{from}.cmd")
         FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
         installed_wrapper = true
       end

data/lib/puppet.rb

@@ -296,10 +296,18 @@ module Puppet
     @context.rollback(name)
   end
 
+  def self.runtime
+    @runtime
+  end
+
   require 'puppet/node'
 
   # The single instance used for normal operation
   @context = Puppet::Context.new(bootstrap_context)
+
+  require 'puppet/runtime'
+  @runtime = Puppet::Runtime.instance
+  @runtime['http'] = proc { Puppet::HTTP::Client.new }
 end
 
 # This feels weird to me; I would really like for us to get to a state where there is never a "require" statement

data/lib/puppet/application.rb

@@ -183,7 +183,7 @@ class Application
 
     # used to declare code that handle an option
     def option(*options, &block)
-      long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1' ).gsub('-','_')
+      long = options.find { |opt| opt =~ /^--/ }.gsub(/^--(?:\[no-\])?([^ =]+).*$/, '\1' ).tr('-','_')
       fname = "handle_#{long}".intern
       if (block_given?)
         define_method(fname, &block)

data/lib/puppet/application/agent.rb

@@ -160,6 +160,9 @@ the master, the certificate request the master received is the same as
 the one the client sent (to prevent against man-in-the-middle attacks
 when signing certificates).
 
+'--skip_tags' is a flag used to filter resources. If this is set, then
+only resources not tagged with the specified tags will be applied.
+Values must be comma-separated.
 
 OPTIONS
 -------

data/lib/puppet/application/apply.rb

@@ -230,8 +230,8 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
         catalog =
         begin
           Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
-        rescue Puppet::ParseErrorWithIssue, Puppet::Error
-          # already logged and handled by the compiler for these two cases
+        rescue Puppet::Error
+          # already logged and handled by the compiler, including Puppet::ParseErrorWithIssue
           exit(1)
         end
 

data/lib/puppet/application/describe.rb

@@ -64,9 +64,7 @@ class TypeDoc
 
   def list_types
     puts "These are the types known to puppet:\n"
-    @types.keys.sort { |a, b|
-      a.to_s <=> b.to_s
-    }.each do |name|
+    @types.keys.sort_by(&:to_s).each do |name|
       type = @types[name]
       s = type.doc.gsub(/\s+/, " ")
       n = s.index(". ")
@@ -149,18 +147,14 @@ class TypeDoc
   end
 
   def format_providers(type)
-    type.providers.sort { |a,b|
-      a.to_s <=> b.to_s
-    }.each { |prov|
+    type.providers.sort_by(&:to_s).each { |prov|
       puts "\n- **#{prov}**"
       puts @format.wrap(type.provider(prov).doc, :indent => 4, :scrub => true)
     }
   end
 
   def list_providers(type)
-    list = type.providers.sort { |a,b|
-      a.to_s <=> b.to_s
-    }.join(", ")
+    list = type.providers.sort_by(&:to_s).join(", ")
     puts @format.wrap(list, :indent => 4)
   end
 

data/lib/puppet/application/device.rb

@@ -1,6 +1,7 @@
 require 'puppet/application'
 require 'puppet/configurer'
 require 'puppet/util/network_device'
+require 'puppet/ssl/oids'
 
 class Puppet::Application::Device < Puppet::Application
 
@@ -414,6 +415,8 @@ Licensed under the Apache 2.0 License
   def setup
     setup_logs
 
+    Puppet::SSL::Oids.register_puppet_oids
+
     # setup global device-specific defaults; creates all necessary directories, etc
     Puppet.settings.use :main, :agent, :device, :ssl
 

data/lib/puppet/application/doc.rb

@@ -155,7 +155,7 @@ HELP
     with_contents = options[:references].length <= 1
     exit_code = 0
     require 'puppet/util/reference'
-    options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
+    options[:references].sort_by(&:to_s).each do |name|
       section = Puppet::Util::Reference.reference(name)
       raise _("Could not find reference %{name}") % { name: name } unless section
 

data/lib/puppet/application/lookup.rb

@@ -283,7 +283,7 @@ Copyright (c) 2015 Puppet Inc., LLC Licensed under the Apache 2.0 License
           'merge_hash_arrays' => !options[:merge_hash_arrays].nil?}
 
         if options[:prefix]
-          merge_options.merge!({'knockout_prefix' => options[:prefix]})
+          merge_options['knockout_prefix'] = options[:prefix]
         end
 
       else