puppet 8.7.0 → 8.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e483c759c33f8dbfa7ba2e922b401920dbf3b0db1f0187bb52314246ef41f6
-  data.tar.gz: 9bf39c096815fd0e104600c4a0f66e428bfafb882eb15acfc118a9cca4c4c04f
+  metadata.gz: '08fa93960fb1b1b45faf01adeada66909e0e3312ba1de1d90c44aba5812c728b'
+  data.tar.gz: 045f5f6ce8cb20b9c8ed0428a0126e4bf917d0feebc02b70539874586d69bee8
 SHA512:
-  metadata.gz: 5070ae0faf1d73683ba1720b295223165b361e42115cb15b14440c02256e2a4d4c0c2b453fe2f4c3ac1cc82e47027e2b2727642618cfa133900fb2eddb6bf627
-  data.tar.gz: 3dc3525bd0c280c21d017f9fbfff2dd5e91dd059e0ee6061a4866f3164ff49a2daf09d823cf3c2b148b4763b60b13a65b778b667f6ed1889a5fda2003edf759c
+  metadata.gz: 5501e4ef60157bc7d9868ee781ed4f2920f4f91d9f4ec2dc0db42f881414d96351b64506e89fc1a8154f886555c2f82a847d442714edea6350068d1fde6c9906
+  data.tar.gz: 28cd5445dde17a7b25f560161f301e176298b98c5e11e3fb909810a0623ea668be9785fb69ec1199106b814fc42578b8b32fe1d6e2ecee032e85c5d19c55b64f

data/Gemfile

@@ -35,6 +35,7 @@ group(:features) do
   # requires native ldap headers/libs
   # gem 'ruby-ldap', '~> 0.9', require: false, platforms: [:ruby]
   gem 'puppetserver-ca', '~> 2.0', require: false
+  gem 'syslog', '~> 0.1.1', require: false, platforms: [:ruby]
   gem 'CFPropertyList', ['>= 3.0.6', '< 4'], require: false
 end
 
@@ -74,6 +75,8 @@ end
 group(:documentation, optional: true) do
   gem 'gettext-setup', '~> 1.0', require: false, platforms: [:ruby]
   gem 'ronn', '~> 0.7.3', require: false, platforms: [:ruby]
+  gem 'puppet-strings', require: false, platforms: [:ruby]
+  gem 'pandoc-ruby', require: false, platforms: [:ruby]
 end
 
 if File.exist? "#{__FILE__}.local"

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    puppet (8.7.0)
+    puppet (8.9.0)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
       facter (>= 4.3.0, < 5)
-      fast_gettext (>= 2.1, < 3)
+      fast_gettext (>= 2.1, < 4)
+      getoptlong (~> 0.2.0)
       locale (~> 2.1)
       multi_json (~> 1.13)
       puppet-resource_api (~> 1.5)
