puppet 6.4.4-universal-darwin → 6.4.5-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dd4ef7b5a057b03a738a7fa1539ff575df455bbfa76539725dc2180287b6ac1
-  data.tar.gz: 1d1046c2c733c7c94bc633ce95a21d02a7e4a94ded83b3ffd2c4210aa4e079b6
+  metadata.gz: 6cb125300310704ec95a54c6bcf1e195ed8d0aa6ca03f6171a6e30cea6b6f61b
+  data.tar.gz: b76664e8a7f316dcc2367f426253a6592b369a157610c1dbcac9ba41c1089fff
 SHA512:
-  metadata.gz: 1a23a885b450a63b64cce6b168b88b58d949780bb8e261e2f5bab522860578dc33a3a7c8d29352c46002229d12292bbd486d5b79c3c7688cac5aea00ea8446da
-  data.tar.gz: 5d8bb617053c42a3b473ecfe95552641be348a44aa95ea7a021aec0e0c8a3d1a0f779d188a1ade227a7297ae714c6300143dd30f0017362e878d52b7b7eac8c6
+  metadata.gz: 2eeb6fb7b242abceb8ccd7e7cd6c52d740cb065298d0bf34c5f6d16c706983b78d54f6d4da121e809495a87213936bd6fc21367541ffb1ba6d10db068f8a270e
+  data.tar.gz: 4e29b2278d891d545ac9996a9dc183bfb538ba70497c4a542fbdc6eac6955d89b2e65b98af2f34de56acb3345ec23ecdb3eb183b3316982138ae54b7d0c4c788

data/CODEOWNERS

@@ -1,5 +1,5 @@
 # default to platform-core
-* @puppetlabs/platform-core
+* @puppetlabs/platform-core @puppetlabs/puppetserver-maintainers
 
 # Night's Watch
 /lib/puppet/type/group @puppetlabs/night-s-watch

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]
@@ -40,8 +40,8 @@ group(:test) do
   gem "rspec", "~> 3.1", require: false
   gem "rspec-its", "~> 1.1", require: false
   gem "rspec-collection_matchers", "~> 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]
@@ -66,7 +66,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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.4.4)
+    puppet (6.4.5)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -22,23 +22,25 @@ GEM
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    csv (3.1.2)
     diff-lcs (1.3)
+    docopt (0.6.1)
     facter (2.5.6)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gettext-setup (0.31)
+    gettext-setup (0.34)
       fast_gettext (~> 1.1.0)
-      gettext (>= 3.0.2)
+      gettext (>= 3.0.2, < 3.3.0)
       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)
@@ -48,52 +50,56 @@ GEM
     method_source (0.9.2)
     minitar (0.9)
     msgpack (1.3.1)
-    multi_json (1.13.1)
-    mustache (1.1.0)
+    multi_json (1.14.1)
+    mustache (1.1.1)
     optimist (3.0.0)
-    packaging (0.99.44)
+    packaging (0.99.52)
       artifactory (~> 2)
       rake (>= 12.3)
-    parallel (1.18.0)
-    parser (2.6.5.0)
+      release-metrics
+    parallel (1.19.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     puppet-resource_api (1.8.7)
       hocon (>= 1.0)
-    puppetserver-ca (1.4.0)
+    puppetserver-ca (1.5.0)
       facter (>= 2.0.1, < 4)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
     rake (12.3.3)
     rdiscount (2.2.0.1)
-    rdoc (6.2.0)
+    rdoc (6.2.1)
+    release-metrics (1.1.0)
+      csv
+      docopt
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.6)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.2)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -103,18 +109,18 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (1.0.0)
+    ruby-prof (1.1.0)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     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
-    yard (0.9.20)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -144,8 +150,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/build_defaults.yaml

@@ -16,3 +16,4 @@ apt_signing_server: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 tar_host: 'downloads.puppetlabs.com'
+nonfinal_gem_path: '/opt/repository-nightlies/downloads/gems/puppet6-nightly'

data/ext/cert_inspector

@@ -75,15 +75,15 @@ class X509Collector
       end
     when OpenSSL::X509::Certificate
       signature_desc = who_signed(meaning, key_names, keys)
-      "Certificate assigning name #{meaning.subject.to_s} to #{key_names[meaning.public_key.to_s]}\n    serial number #{meaning.serial}\n    issued by #{meaning.issuer.to_s}\n    signed by #{signature_desc}"
+      "Certificate assigning name #{meaning.subject} to #{key_names[meaning.public_key.to_s]}\n    serial number #{meaning.serial}\n    issued by #{meaning.issuer}\n    signed by #{signature_desc}"
     when OpenSSL::X509::Request
       signature_desc = who_signed(meaning, key_names, keys)
-      "Certificate request for #{meaning.subject.to_s} having key #{key_names[meaning.public_key.to_s]}\n    signed by #{signature_desc}"
+      "Certificate request for #{meaning.subject} having key #{key_names[meaning.public_key.to_s]}\n    signed by #{signature_desc}"
     when OpenSSL::X509::CRL
       signature_desc = who_signed(meaning, key_names, keys)
       revoked_serial_numbers = meaning.revoked.map { |r| r.serial }
       revoked_desc = if revoked_serial_numbers.count > 0 then "serial numbers #{revoked_serial_numbers.inspect}" else "nothing" end
-      "Certificate revocation list revoking #{revoked_desc}\n    issued by #{meaning.issuer.to_s}\n    signed by #{signature_desc}"
+      "Certificate revocation list revoking #{revoked_desc}\n    issued by #{meaning.issuer}\n    signed by #{signature_desc}"
     else
       "Unknown"
     end

data/ext/puppet-test

@@ -435,9 +435,9 @@ begin
             when "--node"
                 $options[:nodes] << arg
             when "--list"
-                Suite.suites.sort { |a,b| a.to_s <=> b.to_s }.each do |suite_name|
+                Suite.suites.sort_by(&:to_s).each do |suite_name|
                     suite = Suite[suite_name]
-                    tests = suite.tests.sort { |a,b| a.to_s <=> b.to_s }.join(", ")
+                    tests = suite.tests.sort_by(&:to_s).join(", ")
                     puts "%20s: %s" % [suite_name, tests]
                 end
                 exit(0)

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

@@ -15,6 +15,7 @@ class WindowsDaemon < Win32::Daemon
 
   @run_thread = nil
   @LOG_TO_FILE = false
+  @loglevel = 0
   LOG_FILE =  File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
   LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
   LEVELS.each do |level|
@@ -37,7 +38,9 @@ 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__), '..'))
+
+    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    load_env(base_dir)
 
     # 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 +57,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 +160,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 +175,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 +187,29 @@ class WindowsDaemon < Win32::Daemon
 
     LEVELS.index(cmdline_debug ? cmdline_debug : loglevel.to_sym)
   end
+
+  private
+
+  def load_env(base_dir)
+    begin
+      # 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']}"
+    rescue => e
+      log_exception(e)
+    end
+  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/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/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