puppet 5.5.17-x86-mingw32 → 5.5.22-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee6d24c8f1efdc7dc1c9f70069feb76b7326114587b7d422673a619b1aa757a5
-  data.tar.gz: e22ff9442673e6298c6e092ec6f0a7f785a4edfe88626adb1cfa1ab560640f68
+  metadata.gz: b600bc7f2650eda017bfc9cf98f3466e090ff2c3deee40caf2e4e99fa864b3b0
+  data.tar.gz: '08136be1515f88b88e5ce4336b88bc13282547f857ff78e76afeb9ed510a89ad'
 SHA512:
-  metadata.gz: 208b63292f6fb85492c8141c1382916bfc0941ddb5bfcae661fb3fd5830d13e0c09a9c4609b287d47c1fb41fb98a22edfcd446c7e84f2da2c456dc6cb3dd5c70
-  data.tar.gz: e4144a37224f6fc362c759072f050e265e62ba379887428107ca98d19105d8d715f08009ed541e51f01d7762d643f21a9657607007e1cdd0a72bd1a6af305c90
+  metadata.gz: fc967afb8d1271edde40461cfae5db9af8d8a5234bc2e5cb0522f4fd7a76ace73008af8e6c7a52f1918d6eb5000ae0ee9e5b8c4731bb618c8654496b7cc3a316
+  data.tar.gz: ab1170119266dcdc1c20c67eac34018605b1cec21eaf9b6266fade0bff46d627e3d5f31ecddf9687e2943127ece3c7e0a26057cbcff6af14082f0084cf4c001a

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

@@ -72,9 +72,9 @@ group(:development, :test) do
   gem 'addressable', '< 2.5.0'
   # webmock requires hashdiff which requires ruby 2 as of 0.3.9
   gem 'hashdiff', '0.3.8'
-  gem 'webmock', '~> 1.24'
-  gem 'vcr', '~> 2.9'
-  gem "hiera-eyaml", :require => false
+  gem 'webmock', '~> 2.3'
+  gem 'vcr', '~> 5.0'
+  gem "hiera-eyaml", *location_for(ENV['HIERA_EYAML_LOCATION'])
 
   gem 'memory_profiler', :platforms => [:mri_21, :mri_22, :mri_23, :mri_24, :mri_25]
 end
@@ -93,8 +93,7 @@ group(:extra) do
   gem "msgpack", :require => false
 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 (5.5.17)
+    puppet (5.5.22)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -17,95 +17,100 @@ GEM
     CFPropertyList (2.3.6)
     addressable (2.4.0)
     artifactory (2.8.2)
