puppet 6.4.5-x86-mingw32 → 6.5.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10151200c739292cb056ad3629faa9c9cf37414b0b69ebe043e0429e261c8608
-  data.tar.gz: 9b3c34efca7c7e0eaab580eb667c4432902ffce39e48696879c3792250400ca5
+  metadata.gz: b8ca2d51059fc5a472a81d48065a2d2a722ed3a312e3f6e4cc2e86583c8b82fd
+  data.tar.gz: f1263a9b05c8ee69dfbb9db1cf255fc8771143ba882e54acc1d82aed17a4956f
 SHA512:
-  metadata.gz: f2030fefd25cdae9704ca46de0319ef474075f7cf562731ec3e014f75ddde265927f3aa743a67d5f9f745b42f6186d6d496a1c48b330c631b415eebd97f30c81
-  data.tar.gz: 3c859c0d88b10e60d2a6621ace16752d02fb02cfad0a532bce30e84ef19aba3e15d9300560ad06b84f76c4f608423133f5f1b8e35f0e3750541680f999d1481d
+  metadata.gz: 7f3235066b08076b626e312f516e19c0c1d3daf43b8fb45af672a96d6e2b296aa29c6d551cb5cb04ecb9702fa555db08719e42881a057af8ad3c8d37f2d0dff0
+  data.tar.gz: 166ecacc0140a26036d9b54fdeaae536636463db5dd97c884fed2a9267f92eb4abed2fabca287abc1baea068d3df869972007c00bd166769f4063a8e09db38f9

data/CODEOWNERS

@@ -1,15 +1,15 @@
 # default to platform-core
-* @puppetlabs/platform-core @puppetlabs/puppetserver-maintainers
+* @puppetlabs/platform-core
 
-# Night's Watch
-/lib/puppet/type/group @puppetlabs/night-s-watch
-/lib/puppet/type/package @puppetlabs/night-s-watch
-/lib/puppet/type/service @puppetlabs/night-s-watch
-/lib/puppet/type/user @puppetlabs/night-s-watch
-/lib/puppet/provider/group @puppetlabs/night-s-watch
-/lib/puppet/provider/package @puppetlabs/night-s-watch
-/lib/puppet/provider/service @puppetlabs/night-s-watch
-/lib/puppet/provider/user @puppetlabs/night-s-watch
+# platform-os
+/lib/puppet/type/group @puppetlabs/platform-os
+/lib/puppet/type/package @puppetlabs/platform-os
+/lib/puppet/type/service @puppetlabs/platform-os
+/lib/puppet/type/user @puppetlabs/platform-os
+/lib/puppet/provider/group @puppetlabs/platform-os
+/lib/puppet/provider/package @puppetlabs/platform-os
+/lib/puppet/provider/service @puppetlabs/platform-os
+/lib/puppet/provider/user @puppetlabs/platform-os
 
 # language
 /lib/puppet/datatypes @puppetlabs/language

data/Gemfile

@@ -20,11 +20,11 @@ gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.
 
 group(:features) do
   gem 'diff-lcs', '~> 1.3', require: false
-  gem 'hiera-eyaml', *location_for(ENV['HIERA_EYAML_LOCATION'])
+  gem 'hiera-eyaml', require: false
   gem 'hocon', '~> 1.0', require: false
   # requires native libshadow headers/libs
-  #gem 'ruby-shadow', '~> 2.5', require: false, platforms: [:ruby]
-  gem 'minitar', '~> 0.9', require: false
+  # gem 'libshadow', '~> 1.0', require: false, platforms: [:ruby]
+  gem 'minitar', '~> 0.6', require: false
   gem 'msgpack', '~> 1.2', require: false
   gem 'rdoc', '~> 6.0', require: false, platforms: [:ruby]
   # requires native augeas headers/libs
@@ -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', '~> 5.0', require: false
-  gem 'webmock', '~> 3.0', require: false
+  gem 'vcr', '~> 2.9', require: false
+  gem 'webmock', '~> 1.24', 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.exist? "#{__FILE__}.local"
+if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    puppet (6.4.5)
+    puppet (6.5.0)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
-      fast_gettext (~> 1.1.2)
+      fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
       httpclient (~> 2.8)
       locale (~> 2.1)
