puppet 6.8.1 → 6.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223acb5a42c2c6b961e58dd8ee941365737416998a0a326adf7dadd8690c3764
-  data.tar.gz: dffdf32c5003e5ff2632c9423039571be609f3b4d65a2314d2ec21d3bd3bb9d2
+  metadata.gz: 0e29fb771008f2391db8072a7c609e3388d1941f07ce3726b1e4f46e224f419d
+  data.tar.gz: 016e177050c07c41fbd16447c027d8353f5fe02bc9169b849e26d5a4be54d4ae
 SHA512:
-  metadata.gz: b460be876318cd94264d01a4eaf10c87fe12c0a377783c51a571706aec4f8779ec87fa94ef819dabc6029b63ff199234022a2a6ec60015084fc16c5874008d1a
-  data.tar.gz: cf8f301bffaf5f4c71b5d68e4c09379a2933e17db54174e29c03985cc6adb15255aff62bdf22dcef11ee7d508e6d1688c76bbd74e35fdcb901d0cf7eae4dc1a6
+  metadata.gz: bd9d5695bbc4945aa90afe21df95b1b639ac049904e6595bdd9406e686a20eb0255773eed7476549c97a2aed29ee13cd4a1367705ec032e629addecc63ce6bf1
+  data.tar.gz: d89df5ab8202cc7c44e53ecbb6a35eb14cbbaf77312d43b30b0cd97ddaca243141e6c0e8994f9d22aaadefe0a70f3aabdb7addd1720066a423b5c8a4206aae6a

data/Gemfile

@@ -39,7 +39,6 @@ group(:test) do
   gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 12.2')
   gem "rspec", "~> 3.1", require: false
   gem "rspec-its", "~> 1.1", require: false
-  gem "rspec-collection_matchers", "~> 1.1", require: false
   gem 'vcr', '~> 2.9', require: false
   gem 'webmock', '~> 1.24', require: false
   gem 'yard', require: false

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    puppet (6.8.1)
+    puppet (6.9.0)
       CFPropertyList (~> 2.2)
+      concurrent-ruby (~> 1.0)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
@@ -15,11 +16,12 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    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.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -46,22 +48,22 @@ GEM
     locale (2.1.2)
     memory_profiler (0.9.14)
     method_source (0.9.2)
-    minitar (0.8)
+    minitar (0.9)
     msgpack (1.3.1)
     multi_json (1.13.1)
     mustache (1.1.0)
     optimist (3.0.0)
-    packaging (0.99.39)
+    packaging (0.99.42)
       artifactory (~> 2)
       rake (~> 12.3)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     puppet-resource_api (1.8.6)
       hocon (>= 1.0)
     puppetserver-ca (1.4.0)
@@ -71,7 +73,7 @@ GEM
       rake
     rake (12.3.3)
     rdiscount (2.2.0.1)
-    rdoc (6.1.1)
+    rdoc (6.2.0)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
@@ -80,8 +82,6 @@ GEM
       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.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
@@ -138,7 +138,6 @@ DEPENDENCIES
   rdoc (~> 6.0)
   ronn (~> 0.7.3)
   rspec (~> 3.1)
-  rspec-collection_matchers (~> 1.1)
   rspec-its (~> 1.1)
   rubocop (~> 0.49)
   rubocop-i18n (~> 1.2.0)

data/ext/project_data.yaml

@@ -25,6 +25,7 @@ gem_runtime_dependencies:
   multi_json: '~> 1.10'
   httpclient: '~> 2.8'
   puppet-resource_api: '~>1.5'
+  concurrent-ruby: '~> 1.0'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"

data/lib/puppet.rb

@@ -148,7 +148,7 @@ module Puppet
     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))
