puppet 6.14.0 → 6.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1216f1f77ee762e957b53119e4b3ece7c58f1bd70c3e0737b9c508a8a81be2
-  data.tar.gz: d24df2321580cf5576069d809557f5ba60668dbd227c1403f602f5d6b99d48f4
+  metadata.gz: 8766d9fc7f4fafabae27f429434e3041ac41640ca787b883ec7d959e08456415
+  data.tar.gz: e17375865d63248f9343b23b643c2d87091b6aa02d07485f4a0432872bb5aa7e
 SHA512:
-  metadata.gz: '09c7f51ea3a5d6b9104d04a7409ef44cc77f0199f51ffe00c0daad6ff4a1f844b9f5d3f359d3b686ec68e546a0343b5d52e8307f03c1bf0385fe4b50af081cf4'
-  data.tar.gz: 334425bf5c64658b01588756ee26a2090e8245f4962c16ab31f85f39809e7fadef3d5d95b84ff6a2bc4b0cc2c3f602fad70887007292bf4664e268866c23d7cd
+  metadata.gz: 06b9cbf96363c563feef3869acbbe55f518e2ed029242a7d04bf073260bd1b8c376e792270f6d93f8f209e15594fd21b7a39db50c746640babb321e373e460ca
+  data.tar.gz: ab56f99c330248009362c77702f83ba404fc2b64e233ba40c4cc1e434c0dc941d2e5bcb4e6899786ac080c7d8827eab671b7a811a554a3840d1c1dd20c01cbb2

data/CODEOWNERS

@@ -11,13 +11,8 @@
 /lib/puppet/provider/service @puppetlabs/night-s-watch
 /lib/puppet/provider/user @puppetlabs/night-s-watch
 
-# language
-/lib/puppet/datatypes @puppetlabs/language
-/lib/puppet/functions @puppetlabs/language
-/lib/puppet/pal @puppetlabs/language
-/lib/puppet/parser @puppetlabs/language
-/lib/puppet/pops @puppetlabs/language
-/lib/puppet/syntax_checkers @puppetlabs/language
+# PAL
+/lib/puppet/pal @puppetlabs/bolt
 
 # puppet device
 /lib/puppet/application/device.rb @puppetlabs/networking

data/Gemfile

@@ -3,9 +3,9 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 gemspec
 
 def location_for(place, fake_version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
+  if place.is_a?(String) && place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { git: $1, branch: $2, require: false }].compact
-  elsif place =~ /^file:\/\/(.*)/
+  elsif place.is_a?(String) && place =~ /^file:\/\/(.*)/
     ['>= 0', { path: File.expand_path($1), require: false }]
   else
     [place, { require: false }]
@@ -19,6 +19,8 @@ gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATIO
 gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
 gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])
 
