puppet 6.11.1 → 6.12.0

data/lib/puppet/pops/lookup/invocation.rb

@@ -1,3 +1,5 @@
+require 'puppet/thread_local'
+
 require_relative 'explainer'
 
 module Puppet::Pops
@@ -7,7 +9,11 @@ class Invocation
   attr_reader :scope, :override_values, :default_values, :explainer, :module_name, :top_key, :adapter_class
 
   def self.current
-    @current
+    (@current ||= Puppet::ThreadLocal.new(nil)).value
+  end
+
+  def self.current=(new_value)
+    @current.value = new_value
   end
 
   # Creates a new instance with same settings as this instance but with a new given scope
@@ -37,6 +43,7 @@ class Invocation
     @default_values = default_values
 
     parent_invocation = self.class.current
+
     if parent_invocation && (adapter_class.nil? || adapter_class == parent_invocation.adapter_class)
       # Inherit from parent invocation (track recursion)
       @name_stack = parent_invocation.name_stack
@@ -71,10 +78,10 @@ class Invocation
       yield
     else
       begin
-        self.class.instance_variable_set(:@current, self)
+        self.class.current = self
         yield
       ensure
-        self.class.instance_variable_set(:@current, save_current)
+        self.class.current = save_current
       end
     end
   end

data/lib/puppet/pops/model/pn_transformer.rb

@@ -1,22 +1,18 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 module Puppet::Pops
 module Model
 
 
 class PNTransformer
-  def self.visitor
-    @visitor ||= Visitor.new(nil, 'transform', 0, 0)
-  end
-
-  def self.singleton
-    @singleton ||= new(visitor)
-  end
+  extend Puppet::Concurrent::ThreadLocalSingleton
 
   def self.transform(ast)
     singleton.transform(ast)
   end
 
-  def initialize(visitor)
-    @visitor = visitor
+  def initialize
+    @visitor = Visitor.new(nil, 'transform', 0, 0)
   end
 
   def transform(ast)

data/lib/puppet/pops/parser/evaluating_parser.rb

@@ -1,9 +1,12 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 module Puppet::Pops
 module Parser
 
 # Does not support "import" and parsing ruby files
 #
 class EvaluatingParser
+  extend Puppet::Concurrent::ThreadLocalSingleton
 
   attr_reader :parser
 
@@ -11,10 +14,6 @@ class EvaluatingParser
     @parser = Parser.new()
   end
 
-  def self.singleton
-    @instance ||= new
-  end
-
   def parse_string(s, file_source = nil)
     @file_source = file_source
     clear()

data/lib/puppet/pops/serialization/json_path.rb

@@ -1,3 +1,5 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 module Puppet::Pops
 module Serialization
 module JsonPath
@@ -31,9 +33,7 @@ module JsonPath
   #
   # @api private
   class Resolver
-    def self.singleton
-      @singleton ||= self.new
-    end
+    extend Puppet::Concurrent::ThreadLocalSingleton
 
     def initialize
       @parser = Parser::Parser.new

data/lib/puppet/pops/time/timespan.rb

@@ -1,3 +1,5 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 module Puppet::Pops
 module Time
   NSECS_PER_USEC = 1000
@@ -581,9 +583,7 @@ module Time
 
     # Parses a string into a Timestamp::Format instance
     class FormatParser
-      def self.singleton
-        @singleton
-      end
+      extend Puppet::Concurrent::ThreadLocalSingleton
 
       def initialize
         @formats = Hash.new { |hash, str| hash[str] = internal_parse(str) }
@@ -706,8 +706,6 @@ module Time
         end
         Format.new(str, bld)
       end
-
-      @singleton = FormatParser.new
     end
 
     class Format

data/lib/puppet/pops/types/string_converter.rb

@@ -1,3 +1,5 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 module Puppet::Pops
 module Types
 
@@ -238,22 +240,17 @@ class StringConverter
     end
   end
 
+  extend Puppet::Concurrent::ThreadLocalSingleton
+
   # @api public
   def self.convert(value, string_formats = :default)
     singleton.convert(value, string_formats)
   end
 
-  # @return [TypeConverter] the singleton instance
-  #
-  # @api public
-  def self.singleton
-    @tconv_instance ||= new
-  end
-
   # @api private
   #
   def initialize
-    @@string_visitor   ||= Visitor.new(self, "string", 3, 3)
+    @string_visitor = Visitor.new(self, "string", 3, 3)
   end
 
   DEFAULT_INDENTATION = Indentation.new(0, true, false).freeze