@@ -19,14 +20,14 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.4)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -37,18 +38,20 @@ GEM
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     docopt (0.6.1)
-    erubi (1.12.0)
-    facter (4.7.0)
+    erubi (1.13.0)
+    facter (4.9.0)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 1.3)
-    faraday (2.9.1)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+    faraday (2.11.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      logger
+    faraday-net_http (3.3.0)
       net-http
     fast_gettext (2.4.0)
       prime
     ffi (1.16.3)
     forwardable (1.3.3)
+    getoptlong (0.2.1)
     gettext (3.4.9)
       erubi
       locale (>= 2.0.5)
@@ -59,22 +62,22 @@ GEM
       fast_gettext (~> 2.1)
       gettext (~> 3.4)
       locale
-    google-apis-core (0.15.0)
+    google-apis-core (0.15.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
-      httpclient (>= 2.8.1, < 3.a)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
     google-apis-iamcredentials_v1 (0.21.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.39.0)
+    google-apis-storage_v1 (0.44.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-core (1.7.0)
+    google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.1.1)
+    google-cloud-env (2.2.0)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
     google-cloud-storage (1.52.0)
@@ -93,7 +96,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    hashdiff (1.1.0)
+    hashdiff (1.1.1)
     hiera-eyaml (4.1.0)
       highline (~> 2.1)
       optimist (~> 3.1)
@@ -104,31 +107,36 @@ GEM
     json (2.7.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     language_server-protocol (3.17.0.3)
     locale (2.1.4)
-    memory_profiler (1.0.1)
+    logger (1.6.1)
+    memory_profiler (1.0.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitar (0.9)
+    minitar (0.12.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     mustache (1.1.1)
+    mutex_m (0.2.0)
     net-http (0.4.1)
       uri
     nkf (0.2.0)
     optimist (3.1.0)
     os (1.1.4)
-    packaging (0.120.0)
+    packaging (0.122.0)
       artifactory (~> 3)
       csv (>= 3.1.5)
       google-cloud-storage
       googleauth
       rake (>= 12.3)
       release-metrics
-    parallel (1.24.0)
-    parser (3.3.2.0)
+      retriable (~> 3.1, >= 3.1.2)
+      rexml
+    pandoc-ruby (2.1.10)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     prime (0.1.2)
@@ -137,9 +145,12 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
     puppet-resource_api (1.9.0)
       hocon (>= 1.0)
+    puppet-strings (4.1.3)
+      rgen (~> 0.9)
+      yard (~> 0.9, < 0.9.37)
     puppetserver-ca (2.7.0)
       facter (>= 2.0.1, < 5)
     racc (1.5.2)
@@ -156,8 +167,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.7)
+    rgen (0.9.1)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
@@ -166,9 +177,9 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
@@ -178,37 +189,36 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.30.0)
+    rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec_rails (2.29.1)
+      rubocop (~> 1.61)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
     scanf (1.0.0)
@@ -219,14 +229,15 @@ GEM
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     singleton (0.2.0)
-    strscan (3.1.0)
+    syslog (0.1.2)
     text (1.3.1)
     thor (1.2.2)
     trailblazer-option (0.1.2)
     uber (0.1.0)
     unicode-display_width (2.5.0)
-    uri (0.13.0)
-    vcr (6.2.0)
+    uri (0.13.1)
+    vcr (6.3.1)
+      base64
     webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -250,9 +261,11 @@ DEPENDENCIES
   minitar (~> 0.9)
   msgpack (~> 1.2)
   packaging (~> 0.113)
+  pandoc-ruby
   pry
   puppet!
   puppet-resource_api (~> 1.5)
+  puppet-strings
   puppetserver-ca (~> 2.0)
   racc (= 1.5.2)
   rake (~> 13.0)
@@ -268,6 +281,7 @@ DEPENDENCIES
   rubocop-rspec (~> 2.0)
   ruby-prof (>= 0.16.0)
   semantic_puppet (~> 1.0)
+  syslog (~> 0.1.1)
   vcr (~> 6.1)
   webmock (~> 3.0)
   webrick (~> 1.7)

data/ext/project_data.yaml

@@ -6,3 +6,15 @@ gem_rdoc_options:
   - --main
   - README.md
   - --line-numbers
+# Array of files to include when building source tarballs
+files:
+  - '[A-Z]*'
+  - install.rb
+  - bin
+  - lib
+  - conf
+  - man
+  - examples
+  - ext
+  - tasks
+  - locales

data/ext/windows/service/daemon.rb

@@ -155,12 +155,19 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
     end
   end
 
+  # Parses runinterval.
+  #
+  # @param puppet_path [String] The file path for the Puppet executable.
+  # @return runinterval [Integer] How often to do a Puppet run, in seconds.
   def parse_runinterval(puppet_path)
     begin
-      runinterval = %x(#{puppet_path} config --section agent --log_level notice print runinterval).to_i
-      if runinterval == 0
+      runinterval = %x(#{puppet_path} config --section agent --log_level notice print runinterval).chomp
+      if runinterval == ''
         runinterval = 1800
         log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
+      else
+        # Use Kernel#Integer because to_i will return 0 with non-numeric strings.
+        runinterval = Integer(runinterval)
       end
     rescue Exception => e
       log_exception(e)

data/install.rb

@@ -36,14 +36,6 @@ require 'tempfile'
 require 'optparse'
 require 'ostruct'
 
-begin
-  require 'rdoc/rdoc'
-  $haverdoc = true
-rescue LoadError
-  puts "Missing rdoc; skipping documentation"
-  $haverdoc = false
-end
-
 PREREQS = %w{openssl facter cgi}
 MIN_FACTER_VERSION = 1.5
 
@@ -140,25 +132,9 @@ def prepare_installation
   InstallOptions.check_prereqs = true
   InstallOptions.batch_files = true
 
-  # Only try to do docs if we're sure they have rdoc
-  if $haverdoc
-    InstallOptions.rdoc  = true
-    InstallOptions.ri  = true
-  else
-    InstallOptions.rdoc  = false
-    InstallOptions.ri  = false
-  end
-
-
   ARGV.options do |opts|
     opts.banner = "Usage: #{File.basename($0)} [options]"
     opts.separator ""
-    opts.on('--[no-]rdoc', 'Prevents the creation of RDoc output.', 'Default on.') do |onrdoc|
-      InstallOptions.rdoc = onrdoc
-    end
-    opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
-      InstallOptions.ri = onri
-    end
     opts.on('--[no-]configs', 'Prevents the installation of config files', 'Default off.') do |ontest|
       InstallOptions.configs = ontest
     end
@@ -205,14 +181,8 @@ def prepare_installation
       InstallOptions.batch_files = false
     end
     opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
-      InstallOptions.rdoc    = false
-      InstallOptions.ri      = false
-      InstallOptions.configs = true
-    end
-    opts.on('--full', 'Performs a full installation. All', 'optional installation steps are run.') do |full|
-      InstallOptions.rdoc    = true
-      InstallOptions.ri      = true
       InstallOptions.configs = true
+      warn "--quick is deprecated. Use --configs"
     end
     opts.separator("")
     opts.on_tail('--help', "Shows this help text.") do
@@ -223,9 +193,6 @@ def prepare_installation
     opts.parse!
   end
 
-  version = [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")
-  libdir = File.join(RbConfig::CONFIG["libdir"], "ruby", version)
-
   # Mac OS X 10.5 and higher declare bindir
   # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
   # which is not generally where people expect executables to be installed
@@ -312,7 +279,8 @@ def prepare_installation
     if sitelibdir.nil?
       sitelibdir = $LOAD_PATH.find { |x| x =~ /site_ruby/ }
       if sitelibdir.nil?
-        sitelibdir = File.join(libdir, "site_ruby")
+        version = [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")
+        sitelibdir = File.join(RbConfig::CONFIG["libdir"], "ruby", version, "site_ruby")
       elsif sitelibdir !~ Regexp.quote(version)
         sitelibdir = File.join(sitelibdir, version)
       end
@@ -328,10 +296,6 @@ def prepare_installation
   # This is the new way forward
   if not InstallOptions.destdir.nil?
     destdir = InstallOptions.destdir
-  # To be deprecated once people move over to using --destdir option
-  elsif not ENV['DESTDIR'].nil?
-    destdir = ENV['DESTDIR']
-    warn "DESTDIR is deprecated. Use --destdir instead."
   else
     destdir = ''
   end
@@ -362,7 +326,6 @@ def prepare_installation
   InstallOptions.codedir = codedir
   InstallOptions.config_dir = configdir
   InstallOptions.bin_dir = bindir
-  InstallOptions.lib_dir = libdir
   InstallOptions.man_dir = mandir
   InstallOptions.var_dir = vardir
   InstallOptions.public_dir = publicdir
@@ -381,36 +344,6 @@ def join(basedir, dir)
   "#{basedir}#{dir}"
 end
 
-##
-# Build the rdoc documentation. Also, try to build the RI documentation.
-#
-def build_rdoc(files)
-  return unless $haverdoc
-  begin
-    r = RDoc::RDoc.new
-    r.document(["--main", "README", "--title", "Puppet -- Site Configuration Management", "--line-numbers"] + files)
-  rescue RDoc::RDocError => e
-    $stderr.puts e.message
-  rescue Exception => e
-    $stderr.puts "Couldn't build RDoc documentation\n#{e.message}"
-  end
-end
-
-def build_ri(files)
-  return unless $haverdoc
-  return if $osname == "windows"
-  begin
-    ri = RDoc::RDoc.new
-    #ri.document(["--ri-site", "--merge"] + files)
-    ri.document(["--ri-site"] + files)
-  rescue RDoc::RDocError => e
-    $stderr.puts e.message
-  rescue Exception => e
-    $stderr.puts "Couldn't build Ri documentation\n#{e.message}"
-    $stderr.puts "Continuing with install..."
-  end
-end
-
 ##
 # Install file(s) from ./bin to RbConfig::CONFIG['bindir']. Patch it on the way
 # to insert a #! line; on a Unix install, the command is named as expected
@@ -476,8 +409,6 @@ FileUtils.cd File.dirname(__FILE__) do
   # Set these values to what you want installed.
   configs = glob(%w{conf/puppet.conf conf/hiera.yaml})
   bins  = glob(%w{bin/*})
-  #rdoc  = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
-  #ri    = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
   man   = glob(%w{man/man[0-9]/*})
   libs  = glob(%w{lib/**/*})
   locales = glob(%w{locales/**/*})
@@ -488,8 +419,6 @@ FileUtils.cd File.dirname(__FILE__) do
     windows_bins = glob(%w{ext/windows/*bat})
   end
 
-  #build_rdoc(rdoc) if InstallOptions.rdoc
-  #build_ri(ri) if InstallOptions.ri
   do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
   do_bins(bins, InstallOptions.bin_dir)
   do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if $osname == "windows" && InstallOptions.batch_files

data/lib/puppet/application/apply.rb

@@ -153,6 +153,7 @@ class Puppet::Application::Apply < Puppet::Application
 
       EXAMPLE
       -------
+          $ puppet apply -e 'notify { "hello world": }'
           $ puppet apply -l /tmp/manifest.log manifest.pp
           $ puppet apply --modulepath=/root/dev/modules -e "include ntpd::server"
           $ puppet apply --catalog catalog.json

data/lib/puppet/application/doc.rb

@@ -173,11 +173,7 @@ class Puppet::Application::Doc < Puppet::Application
 
     text += Puppet::Util::Reference.footer unless with_contents # We've only got one reference
 
-    if options[:mode] == :pdf
-      Puppet::Util::Reference.pdf(text)
-    else
-      puts text
-    end
+    puts text
 
     exit exit_code
   end

data/lib/puppet/application/filebucket.rb

@@ -76,10 +76,11 @@ class Puppet::Application::Filebucket < Puppet::Application
       use your local file bucket by specifying '--local', or by specifying
       '--bucket' with a local path.
 
-      > **Note**: Enabling and using the backup option, and by extension the
-        filebucket resource, requires appropriate planning and management to ensure
-        that sufficient disk space is available for the file backups. Generally, you
-        can implement this using one of the following two options:
+      **Important**: When you enable and use the backup option, and by extension
+      the filebucket resource, you must ensure that sufficient disk space is
+      available for the file backups. Generally, you can provide the disk space
+      by using one of the following two options:
+
         - Use a `find` command and `crontab` entry to retain only the last X days
         of file backups. For example:
 
@@ -187,6 +188,7 @@ class Puppet::Application::Filebucket < Puppet::Application
 
           $ puppet filebucket -l -t "2015-05-11 09:30:00" list
           d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
+
           ## Manage files in a specific local filebucket
           $ puppet filebucket -b /tmp/TestBucket backup /tmp/TestFile2
           /tmp/TestFile2: d41d8cd98f00b204e9800998ecf8427e

data/lib/puppet/application/lookup.rb

@@ -3,6 +3,7 @@
 require_relative '../../puppet/application'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/node'
+require_relative '../../puppet/node/server_facts'
 require_relative '../../puppet/parser/compiler'
 
 class Puppet::Application::Lookup < Puppet::Application
@@ -403,6 +404,7 @@ class Puppet::Application::Lookup < Puppet::Application
       end
     end
     node.environment = Puppet[:environment] if Puppet.settings.set_by_cli?(:environment)
+    node.add_server_facts(Puppet::Node::ServerFacts.load)
     Puppet[:code] = 'undef' unless options[:compile]
     compiler = Puppet::Parser::Compiler.new(node)
     if options[:node]

data/lib/puppet/application/ssl.rb

@@ -57,13 +57,13 @@ class Puppet::Application::Ssl < Puppet::Application
       * submit_request:
         Generate a certificate signing request (CSR) and submit it to the CA. If
         a private and public key pair already exist, they will be used to generate
-        the CSR. Otherwise a new key pair will be generated. If a CSR has already
+        the CSR. Otherwise, a new key pair will be generated. If a CSR has already
         been submitted with the given `certname`, then the operation will fail.
 
       * generate_request:
-        Generate a certificate signing request (CSR). If
-        a private and public key pair already exist, they will be used to generate
-        the CSR. Otherwise a new key pair will be generated.
+        Generate a certificate signing request (CSR). If a private and public key
+        pair exist, they will be used to generate the CSR. Otherwise a new key
+        pair will be generated.
 
       * download_cert:
         Download a certificate for this host. If the current private key matches

data/lib/puppet/daemon.rb

@@ -165,7 +165,6 @@ class Puppet::Daemon
     reparse_run = Puppet::Scheduler.create_job(Puppet[:filetimeout]) do
       Puppet.settings.reparse_config_files
       agent_run.run_interval = Puppet[:runinterval]
-      agent_run.splay_limit = Puppet[:splaylimit] if Puppet[:splay]
       if Puppet[:filetimeout] == 0
         reparse_run.disable
       else