+gem "scanf" if RUBY_VERSION.to_f >= 2.7
+
 group(:features) do
   gem 'diff-lcs', '~> 1.3', require: false
   gem 'hiera-eyaml', *location_for(ENV['HIERA_EYAML_LOCATION'])

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.14.0)
+    puppet (6.19.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -20,16 +20,17 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     artifactory (2.8.2)
-    ast (2.4.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    csv (3.1.2)
+    ast (2.4.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    crack (0.4.4)
+    csv (3.1.5)
     deep_merge (1.2.1)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docopt (0.6.1)
-    facter (2.5.7)
+    facter (4.0.43)
+      hocon (~> 1.3)
+      thor (>= 1.0.1, < 2.0)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
@@ -44,40 +45,41 @@ GEM
       highline (~> 1.6.19)
       optimist
     highline (1.6.21)
-    hocon (1.3.0)
+    hocon (1.3.1)
     hpricot (0.8.6)
     httpclient (2.8.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
     locale (2.1.3)
     memory_profiler (0.9.14)
-    method_source (0.9.2)
+    method_source (1.0.0)
     minitar (0.9)
     msgpack (1.3.3)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     mustache (1.1.1)
-    optimist (3.0.0)
-    packaging (0.99.58)
+    optimist (3.0.1)
+    packaging (0.99.71)
       artifactory (~> 2)
+      csv (= 3.1.5)
       rake (>= 12.3)
       release-metrics
-    parallel (1.19.1)
-    parser (2.7.0.4)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
     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.12)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    puppet-resource_api (1.8.13)
       hocon (>= 1.0)
-    puppetserver-ca (1.5.0)
-      facter (>= 2.0.1, < 4)
+    puppetserver-ca (1.8.0)
+      facter (>= 2.0.1, < 5)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
     rake (12.3.3)
-    rdiscount (2.2.0.1)
+    rdiscount (2.2.0.2)
     rdoc (6.2.1)
     release-metrics (1.1.0)
       csv
@@ -90,9 +92,9 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    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.9.0)
     rspec-its (1.3.0)
@@ -101,7 +103,7 @@ GEM
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -111,18 +113,18 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (1.3.0)
+    ruby-prof (1.4.1)
     ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
     semantic_puppet (1.0.2)
     text (1.3.1)
-    unicode-display_width (1.6.1)
+    thor (1.0.1)
+    unicode-display_width (1.7.0)
     vcr (5.1.0)
-    webmock (3.8.2)
+    webmock (3.9.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.24)
+    yard (0.9.25)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,7 +1,6 @@
 # Puppet
 
-[![Travis Status](https://travis-ci.com/puppetlabs/puppet.svg?branch=master)](https://travis-ci.com/puppetlabs/puppet)
-[![Appveyor Status](https://ci.appveyor.com/api/projects/status/cvhpypd4504sevqq/branch/master?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet/branch/master)
+![RSpec tests](https://github.com/puppetlabs/puppet/workflows/RSpec%20tests/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/puppet.svg)](https://badge.fury.io/rb/puppet)
 [![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.svg)](https://inch-ci.org/github/puppetlabs/puppet)
 
@@ -25,10 +24,10 @@ which also includes orchestration features, a web console, and professional supp
 The PE documentation is [available here.](https://puppet.com/docs/pe/latest)
 
 To install an open source release of Puppet,
-[see the installation guide on the docs site.](https://puppet.com/docs/puppet/5.5/install_pre.html)
+[see the installation guide on the docs site.](https://puppet.com/docs/puppet/latest/installing_and_upgrading.html)
 
 If you need to run Puppet from source as a tester or developer,
-see the [Running Puppet from Source](https://docs.puppet.com/puppet/3.8/from_source.html) guide on the docs site.
+see the [Quick Start to Developing on Puppet](docs/quickstart.md) guide.
 
 ## Developing and Contributing
 

data/Rakefile

@@ -61,12 +61,8 @@ end
 desc "verify that commit messages match CONTRIBUTING.md requirements"
 task(:commits) do
   # This rake task looks at the summary from every commit from this branch not
-  # in the branch targeted for a PR. This is accomplished by using the
-  # TRAVIS_COMMIT_RANGE environment variable, which is present in travis CI and
-  # populated with the range of commits the PR contains. If not available, this
-  # falls back to `master..HEAD` as a next best bet as `master` is unlikely to
-  # ever be absent.
-  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master..HEAD' : ENV['TRAVIS_COMMIT_RANGE'].sub(/\.\.\./, '..')
+  # in the branch targeted for a PR.
+  commit_range = 'HEAD^..HEAD'
   puts "Checking commits #{commit_range}"
   %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
     # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
@@ -91,12 +87,8 @@ end
 
 desc "verify that changed files are clean of Ruby warnings"
 task(:warnings) do
-  # This rake task looks at all files modified in this branch. This is
-  # accomplished by using the TRAVIS_COMMIT_RANGE environment variable, which
-  # is present in travis CI and populated with the range of commits the PR
-  # contains. If not available, this falls back to `master..HEAD` as a next
-  # best bet as `master` is unlikely to ever be absent.
-  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master...HEAD' : ENV['TRAVIS_COMMIT_RANGE']
+  # This rake task looks at all files modified in this branch.
+  commit_range = 'HEAD^..HEAD'
   ruby_files_ok = true
   puts "Checking modified files #{commit_range}"
   %x{git diff --diff-filter=ACM --name-only #{commit_range}}.each_line do |modified_file|

data/ext/windows/service/daemon.rb

@@ -160,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} config --section agent --log_level notice print runinterval }.to_i
       if runinterval == 0
         runinterval = 1800
         log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
@@ -175,8 +175,8 @@ class WindowsDaemon < Win32::Daemon
 
   def parse_log_level(puppet_path,cmdline_debug)
     begin
-      loglevel = %x{ #{puppet_path} agent --configprint log_level}.chomp
-      unless loglevel
+      loglevel = %x{ #{puppet_path} config --section agent --log_level notice print log_level }.chomp
+      unless loglevel && respond_to?("log_#{loglevel}")
         loglevel = :notice
         log_err("Failed to determine loglevel, defaulting to #{loglevel}")
       end

data/lib/puppet.rb

@@ -1,4 +1,5 @@
 require 'puppet/version'
+require 'puppet/concurrent/synchronized'
 
 if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("2.3.0")
   raise LoadError, "Puppet #{Puppet.version} requires Ruby 2.3.0 or greater, found Ruby #{RUBY_VERSION.dup}."
@@ -6,6 +7,8 @@ end
 
 Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.3.0'
 
+$LOAD_PATH.extend(Puppet::Concurrent::Synchronized)
+
 # see the bottom of the file for further inclusions
 # Also see the new Vendor support - towards the end
 #
@@ -150,21 +153,45 @@ module Puppet
   # @param args [Array<String>] the command line arguments to use for initialization
   # @param require_config [Boolean] controls loading of Puppet configuration files
   # @param global_settings [Boolean] controls push to global context after settings object initialization
+  # @param runtime_implementations [Hash<Symbol, Object>] runtime implementations to register
   # @return [void]
-  def self.initialize_settings(args = [], require_config = true, push_settings_globally = true)
-    do_initialize_settings_for_run_mode(:user, args, require_config, push_settings_globally)
+  def self.initialize_settings(args = [], require_config = true, push_settings_globally = true, runtime_implementations = {})
+    do_initialize_settings_for_run_mode(:user, args, require_config, push_settings_globally, runtime_implementations)
+  end
+
+  def self.vendored_modules
+    dir = Puppet[:vendormoduledir]
+    if dir && File.directory?(dir)
+      Dir.entries(dir)
+        .reject { |f| f =~ /^\./ }
+        .map { |f| File.join(dir, f, "lib") }
+        .select { |d| FileTest.directory?(d) }
+    else
+      []
+    end
   end
+  private_class_method :vendored_modules
+
+  def self.initialize_load_path
+    $LOAD_PATH.unshift(Puppet[:libdir])
+    $LOAD_PATH.concat(vendored_modules)
+  end
+  private_class_method :initialize_load_path
 
   # private helper method to provide the implementation details of initializing for a run mode,
   #  but allowing us to control where the deprecation warning is issued
-  def self.do_initialize_settings_for_run_mode(run_mode, args, require_config = true, push_settings_globally = true)
+  def self.do_initialize_settings_for_run_mode(run_mode, args, require_config, push_settings_globally, runtime_implementations)
     Puppet.settings.initialize_global_settings(args, require_config)
     run_mode = Puppet::Util::RunMode[run_mode]
     Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
     if push_settings_globally
+      initialize_load_path
       push_context_global(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
       Puppet::Parser::Functions.reset
     end
+    runtime_implementations.each_pair do |name, impl|
+      Puppet.runtime[name] = impl
+    end
   end
   private_class_method :do_initialize_settings_for_run_mode
 
@@ -218,10 +245,7 @@ module Puppet
 
     {
       :environments => Puppet::Environments::Cached.new(Puppet::Environments::Combined.new(*loaders)),
-      :http_pool => proc {
-        require 'puppet/network/http'
-        Puppet::Network::HTTP::NoCachePool.new
-      },
+      :http_pool => proc { Puppet.runtime[:http].pool },
       :ssl_context => proc {
         begin
           cert = Puppet::X509::CertProvider.new
@@ -236,8 +260,8 @@ module Puppet
           raise e
         end
       },
-      :ssl_host => proc { Puppet::SSL::Host.localhost },
-      :http_session => proc { Puppet.runtime["http"].create_session },
+      :ssl_host => proc { Puppet::SSL::Host.localhost(true) },
+      :http_session => proc { Puppet.runtime[:http].create_session },
       :plugins => proc { Puppet::Plugins::Configuration.load_plugins },
       :rich_data => false
     }

data/lib/puppet/agent.rb

@@ -43,6 +43,7 @@ class Puppet::Agent
     end
 
     result = nil
+    wait_for_lock_deadline = nil
     block_run = Puppet::Application.controlled_run do
       splay client_options.fetch :splay, Puppet[:splay]
       result = run_in_fork(should_fork) do
@@ -60,16 +61,29 @@ class Puppet::Agent
               end
             end
           rescue Puppet::LockError
-            Puppet.notice _("Run of %{client_class} already in progress; skipping  (%{lockfile_path} exists)") % { client_class: client_class, lockfile_path: lockfile_path }
-            return
+            now = Time.now.to_i
+            wait_for_lock_deadline ||= now + Puppet[:maxwaitforlock]
+
+            if Puppet[:waitforlock] < 1
+              Puppet.notice _("Run of %{client_class} already in progress; skipping  (%{lockfile_path} exists)") % { client_class: client_class, lockfile_path: lockfile_path }
+              nil
+            elsif now >= wait_for_lock_deadline
+              Puppet.notice _("Exiting now because the maxwaitforlock timeout has been exceeded.")
+              nil
+            else
+              Puppet.info _("Another puppet instance is already running; --waitforlock flag used, waiting for running instance to finish.")
+              Puppet.info _("Will try again in %{time} seconds.") % {time: Puppet[:waitforlock]}
+              sleep Puppet[:waitforlock]
+              retry
+            end
           rescue RunTimeoutError => detail
             Puppet.log_exception(detail, _("Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated.") %
               {client_class: client_class,
               runtimeout: Puppet[:runtimeout]})
-            return 1
+            nil
           rescue StandardError => detail
             Puppet.log_exception(detail, _("Could not run %{client_class}: %{detail}") % { client_class: client_class, detail: detail })
-            1
+            nil
           end
         end
       end
@@ -95,11 +109,9 @@ class Puppet::Agent
         atForkHandler.child
         $0 = _("puppet agent: applying configuration")
         begin
-          exit(yield)
-        rescue SystemExit
-          exit(-1)
+          exit(yield || 1)
         rescue NoMemoryError
-          exit(-2)
+          exit(254)
         end
       end
     ensure
@@ -107,12 +119,6 @@ class Puppet::Agent
     end
 
     exit_code = Process.waitpid2(child_pid)
-    case exit_code[1].exitstatus
-    when -1
-      raise SystemExit
-    when -2
-      raise NoMemoryError
-    end
     exit_code[1].exitstatus
   end
 

data/lib/puppet/agent/locker.rb

@@ -27,14 +27,7 @@ module Puppet::Agent::Locker
     end
   end
 
-  # @deprecated
   def running?
-    #TRANSLATORS 'Puppet::Agent::Locker.running?' is a method name and should not be translated
-    message = _('Puppet::Agent::Locker.running? is deprecated as it is inherently unsafe.')
-    #TRANSLATORS 'LockError' should not be translated
-    message += ' ' + _('The only safe way to know if the lock is locked is to try lock and perform some '\
-                       'action and then handle the LockError that may result.')
-    Puppet.deprecation_warning(message)
     lockfile.locked?
   end
 

data/lib/puppet/application/agent.rb

@@ -39,6 +39,7 @@ class Puppet::Application::Agent < Puppet::Application
       :graph => true,
       :fingerprint => false,
       :sourceaddress => nil,
+      :start_time => Time.now,
     }.each do |opt,val|
       options[opt] = val
     end
@@ -102,7 +103,7 @@ USAGE
 puppet agent [--certname <NAME>] [-D|--daemonize|--no-daemonize]
   [-d|--debug] [--detailed-exitcodes] [--digest <DIGEST>] [--disable [MESSAGE]] [--enable]
   [--fingerprint] [-h|--help] [-l|--logdest syslog|eventlog|<ABS FILEPATH>|console]
-  [--masterport <PORT>] [--noop] [-o|--onetime] [--sourceaddress <IP_ADDRESS>] [-t|--test]
+  [--serverport <PORT>] [--noop] [-o|--onetime] [--sourceaddress <IP_ADDRESS>] [-t|--test]
   [-v|--verbose] [-V|--version] [-w|--waitforcert <SECONDS>]
 
 
@@ -257,7 +258,9 @@ generated by running puppet agent with '--genconfig'.
 
 * --job-id:
   Attach the specified job id to the catalog request and the report used for
-  this agent run. This option only works when '--onetime' is used.
+  this agent run. This option only works when '--onetime' is used.  When using
+  Puppet Enterprise this flag should not be used as the orchestrator sets the
+  job-id for you and it must be unique.
 
 * --logdest:
   Where to send log messages. Choose between 'syslog' (the POSIX syslog
@@ -274,8 +277,9 @@ generated by running puppet agent with '--genconfig'.
   format.
 
 * --masterport:
-  The port on which to contact the puppet master.
-  (This is a Puppet setting, and can go in puppet.conf.)
+  The port on which to contact the Puppet Server.
+  (This is a Puppet setting, and can go in puppet.conf.
+  Deprecated in favor of the 'serverport' setting.)
 
 * --noop:
   Use 'noop' mode where the daemon runs in a no-op or dry-run mode. This
@@ -291,6 +295,10 @@ generated by running puppet agent with '--genconfig'.
   (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-'
   prefix for boolean settings on the command line.)
 
+* --serverport:
+  The port on which to contact the Puppet Server.
+  (This is a Puppet setting, and can go in puppet.conf.)
+
 * --sourceaddress:
   Set the source IP address for transactions. This defaults to automatically selected.
   (This is a Puppet setting, and can go in puppet.conf.)
@@ -362,8 +370,17 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       daemon.set_signal_traps
 
       log_config if Puppet[:daemonize]
-      
-      Puppet.override(ssl_context: wait_for_certificates) do
+
+      # run ssl state machine, waiting if needed
+      ssl_context = wait_for_certificates
+
+      # Each application is responsible for pushing loaders onto the context.
+      # Use the current environment that has already been established, though
+      # it may change later during the configurer run.
+      env = Puppet.lookup(:current_environment)
+      Puppet.override(ssl_context: ssl_context,
+                      current_environment: env,
+                      loaders: Puppet::Pops::Loaders.new(env, true)) do
         if Puppet[:onetime]
           onetime(daemon)
         else
@@ -405,7 +422,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
   def onetime(daemon)
     begin
-      exitstatus = daemon.agent.run(:job_id => options[:job_id])
+      exitstatus = daemon.agent.run({:job_id => options[:job_id], :start_time => options[:start_time]})
     rescue => detail
       Puppet.log_exception(detail)
     end
@@ -488,9 +505,8 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
   end
 
   def daemonize_process_when(should_daemonize)
-    daemon = Puppet::Daemon.new(Puppet::Util::Pidlock.new(Puppet[:pidfile]))
+    daemon = Puppet::Daemon.new(@agent, Puppet::Util::Pidlock.new(Puppet[:pidfile]))
     daemon.argv = @argv
-    daemon.agent = @agent
 
     daemon.daemonize if should_daemonize