@@ -523,7 +520,7 @@ class StringConverter
 #  end
 
   def _convert(val_type, value, format_map, indentation)
-    @@string_visitor.visit_this_3(self, val_type, value, format_map, indentation)
+    @string_visitor.visit_this_3(self, val_type, value, format_map, indentation)
   end
   private :_convert
 

data/lib/puppet/pops/types/type_calculator.rb

@@ -1,3 +1,5 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 module Puppet::Pops
 module Types
 # The TypeCalculator can answer questions about puppet types.
@@ -99,6 +101,7 @@ module Types
 # @api public
 #
 class TypeCalculator
+  extend Puppet::Concurrent::ThreadLocalSingleton
 
   # @api public
   def self.assignable?(t1, t2)
@@ -135,18 +138,11 @@ class TypeCalculator
     singleton.iterable(t)
   end
 
-  # @return [TypeCalculator] the singleton instance
-  #
-  # @api private
-  def self.singleton
-    @tc_instance ||= new
-  end
-
   # @api public
   #
   def initialize
-    @@infer_visitor ||= Visitor.new(nil, 'infer',0,0)
-    @@extract_visitor ||= Visitor.new(nil, 'extract',0,0)
+    @infer_visitor = Visitor.new(nil, 'infer',0,0)
+    @extract_visitor = Visitor.new(nil, 'extract',0,0)
   end
 
   # Answers 'can an instance of type t2 be assigned to a variable of type t'.
@@ -250,7 +246,7 @@ class TypeCalculator
     elsif o.is_a?(Evaluator::PuppetProc)
       infer_PuppetProc(o)
     else
-      @@infer_visitor.visit_this_0(self, o)
+      @infer_visitor.visit_this_0(self, o)
     end
   end
 

data/lib/puppet/pops/types/type_formatter.rb

@@ -1,3 +1,5 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 module Puppet::Pops
 module Types
 # String
@@ -7,6 +9,8 @@ module Types
 # @api public
 #
 class TypeFormatter
+  extend Puppet::Concurrent::ThreadLocalSingleton
+
   # Produces a String representation of the given type.
   # @param t [PAnyType] the type to produce a string form
   # @return [String] the type in string form
@@ -14,14 +18,11 @@ class TypeFormatter
   # @api public
   #
   def self.string(t)
-    @singleton.string(t)
+    singleton.string(t)
   end
 
-  # @return [TypeCalculator] the singleton instance
-  #
-  # @api private
-  def self.singleton
-    @singleton
+  def initialize
+    @string_visitor = Visitor.new(nil, 'string',0,0)
   end
 
   def expanded
@@ -105,13 +106,13 @@ class TypeFormatter
       @ruby = false
       begin
         @bld << @ref_ctor << '('
-        @@string_visitor.visit_this_0(self, TypeFormatter.new.string(t))
+        @string_visitor.visit_this_0(self, TypeFormatter.new.string(t))
         @bld << ')'
       ensure
         @ruby = true
       end
     else
-      @@string_visitor.visit_this_0(self, t)
+      @string_visitor.visit_this_0(self, t)
     end
   end
 
@@ -794,9 +795,6 @@ class TypeFormatter
   def chomp_list
     @bld.chomp!(COMMA_SEP)
   end
-
-  @singleton = new
-  @@string_visitor = Visitor.new(nil, 'string',0,0)
 end
 end
 end

data/lib/puppet/pops/types/type_parser.rb

@@ -1,3 +1,5 @@
+require 'puppet/concurrent/thread_local_singleton'
+
 # This class provides parsing of Type Specification from a string into the Type
 # Model that is produced by the TypeFactory.
 #
@@ -8,9 +10,7 @@
 module Puppet::Pops
 module Types
 class TypeParser
-  def self.singleton
-    @singleton ||= TypeParser.new
-  end
+  extend Puppet::Concurrent::ThreadLocalSingleton
 
   # @api public
   def initialize

data/lib/puppet/provider/package/portage.rb

@@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     name = qatom[:pfx] + name if qatom[:pfx]
     name = name + '-' + qatom[:pv] if qatom[:pv]
     name = name + '-' + qatom[:pr] if qatom[:pr]
-    name = name + qatom[:slot] if qatom[:slot]
+    name = name + ':' + qatom[:slot] if qatom[:slot]
     cmd << '--update' if [:latest].include?(should)
     cmd += install_options if @resource[:install_options]
     cmd << name