-    Puppet.push_context(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
+    push_context_global(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
     Puppet::Parser::Functions.reset
   end
   private_class_method :do_initialize_settings_for_run_mode
@@ -245,6 +245,14 @@ module Puppet
     @context.push(overrides, description)
   end
 
+  # Push something onto the the context and make it global across threads. This
+  # has the potential to convert threadlocal overrides earlier on the stack into
+  # global overrides.
+  # @api private
+  def self.push_context_global(overrides, description = '')
+    @context.unsafe_push_global(overrides, description)
+  end
+
   # Return to the previous context.
   # @raise [StackUnderflow] if the current context is the root
   # @api private

data/lib/puppet/application/agent.rb

@@ -351,6 +351,8 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
       # Setup signal traps immediately after daemonization so we clean up the daemon
       daemon.set_signal_traps
 
+      log_config if Puppet[:daemonize]
+      
       Puppet.override(ssl_context: wait_for_certificates) do
         if Puppet[:onetime]
           onetime(daemon)
@@ -361,6 +363,16 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     end
   end
 
+  def log_config
+    #skip also config reading and parsing if debug is not enabled
+    return unless Puppet::Util::Log.sendlevel?(:debug)
+
+    Puppet.settings.stringify_settings(:agent, :all).each_pair do |k,v|
+      next if k.include?("password") || v.to_s.empty?
+      Puppet.debug("Using setting: #{k}=#{v}")
+    end
+  end
+
   def fingerprint
     Puppet::Util::Log.newdestination(:console)
     cert_provider = Puppet::X509::CertProvider.new

data/lib/puppet/application_support.rb

@@ -19,7 +19,7 @@ module Puppet
     # @return [void]
     # @api private
     def self.push_application_context(run_mode, environment_mode = :local)
-      Puppet.push_context(Puppet.base_context(Puppet.settings), "Update for application settings (#{run_mode})")
+      Puppet.push_context_global(Puppet.base_context(Puppet.settings), "Update for application settings (#{run_mode})")
       # This use of configured environment is correct, this is used to establish
       # the defaults for an application that does not override, or where an override
       # has not been made from the command line.

data/lib/puppet/context.rb

@@ -1,3 +1,5 @@
+require 'puppet/thread_local'
+
 # Puppet::Context is a system for tracking services and contextual information
 # that puppet needs to be able to run. Values are "bound" in a context when it is created
 # and cannot be changed; however a child context can be created, using
@@ -19,66 +21,47 @@ class Puppet::Context
 
   # @api private
   def initialize(initial_bindings)
-    @table = initial_bindings
-    @ignores = []
-    @description = "root"
-    @id = 0
-    @rollbacks = {}
-    @stack = [[0, nil, nil]]
+    @stack = Puppet::ThreadLocal.new(EmptyStack.new.push(initial_bindings))
+
+    # By initializing @rollbacks to nil and creating a hash lazily when #mark or
+    # #rollback are called we ensure that the hashes are never shared between
+    # threads and it's safe to mutate them
+    @rollbacks = Puppet::ThreadLocal.new(nil)
+  end
+
+  # @api private
+  def push(overrides, description = '')
+    @stack.value = @stack.value.push(overrides, description)
   end
 
+  # Push a context and make this global across threads
+  # Do not use in a context where multiple threads may already exist
+  #
   # @api private
-  def push(overrides, description = "")
-    @id += 1
-    @stack.push([@id, @table, @description])
-    @table = @table.merge(overrides || {})
-    @description = description
+  def unsafe_push_global(overrides, description = '')
+    @stack = Puppet::ThreadLocal.new(
+      @stack.value.push(overrides, description)
+    )
   end
 
   # @api private
   def pop
-    if @stack[-1][0] == 0
-      raise(StackUnderflow, _("Attempted to pop, but already at root of the context stack."))
-    else
-      (_, @table, @description) = @stack.pop
-    end
+    @stack.value = @stack.value.pop
   end
 
   # @api private
   def lookup(name, &block)
-    if @table.include?(name) && !@ignores.include?(name)
-      value = @table[name]
-      value.is_a?(Proc) ? (@table[name] = value.call) : value
-    elsif block
-      block.call
-    else
-      raise UndefinedBindingError, _("Unable to lookup '%{name}'") % { name: name }
-    end
+    @stack.value.lookup(name, &block)
   end
 
   # @api private
-  def override(bindings, description = "", &block)
-    mark_point = "override over #{@stack[-1][0]}"
-    mark(mark_point)
+  def override(bindings, description = '', &block)
+    saved_point = @stack.value
     push(bindings, description)
 
     yield
   ensure
-    rollback(mark_point)
-  end
-
-  # @api private
-  def ignore(name)
-    @ignores << name
-  end
-
-  # @api private
-  def restore(name)
-    if @ignores.include?(name)
-      @ignores.delete(name)
-    else
-      raise UndefinedBindingError, _("no '%{name}' in ignores %{ignores} at top of %{stack}") % { name: name, ignores: @ignores.inspect, stack: @stack.inspect }
-    end
+    @stack.value = saved_point
   end
 
   # Mark a place on the context stack to later return to with {rollback}.
@@ -87,8 +70,9 @@ class Puppet::Context
   #
   # @api private
   def mark(name)
-    if @rollbacks[name].nil?
-      @rollbacks[name] = @stack[-1][0]
+    @rollbacks.value ||= {}
+    if @rollbacks.value[name].nil?
+      @rollbacks.value[name] = @stack.value
     else
       raise DuplicateRollbackMarkError, _("Mark for '%{name}' already exists") % { name: name }
     end
@@ -103,14 +87,102 @@ class Puppet::Context
   #
   # @api private
   def rollback(name)
-    if @rollbacks[name].nil?
+    @rollbacks.value ||= {}
+    if @rollbacks.value[name].nil?
       raise UnknownRollbackMarkError, _("Unknown mark '%{name}'") % { name: name }
     end
 
-    while @stack[-1][0] != @rollbacks[name]
-      pop
+    @stack.value = @rollbacks.value.delete(name)
+  end
+
+  # Base case for Puppet::Context::Stack.
+  #
+  # @api private
+  class EmptyStack
+    # Lookup a binding. Since there are none in EmptyStack, this always raises
+    # an exception unless a block is passed, in which case the block is called
+    # and its return value is used.
+    #
+    # @api private
+    def lookup(name, &block)
+      if block
+        block.call
+      else
+        raise UndefinedBindingError, _("Unable to lookup '%{name}'") % { name: name }
+      end
+    end
+
+    # Base case of #pop always raises an error since this is the bottom
+    #
+    # @api private
+    def pop
+      raise(StackUnderflow,
+            _('Attempted to pop, but already at root of the context stack.'))
+    end
+
+    # Push bindings onto the stack by creating a new Stack object with `self` as
+    # the parent
+    #
+    # @api private
+    def push(overrides, description = '')
+      Puppet::Context::Stack.new(self, overrides, description)
     end
 
-    @rollbacks.delete(name)
+    # Return the bindings table, which is always empty here
+    #
+    # @api private
+    def bindings
+      {}
+    end
+  end
+
+  # Internal implementation of the bindings stack used by Puppet::Context. An
+  # instance of Puppet::Context::Stack represents one level of bindings. It
+  # caches a merged copy of all the bindings in the stack up to this point.
+  # Each element of the stack is immutable, allowing the base to be shared
+  # between threads.
+  #
+  # @api private
+  class Stack
+    attr_reader :bindings
+
+    def initialize(parent, bindings, description = '')
+      @parent = parent
+      @bindings = parent.bindings.merge(bindings || {})
+      @description = description
+    end
+
+    # Lookup a binding in the current stack. Return the value if it is present.
+    # If the value is a stored Proc, evaluate, cache, and return the result. If
+    # no binding is found and a block is passed evaluate it and return the
+    # result. Otherwise an exception is raised.
+    #
+    # @api private
+    def lookup(name, &block)
+      if @bindings.include?(name)
+        value = @bindings[name]
+        value.is_a?(Proc) ? (@bindings[name] = value.call) : value
+      elsif block
+        block.call
+      else
+        raise UndefinedBindingError,
+              _("Unable to lookup '%{name}'") % { name: name }
+      end
+    end
+
+    # Pop one level off the stack by returning the parent object.
+    #
+    # @api private
+    def pop
+      @parent
+    end
+
+    # Push bindings onto the stack by creating a new Stack object with `self` as
+    # the parent
+    #
+    # @api private
+    def push(overrides, description = '')
+      Puppet::Context::Stack.new(self, overrides, description)
+    end
   end
 end

data/lib/puppet/face/config.rb

@@ -66,41 +66,18 @@ Puppet::Face.define(:config, '0.0.1') do
         @default_section = true
       end
 
-      render_all_settings = args.empty? || args == ['all']
-
-      args = Puppet.settings.to_a.collect(&:first) if render_all_settings
-
-      values_from_the_selected_section =
-        Puppet.settings.values(nil, options[:section].to_sym)
-
-      loader_settings = {
-        :environmentpath => values_from_the_selected_section.interpolate(:environmentpath),
-        :basemodulepath => values_from_the_selected_section.interpolate(:basemodulepath),
-      }
-
-      to_be_rendered = nil
-      Puppet.override(Puppet.base_context(loader_settings),
-                     _("New environment loaders generated from the requested section.")) do
-        # And now we can lookup values that include those from environments configured from
-        # the requested section
-        values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
-
-        if Puppet::Util::Log.sendlevel?(:info)
-          warn_default_section(options[:section]) if @default_section
-          report_section_and_environment(options[:section], Puppet.settings[:environment])
-        end
-
-        to_be_rendered = {}
-        args.sort.each do |setting_name|
-          to_be_rendered[setting_name] = values.print(setting_name.to_sym)
-        end
+      if Puppet::Util::Log.sendlevel?(:info)
+        warn_default_section(options[:section]) if @default_section
+        report_section_and_environment(options[:section], Puppet.settings[:environment])
       end
 
-      # convert symbols to strings before formatting output
-      if render_all_settings
-        to_be_rendered = stringifyhash(to_be_rendered)
-      end
-      to_be_rendered
+      names = if args.empty? || args == ['all']
+                :all
+              else
+                args
+              end
+
+      Puppet.settings.stringify_settings(options[:section], names)
     end
 
     when_rendering :console do |to_be_rendered|
@@ -117,21 +94,6 @@ Puppet::Face.define(:config, '0.0.1') do
     end
   end
 
-  def stringifyhash(hash)
-    newhash = {}
-    hash.each do |key, val|
-      key = key.to_s
-      if val.is_a? Hash
-        newhash[key] = stringifyhash(val)
-      elsif val.is_a? Symbol
-        newhash[key] = val.to_s
-      else
-        newhash[key] = val
-      end
-    end
-    newhash
-  end
-
   def warn_default_section(section_name)
     messages = []
     messages << _("No section specified; defaulting to '%{section_name}'.") %