puppet 6.11.1 → 6.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53156e11d458c7bb4d162f4753ed81010fca29f95e1f4589b0d6f3a57c01785d
-  data.tar.gz: e87fe1a36dd72de27a454b30f7348dac49a87c45c5ca42ac123e41c703cd51be
+  metadata.gz: c121885834ded259f002e574ca1ada8dc8ad318668d1234baa71496c58c8fe34
+  data.tar.gz: 71cfdf18ccace429a2d195a12152ab90b56b82f22435e3075db530ce511f5f34
 SHA512:
-  metadata.gz: 731151af3a5ee6feff27be34277ddea1542b9a8265494523e8c59df01810c954a1216c403f917928afe834b87b8ca5fb0323445b48feb1e815fc819f736533fa
-  data.tar.gz: 36c2547acbca81bfe072cf246b385188afa22277665e42e15f17b0f555c9b1a5230293ba602947770eecd10caa45f432546ebad4adcf7d3eddcd749419a9d565
+  metadata.gz: c2434c6af3a1a975b0c64a405651e28462ab6651ea6f735418ae30447110f4712f6d425221f981ebb0361183eda36ee1a501be4d6eea42cf89a259f5727f0a15
+  data.tar.gz: ebcae5fa3568c1c96efec45dc5903f0c0ad1ca98b4d7dd26d7f1ec2122b8bc73fb3c062a668d58a979fa472d646b81b93c7d828c0bf3aa7a783f74f1200837d2

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

@@ -14,6 +14,7 @@ end
 
 # override .gemspec deps - may issue warning depending on Bundler version
 gem "facter", *location_for(ENV['FACTER_LOCATION']) if ENV.has_key?('FACTER_LOCATION')
+gem "facter-ng", *location_for(ENV['FACTER_NG_LOCATION']) if ENV.has_key?('FACTER_NG_LOCATION')
 gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
 gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ["~> 1.0"])
 gem "puppet-resource_api", *location_for(ENV['RESOURCE_API_LOCATION'] || ["~> 1.5"])

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.11.1)
+    puppet (6.12.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -34,9 +34,9 @@ GEM
     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.6.0)
@@ -55,30 +55,30 @@ GEM
     minitar (0.9)
     msgpack (1.3.1)
     multi_json (1.14.1)
-    mustache (1.1.0)
+    mustache (1.1.1)
     optimist (3.0.0)
-    packaging (0.99.49)
+    packaging (0.99.52)
       artifactory (~> 2)
       rake (>= 12.3)
       release-metrics
-    parallel (1.19.0)
-    parser (2.6.5.0)
+    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
@@ -90,18 +90,18 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    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.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -111,7 +111,7 @@ 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)
@@ -122,7 +122,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.20)
+    yard (0.9.24)
 
 PLATFORMS
   ruby

data/README.md

@@ -23,7 +23,7 @@ HTTP API
 Installation
 ------------
 