@@ -83,7 +83,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     name = qatom[:pfx] + name if qatom[:pfx]
     name = name + '-' + qatom[:pv] if qatom[:pv]
     name = name + '-' + qatom[:pr] if qatom[:pr]
-    name = name + qatom[:slot] if qatom[:slot]
+    name = name + ':' + qatom[:slot] if qatom[:slot]
     cmd += uninstall_options if @resource[:uninstall_options]
     cmd << name
     if [:purged].include?(should)
@@ -257,7 +257,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
     # [2.7.12: 2.7
     #  3.4.5:  3.4
     #  3.5.2:  3.5]
-    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
+    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
     # [3.5.2:  3.5]
     version_for_slot.first if version_for_slot
     # 3.5.2

data/lib/puppet/provider/package_targetable.rb

@@ -25,24 +25,25 @@ require 'puppet/provider/package'
 class Puppet::Provider::Package::Targetable < Puppet::Provider::Package
   # Prefetch our package list, yo.
   def self.prefetch(packages)
-    catalog_packages = packages.first[1]::catalog::resources.select{ |p| p.provider.class == self }
+    catalog_packages = packages.values.first.catalog.resources.select{ |p| p.provider.class == self }
     package_commands = catalog_packages.map { |catalog_package| catalog_package::original_parameters[:command] }.uniq
     package_commands.each do |command|
       instances(command).each do |instance|
         catalog_packages.each do |catalog_package|
-          if catalog_package[:name] == instance.name && catalog_package::original_parameters[:command] == command
+          if catalog_package[:name] == instance.name && catalog_package.original_parameters[:command] == command
             catalog_package.provider = instance
-            self.debug "Prefetched instance: %{name} via command: %{command}" % { name: instance.name, cmd: (command || :default)}
+            self.debug "Prefetched instance: %{name} via command: %{cmd}" % { name: instance.name, cmd: (command || :default) }
           end
         end
       end
     end
+    package_commands
   end
 
   # Returns the resource command or provider command.
 
   def resource_or_provider_command
-    resource::original_parameters[:command] || self.class.provider_command
+    resource.original_parameters[:command] || self.class.provider_command
   end
 
   # Targetable providers use has_command/is_optional to defer validation of provider suitability.

data/lib/puppet/provider/service/systemd.rb

@@ -25,7 +25,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   notdefaultfor :operatingsystem => :LinuxMint, :operatingsystemmajrelease => ["10", "11", "12", "13", "14", "15", "16", "17"] # These are using upstart
   defaultfor :operatingsystem => :ubuntu
   notdefaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["10.04", "12.04", "14.04", "14.10"] # These are using upstart
-  defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"]
+  defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3", "4"]
 
   def self.instances
     i = []

data/lib/puppet/provider/user/hpux.rb

@@ -29,7 +29,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
 
   def modifycmd(param,value)
      cmd = super(param, value)
-     cmd << "-F"
+     cmd.insert(1,"-F")
      if trusted then
        # Append an additional command to reset the password age to 0
        # until a workaround with expiry module can be found for trusted

data/lib/puppet/runtime.rb

@@ -1,4 +1,5 @@
 require 'puppet/http'
+require 'singleton'
 
 class Puppet::Runtime
   include Singleton

data/lib/puppet/ssl/ssl_provider.rb

@@ -36,6 +36,26 @@ class Puppet::SSL::SSLProvider
     Puppet::SSL::SSLContext.new(store: store, cacerts: cacerts, crls: crls, revocation: revocation).freeze
   end
 
+  # Create an `SSLContext` using the trusted `cacerts` and any certs in OpenSSL's
+  # default verify path locations. When running puppet as a gem, the location is
+  # system dependent. When running puppet from puppet-agent packages, the location
+  # refers to the cacerts bundle in the puppet-agent package.
+  #
+  # Connections made from the returned context will authenticate the server,
+  # i.e. `VERIFY_PEER`, but will not use a client certificate and will not
+  # perform revocation checking.
+  #
+  # @param cacerts [Array<OpenSSL::X509::Certificate>] Array of trusted CA certs
+  # @return [Puppet::SSL::SSLContext] A context to use to create connections
+  # @raise (see #create_context)
+  # @api private
+  def create_system_context(cacerts:)
+    store = create_x509_store(cacerts, [], false)
+    store.set_default_paths
+
+    Puppet::SSL::SSLContext.new(store: store, cacerts: cacerts, crls: [], revocation: false).freeze
+  end
+
   # Create an `SSLContext` using the trusted `cacerts`, `crls`, `private_key`,
   # `client_cert`, and `revocation` mode. Connections made from the returned
   # context will be mutually authenticated.