@@ -15,91 +15,85 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     artifactory (2.8.2)
     ast (2.4.0)
     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)
+    facter (2.5.1)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gettext-setup (0.34)
+    gettext-setup (0.30)
       fast_gettext (~> 1.1.0)
-      gettext (>= 3.0.2, < 3.3.0)
+      gettext (>= 3.0.2)
       locale
-    hashdiff (1.0.0)
-    hiera (3.6.0)
-    hiera-eyaml (3.1.1)
+    hashdiff (0.4.0)
+    hiera (3.5.0)
+    hiera-eyaml (3.0.0)
       highline (~> 1.6.19)
       optimist
     highline (1.6.21)
-    hocon (1.3.0)
+    hocon (1.2.5)
     hpricot (0.8.6)
     httpclient (2.8.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
     locale (2.1.2)
-    memory_profiler (0.9.14)
+    memory_profiler (0.9.13)
     method_source (0.9.2)
-    minitar (0.9)
-    msgpack (1.3.1)
-    multi_json (1.14.1)
-    mustache (1.1.1)
+    minitar (0.8)
+    msgpack (1.2.10)
+    multi_json (1.13.1)
+    mustache (1.1.0)
     optimist (3.0.0)
-    packaging (0.99.52)
+    packaging (0.99.35)
       artifactory (~> 2)
-      rake (>= 12.3)
-      release-metrics
-    parallel (1.19.1)
-    parser (2.7.0.2)
+      rake (~> 12.3)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       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.3)
-    puppet-resource_api (1.8.7)
+    public_suffix (3.1.0)
+    puppet-resource_api (1.8.3)
       hocon (>= 1.0)
-    puppetserver-ca (1.5.0)
+    puppetserver-ca (1.3.1)
       facter (>= 2.0.1, < 4)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
-    rake (12.3.3)
+    rake (12.3.2)
     rdiscount (2.2.0.1)