-The best way to run Puppet is with [Puppet Enterprise (PE)](https://puppet.com/puppet/puppet-enterprise),
+The best way to run Puppet is with [Puppet Enterprise (PE)](https://puppet.com/products/puppet-enterprise/),
 which also includes orchestration features, a web console, and professional support.
 The PE documentation is [available here.](https://puppet.com/docs/pe/latest)
 

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/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|
@@ -27,9 +28,6 @@ class WindowsDaemon < Win32::Daemon
   end
 
   def service_main(*argsv)
-    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    load_env(base_dir)
-
     argsv = (argsv << ARGV).flatten.compact
     args = argsv.join(' ')
     @loglevel = LEVELS.index(argsv.index('--debug') ? :debug : :notice)
@@ -41,6 +39,9 @@ class WindowsDaemon < Win32::Daemon
       args = args.gsub("--logtofile","")
     end
 
+    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.
     #
@@ -190,20 +191,24 @@ class WindowsDaemon < Win32::Daemon
   private
 
   def load_env(base_dir)
-    # 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']}"
+    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
 

data/lib/puppet/concurrent.rb

@@ -0,0 +1,2 @@
+module Puppet::Concurrent
+end

data/lib/puppet/concurrent/lock.rb

@@ -0,0 +1,16 @@
+require 'puppet/concurrent/synchronized'
+
+module Puppet
+module Concurrent
+
+# A simple lock that at the moment only does any locking on jruby
+class Lock
+  include Puppet::Concurrent::Synchronized
+  def synchronize
+    yield
+  end
+end
+
+end
+end
+

data/lib/puppet/concurrent/synchronized.rb

@@ -0,0 +1,15 @@
+module Puppet
+module Concurrent
+
+# Including Puppet::Concurrent::Synchronized into a class when running on JRuby
+# causes all of its instance methods to be synchronized on the instance itself.
+# When running on MRI it has no effect.
+if RUBY_PLATFORM == 'java'
+  require 'jruby/synchronized'
+  Synchronized = JRuby::Synchronized
+else
+  module Synchronized; end
+end
+
+end
+end

data/lib/puppet/concurrent/thread_local_singleton.rb

@@ -0,0 +1,14 @@
+module Puppet
+  module Concurrent
+    module ThreadLocalSingleton
+      def singleton
+        key = (name + ".singleton").intern
+        thread = Thread.current
+        unless thread.thread_variable?(key)
+          thread.thread_variable_set(key, new)
+        end
+        thread.thread_variable_get(key)
+      end
+    end
+  end
+end

data/lib/puppet/configurer.rb

@@ -150,9 +150,10 @@ class Puppet::Configurer
     facts_hash
   end
 
-  def prepare_and_retrieve_catalog(options, query_options)
+  def prepare_and_retrieve_catalog(cached_catalog, options, query_options)
     # set report host name now that we have the fact
     options[:report].host = Puppet[:node_name_value]
+
     query_options[:transaction_uuid] = @transaction_uuid
     query_options[:job_id] = @job_id
     query_options[:static_catalog] = @static_catalog
@@ -162,26 +163,19 @@ class Puppet::Configurer
     query_options[:checksum_type] = @checksum_type.join('.')
 
     # apply passes in ral catalog
-    catalog = options.delete(:catalog)
-    return catalog if catalog
-
-    # retrieve_catalog returns json catalog
-    catalog = retrieve_catalog(query_options)
-    return convert_catalog(catalog, @duration, options) if catalog
-
-    Puppet.err _("Could not retrieve catalog; skipping run")
-    nil
+    catalog = cached_catalog || options[:catalog]
+    unless catalog
+      # retrieve_catalog returns resource catalog
+      catalog = retrieve_catalog(query_options)
+      Puppet.err _("Could not retrieve catalog; skipping run") unless catalog
+    end
+    catalog
   end
 
   def prepare_and_retrieve_catalog_from_cache(options = {})
     result = retrieve_catalog_from_cache({:transaction_uuid => @transaction_uuid, :static_catalog => @static_catalog})
-    if result
-      Puppet.info _("Using cached catalog from environment '%{catalog_env}'") % { catalog_env: result.environment }
-      # get facts now so that the convert_catalog method can resolve deferred values
-      get_facts(options)
-      return convert_catalog(result, @duration, options)
-    end
-    nil
+    Puppet.info _("Using cached catalog from environment '%{catalog_env}'") % { catalog_env: result.environment } if result
+    result
   end
 
   # Apply supplied catalog and return associated application report
@@ -259,14 +253,13 @@ class Puppet::Configurer
       Puppet::GettextConfig.reset_text_domain('agent')
       Puppet::ModuleTranslations.load_from_vardir(Puppet[:vardir])
 
-      catalog = prepare_and_retrieve_catalog_from_cache(options)
-      if catalog
-        options[:catalog] = catalog
+      cached_catalog = prepare_and_retrieve_catalog_from_cache(options)
+      if cached_catalog
         @cached_catalog_status = 'explicitly_requested'
 
-        if @environment != catalog.environment && !Puppet[:strict_environment_mode]
-          Puppet.notice _("Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'.") % { local_env: @environment, catalog_env: catalog.environment }
-          @environment = catalog.environment
+        if @environment != cached_catalog.environment && !Puppet[:strict_environment_mode]
+          Puppet.notice _("Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'.") % { local_env: @environment, catalog_env: cached_catalog.environment }
+          @environment = cached_catalog.environment
         end
 
         report.environment = @environment
@@ -287,7 +280,7 @@ class Puppet::Configurer
       configured_environment = Puppet[:environment] if Puppet.settings.set_by_config?(:environment)
 
       # We only need to find out the environment to run in if we don't already have a catalog
-      unless (options[:catalog] || Puppet[:strict_environment_mode])
+      unless (cached_catalog || options[:catalog] || Puppet[:strict_environment_mode])
         begin
           node = nil
           node_retr_time = thinmark do
@@ -342,7 +335,7 @@ class Puppet::Configurer
       query_options[:configured_environment] = configured_environment
       options[:convert_for_node] = node
 
-      catalog = prepare_and_retrieve_catalog(options, query_options)
+      catalog = prepare_and_retrieve_catalog(cached_catalog, options, query_options)
       unless catalog
         return nil
       end
@@ -368,17 +361,38 @@ class Puppet::Configurer
         query_options = get_facts(options)
         query_options[:configured_environment] = configured_environment
 
-        catalog = prepare_and_retrieve_catalog(options, query_options)
+        # if we get here, ignore the cached catalog
+        catalog = prepare_and_retrieve_catalog(nil, options, query_options)
         return nil unless catalog
         tries += 1
       end
 
+      # now that environment has converged, convert resource catalog into ral catalog
+      # unless we were given a RAL catalog
+      if !cached_catalog && options[:catalog]
+        ral_catalog = options[:catalog]
+      else
+        # REMIND @duration is the time spent loading the last catalog, and doesn't
+        # account for things like we failed to download and fell back to the cache
+        ral_catalog = convert_catalog(catalog, @duration, options)
+
+        # If not noop, commit the cached resource catalog (not ral catalog). Ideally
+        # we'd just copy the downloaded response body, instead of serializing the
+        # in-memory catalog, but that's hard due to the indirector.
+        indirection = Puppet::Resource::Catalog.indirection
+        if !Puppet[:noop] && indirection.cache?
+          request = indirection.request(:save, nil, catalog, environment: Puppet::Node::Environment.remote(catalog.environment))
+          Puppet.info("Caching catalog for #{request.key}")
+          indirection.cache.save(request)
+        end
+      end
+
       execute_prerun_command or return nil
 
-      options[:report].code_id = catalog.code_id
-      options[:report].catalog_uuid = catalog.catalog_uuid
+      options[:report].code_id = ral_catalog.code_id
+      options[:report].catalog_uuid = ral_catalog.catalog_uuid
       options[:report].cached_catalog_status = @cached_catalog_status
-      apply_catalog(catalog, options)
+      apply_catalog(ral_catalog, options)
       true
     rescue => detail
       Puppet.log_exception(detail, _("Failed to apply catalog: %{detail}") % { detail: detail })
@@ -514,8 +528,8 @@ class Puppet::Configurer
         Puppet[:node_name_value],
         query_options.merge(
           :ignore_cache      => true,
-          # We never want to update the cached Catalog if we're running in noop mode.
-          :ignore_cache_save => Puppet[:noop],
+          # don't update cache until after environment converges
+          :ignore_cache_save => true,
           :environment       => Puppet::Node::Environment.remote(@environment),
           :fail_on_404       => true
         )

data/lib/puppet/defaults.rb

@@ -35,7 +35,7 @@ module Puppet
   def self.default_basemodulepath
     if Puppet::Util::Platform.windows?
       path = ['$codedir/modules']
-      installdir = Facter.value(:env_windows_installdir)
+      installdir = ENV["FACTER_env_windows_installdir"]
       if installdir
         path << "#{installdir}/puppet/modules"
       end
@@ -47,7 +47,7 @@ module Puppet
 
   def self.default_vendormoduledir
     if Puppet::Util::Platform.windows?
-      installdir = Facter.value(:env_windows_installdir)
+      installdir = ENV["FACTER_env_windows_installdir"]
       if installdir
         "#{installdir}\\puppet\\vendor_modules"
       else
@@ -65,6 +65,25 @@ module Puppet
 
   AS_DURATION = %q{This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).}
 
+  define_settings(:main,
+    :facterng => {
+        :default => false,
+        :type    => :boolean,
+        :desc    => 'Whether to enable a pre-Facter 4.0 release of Facter (distributed as
+          the "facter-ng" gem). This is not necessary if Facter 3.x or later is installed.
+          This setting is still experimental and has been only included on Windows builds',
+        :hook    => proc do |value|
+                      if value && Puppet::Util::Platform.windows?
+                        begin
+                          require 'facter-ng'
+                        rescue LoadError
+                          raise ArgumentError, 'facter-ng could not be loaded'
+                        end
+                      end
+                    end
+    }
+  )
+
   define_settings(:main,
     :confdir  => {
         :default  => nil,
@@ -154,6 +173,19 @@ module Puppet
         end
       end
     },
+    :merge_dependency_warnings => {
+      :default => false,
+      :type    => :boolean,
+      :desc    => "Whether to merge class-level dependency failure warnings.
+
+        When a class has a failed dependency, every resource in the class
+        generates a notice level message about the dependency failure,
+        and a warning level message about skipping the resource.
+
+        If true, all messages caused by a class dependency failure are merged
+        into one message associated with the class.
+        ",
+    },
     :strict => {
       :default    => :warning,
       :type       => :symbolic_enum,
@@ -206,12 +238,19 @@ module Puppet
     :trace => {
         :default  => false,
         :type     => :boolean,
-        :desc     => "Whether to print stack traces on some errors",
+        :desc     => "Whether to print stack traces on some errors. Will print
+          internal Ruby stack trace interleaved with Puppet function frames.",
         :hook     => proc do |value|
           # Enable or disable Facter's trace option too
           Facter.trace(value) if Facter.respond_to? :trace
         end
     },
+    :puppet_trace => {
+        :default  => false,
+        :type     => :boolean,
+        :desc     => "Whether to print the Puppet stack trace on some errors.
+          This is a noop if `trace` is also set.",
+    },
     :profile => {
         :default  => false,
         :type     => :boolean,