data/lib/puppet/transaction.rb

@@ -57,7 +57,11 @@ class Puppet::Transaction
 
     @prefetch_failed_providers = Hash.new { |h,k| h[k] = {} }
 
+    # With merge_dependency_warnings, notify and warn about class dependency failures ... just once per class. TJK 2019-09-09
+    @merge_dependency_warnings = Puppet[:merge_dependency_warnings]
     @failed_dependencies_already_notified = Set.new()
+    @failed_class_dependencies_already_notified = Set.new()
+    @failed_class_dependencies_already_warned = Set.new()
   end
 
   # Invoke the pre_run_check hook in every resource in the catalog.
@@ -291,15 +295,25 @@ class Puppet::Transaction
     # explosion of edges, we also ended up reporting failures for containers
     # like class and stage.  This is undesirable; while just skipping the
     # output isn't perfect, it is RC-safe. --daniel 2011-06-07
-    suppress_report = (resource.class == Puppet::Type.type(:whit))
-
+    is_puppet_class = resource.class == Puppet::Type.type(:whit)
+    # With merge_dependency_warnings, notify about class dependency failures ... just once per class. TJK 2019-09-09
     s = resource_status(resource)
     if s && s.dependency_failed?
-      # See above. --daniel 2011-06-06
-      unless suppress_report then
-        s.failed_dependencies.find_all { |d| !(@failed_dependencies_already_notified.include?(d.ref)) }.each do |dep|
-          resource.notice _("Dependency %{dep} has failures: %{status}") % { dep: dep, status: resource_status(dep).failed }
-          @failed_dependencies_already_notified.add(dep.ref)
+      if @merge_dependency_warnings && is_puppet_class
+       	# Notes: Puppet::Resource::Status.failed_dependencies() is an Array of Puppet::Resource(s) and
+        #        Puppet::Resource.ref() calls Puppet::Resource.to_s() which is: "#{type}[#{title}]" and
+       	#        Puppet::Resource.resource_status(resource) calls Puppet::Resource.to_s()
+        class_dependencies_to_be_notified = (s.failed_dependencies.map(&:ref) - @failed_class_dependencies_already_notified.to_a)
+        class_dependencies_to_be_notified.each do |dep_ref|
+          resource.notice _("Class dependency %{dep} has failures: %{status}") % { dep: dep_ref, status: resource_status(dep_ref).failed }
+        end
+        @failed_class_dependencies_already_notified.merge(class_dependencies_to_be_notified)
+      else
+        unless @merge_dependency_warnings || is_puppet_class
+          s.failed_dependencies.find_all { |d| !(@failed_dependencies_already_notified.include?(d.ref)) }.each do |dep|
+            resource.notice _("Dependency %{dep} has failures: %{status}") % { dep: dep, status: resource_status(dep).failed }
+            @failed_dependencies_already_notified.add(dep.ref)
+          end
         end
       end
     end
@@ -399,11 +413,19 @@ class Puppet::Transaction
       # explosion of edges, we also ended up reporting failures for containers
       # like class and stage.  This is undesirable; while just skipping the
       # output isn't perfect, it is RC-safe. --daniel 2011-06-07
-      unless resource.class == Puppet::Type.type(:whit) then
-        resource.warning _("Skipping because of failed dependencies")
+      # With merge_dependency_warnings, warn about class dependency failures ... just once per class. TJK 2019-09-09
+      unless resource.class == Puppet::Type.type(:whit)
+        if @merge_dependency_warnings && resource.parent && failed_dependencies?(resource.parent)
+          ps = resource_status(resource.parent)
+          ps.failed_dependencies.find_all { |d| !(@failed_class_dependencies_already_warned.include?(d.ref)) }.each do |dep|
+            resource.parent.warning _("Skipping resources in class because of failed class dependencies")
+            @failed_class_dependencies_already_warned.add(dep.ref)
+          end
+        else
+          resource.warning _("Skipping because of failed dependencies")
+        end
       end
-    elsif resource_status(resource).failed? &&
-        @prefetch_failed_providers[resource.type][resource.provider.class.name]
+    elsif resource_status(resource).failed? && @prefetch_failed_providers[resource.type][resource.provider.class.name]
       #Do not try to evaluate a resource with a known failed provider
       resource.warning _("Skipping because provider prefetch failed")
     elsif resource.virtual?