-    ast (2.4.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    facter (2.5.6)
+    ast (2.4.1)
+    builder (3.2.4)
+    coderay (1.1.3)
+    crack (0.4.4)
+    csv (3.1.5)
+    diff-lcs (1.4.4)
+    docopt (0.6.1)
+    facter (2.5.7)
     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 (0.3.8)
-    hiera (3.5.0)
-    hiera-eyaml (3.0.0)
+    hiera (3.6.0)
+    hiera-eyaml (3.2.0)
       highline (~> 1.6.19)
       optimist
     highline (1.6.21)
-    hocon (1.2.5)
+    hocon (1.3.1)
     hpricot (0.8.6)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    locale (2.1.2)
+    locale (2.1.3)
     memory_profiler (0.9.14)
-    metaclass (0.0.4)
-    method_source (0.9.2)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
-    msgpack (1.3.1)
-    multi_json (1.13.1)
-    mustache (1.1.0)
+    method_source (1.0.0)
+    mocha (1.11.2)
+    msgpack (1.3.3)
+    multi_json (1.15.0)
+    mustache (1.1.1)
     net-ssh (4.2.0)
-    optimist (3.0.0)
-    packaging (0.99.44)
+    optimist (3.0.1)
+    packaging (0.99.71)
       artifactory (~> 2)
+      csv (= 3.1.5)
       rake (>= 12.3)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
+      release-metrics
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     pathspec (0.2.1)
     powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    puppet-lint (2.3.6)
-    puppet-syntax (2.6.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    puppet-lint (2.4.2)
+    puppet-syntax (3.1.0)
+      puppet (>= 5)
       rake
-    puppetlabs_spec_helper (2.14.1)
+    puppetlabs_spec_helper (2.15.0)
       mocha (~> 1.0)
       pathspec (~> 0.2.1)
       puppet-lint (~> 2.0)
-      puppet-syntax (~> 2.0)
+      puppet-syntax (>= 2.0, < 4)
       rspec-puppet (~> 2.0)
     racc (1.4.9)
-    rack (1.6.11)
+    rack (1.6.13)
     rainbow (2.1.0)
     rake (12.3.3)
-    rdiscount (2.2.0.1)
+    rdiscount (2.2.0.2)
     rdoc (4.3.0)
     redcarpet (2.3.0)
+    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.5)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       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-legacy_formatters (1.0.2)
       rspec (~> 3.0)
-    rspec-mocks (3.8.2)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-puppet (2.7.7)
+      rspec-support (~> 3.9.0)
+    rspec-puppet (2.7.10)
       rspec
-    rspec-support (3.8.3)
+    rspec-support (3.9.3)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -115,17 +120,16 @@ 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.4.1)
     ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
     text (1.3.1)
-    unicode-display_width (1.6.0)
-    vcr (2.9.3)
-    webmock (1.24.6)
+    unicode-display_width (1.7.0)
+    vcr (5.1.0)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.20)
+    yard (0.9.25)
     yarjuf (2.0.0)
       builder
       rspec (~> 3)
@@ -159,8 +163,8 @@ DEPENDENCIES
   rubocop (~> 0.49.1)
   rubocop-i18n (~> 1.2.0)
   ruby-prof (>= 0.16.0)
-  vcr (~> 2.9)
-  webmock (~> 1.24)
+  vcr (~> 5.0)
+  webmock (~> 2.3)
   yard
   yarjuf (~> 2.0)
 

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/puppet5-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').tr('/', '\\')
+    ruby = File.join(base_dir, "sys", "ruby", "bin", "ruby.exe").tr('/', '\\')
+    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,45 @@ 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['FACTERDIR'] = File.join(base_dir, 'facter').tr('/', '\\')
+      ENV['FACTER_env_windows_installdir'] = base_dir.tr('/', '\\')
+      ENV['HIERA_DIR'] = File.join(base_dir, 'hiera').tr('/', '\\')
+      ENV['MCOLLECTIVE_DIR'] = File.join(base_dir, 'mcollective').tr('/', '\\')
+      ENV['PL_BASEDIR'] = base_dir.tr('/', '\\')
+      ENV['PUPPET_DIR'] = File.join(base_dir, 'puppet').tr('/', '\\')
+      ENV['RUBYOPT'] = 'rubygems'
+      ENV['RUBY_DIR'] = File.join(base_dir, 'sys', 'ruby').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, 'facter', 'bin'),
+        File.join(base_dir, 'hiera', 'bin'),
+        File.join(base_dir, 'mcollective', 'bin'),
+        File.join(base_dir, 'bin'),
+        File.join(base_dir, 'sys', 'ruby', 'bin'),
+        File.join(base_dir, 'sys', 'tools', 'bin')
+      ].join(';').tr('/', '\\') + ';' + ENV['Path']
+
+      # ENV that uses forward slashes
+      ENV['RUBYLIB'] = [
+        File.join(base_dir, 'puppet','lib'),
+        File.join(base_dir, 'facter', 'lib'),
+        File.join(base_dir, 'hiera', 'lib'),
+        File.join(base_dir, 'mcollective', 'lib'),
+        ENV['RUBYLIB']
+      ].compact.join(';') + ';'
+    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