-    rdoc (6.2.1)
-    release-metrics (1.1.0)
-      csv
-      docopt
+    rdoc (6.1.1)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    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 (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-collection_matchers (1.1.3)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.8.1)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.8.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -109,18 +103,18 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (1.1.0)
+    ruby-prof (0.18.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 (5.0.0)
-    webmock (3.7.6)
+    vcr (2.9.3)
+    webmock (1.24.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.24)
+      hashdiff
+    yard (0.9.19)
 
 PLATFORMS
   ruby
@@ -132,7 +126,7 @@ DEPENDENCIES
   hocon (~> 1.0)
   json-schema (~> 2.0)
   memory_profiler
-  minitar (~> 0.9)
+  minitar (~> 0.6)
   msgpack (~> 1.2)
   packaging (~> 0.99)
   pry
@@ -150,9 +144,9 @@ DEPENDENCIES
   rubocop-i18n (~> 1.2.0)
   ruby-prof (>= 0.16.0)
   semantic_puppet (~> 1.0)
-  vcr (~> 5.0)
-  webmock (~> 3.0)
+  vcr (~> 2.9)
+  webmock (~> 1.24)
   yard
 
 BUNDLED WITH
-   1.17.3
+   1.16.5

data/ext/build_defaults.yaml

@@ -16,4 +16,3 @@ 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/project_data.yaml

@@ -20,7 +20,7 @@ gem_runtime_dependencies:
   facter: ['> 2.0.1', '< 4']
   hiera: ['>= 3.2.1', '< 4']
   semantic_puppet: '~> 1.0'
-  fast_gettext: '~> 1.1.2'
+  fast_gettext: '~> 1.1'
   locale: '~> 2.1'
   multi_json: '~> 1.10'
   httpclient: '~> 2.8'
@@ -44,7 +44,7 @@ gem_platform_dependencies:
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
       win32-service: '= 0.8.8'
-      minitar: '~> 0.9'
+      minitar: '~> 0.6.1'
   x64-mingw32:
     gem_runtime_dependencies:
       ffi: '~> 1.9.25'
@@ -54,7 +54,7 @@ gem_platform_dependencies:
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
       win32-service: '= 0.8.8'
-      minitar: '~> 0.9'
+      minitar: '~> 0.6.1'
 bundle_platforms:
   universal-darwin: all
   x86-mingw32: mingw

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 #{$~} in #{matchthis}, returning true")
+      log("matched #{$~.to_s} 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 classes instance variable")
+        log("Appended #{patternfile.to_s} 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 environment instance variable")
+        log("Wrote #{patternfile.to_s} 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}] = #{patternfile}")
+          log("Set @parameters[#{parametername.to_s}] = #{patternfile.to_s}")
         end
       end
     end

data/ext/solaris/smf/puppet.xml

@@ -28,8 +28,6 @@
 
     <exec_method type="method" name="stop" exec="/lib/svc/method/puppet stop" timeout_seconds="60"/>
 
-    <exec_method type="method" name="refresh" exec=":kill" timeout_seconds="60"/>
-
   <stability value="Evolving"/>
 
     <template>

data/ext/windows/eventlog/Rakefile

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'rake'
+require 'fileutils'
+require 'rbconfig'
+
+BASENAME = "puppetres"
+
+task :default do
+  sh 'rake -T'
+end
+
+desc 'Build puppet eventlog message dll'
+task :dist => ['out', "#{BASENAME}.dll"]
+
+directory 'out'
+
+rule '.rc' => '.mc' do |t|
+  sh "mc -b -r out -h out #{t.source}"
+end
+
+rule '.res' => '.rc' do |t|
+  sh "rc -nologo -r -fo out/#{t.name} out/#{t.source}"
+end
+
+rule '.dll' => '.res' do |t|
+  sh "link -nologo -dll -noentry -machine:x86 -out:out/#{t.name} out/#{t.source}"
+end
+
+desc 'Delete generated files'
+task :clean do
+  FileUtils.rm_rf('out')
+end

data/ext/windows/eventlog/puppetres.mc

@@ -0,0 +1,18 @@
+MessageId=0x1
+SymbolicName=PUPPET_INFO
+Language=English
+%1
+.
+
+MessageId=0x2
+SymbolicName=PUPPET_WARN
+Language=English
+%1
+.
+
+MessageId=0x3
+SymbolicName=PUPPET_ERROR
+Language=English
+%1
+.
+

data/ext/windows/service/daemon.rb

@@ -15,7 +15,6 @@ 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|
@@ -38,9 +37,7 @@ class WindowsDaemon < Win32::Daemon
       FileUtils.mkdir_p(File.dirname(LOG_FILE))
       args = args.gsub("--logtofile","")
     end
-
-    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    load_env(base_dir)
+    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.
@@ -57,29 +54,25 @@ class WindowsDaemon < Win32::Daemon
     #   )
     # end
 
-    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)
+    puppet = File.join(basedir, 'bin', 'puppet.bat')
+    unless File.exists?(puppet)
       log_err("File not found: '#{puppet}'")
       return
     end
     log_debug("Using '#{puppet}'")
 
     cmdline_debug = argsv.index('--debug') ? :debug : nil
-    @loglevel = parse_log_level(ruby_puppet_cmd, cmdline_debug)
+    @loglevel = parse_log_level(puppet, cmdline_debug)
     log_notice('Service started')
 
     service = self
     @run_thread = Thread.new do
       begin
         while service.running? do
-          runinterval = service.parse_runinterval(ruby_puppet_cmd)
-
+          runinterval = service.parse_runinterval(puppet)
           if service.state == RUNNING or service.state == IDLE
             service.log_notice("Executing agent with arguments: #{args}")
-            pid = Process.create(:command_line => "#{ruby_puppet_cmd} agent --onetime #{args}", :creation_flags => CREATE_NEW_CONSOLE).process_id
+            pid = Process.create(:command_line => "\"#{puppet}\" 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")
@@ -160,7 +153,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")
@@ -175,7 +168,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}")
@@ -187,29 +180,6 @@ 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