bolt 0.20.3 → 0.20.5

data/vendored/puppet/lib/puppet/functions/then.rb

@@ -1,4 +1,4 @@
-# Calls a [lambda](https://docs.puppet.com/puppet/latest/reference/lang_lambdas.html)
+# Calls a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 # with the given argument unless the argument is `undef`.
 # Returns `undef` if the argument is `undef`, and otherwise the result of giving the
 # argument to the lambda.

data/vendored/puppet/lib/puppet/functions/tree_each.rb

@@ -1,4 +1,4 @@
-# Runs a [lambda](http://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html)
+# Runs a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 # recursively and repeatedly using values from a data structure, then returns the unchanged data structure, or if
 # a lambda is not given, returns an `Iterator` for the tree.
 #
@@ -50,13 +50,13 @@
 #
 # If containers are skipped:
 #
-# * `depth_first` order `1`, `2`, `3`, `4` 
-# * `breadth_first` order `1`, `4`,`2`, `3` 
+# * `depth_first` order `1`, `2`, `3`, `4`
+# * `breadth_first` order `1`, `4`,`2`, `3`
 #
 # If containers and root, are included:
 #
-# * `depth_first` order `[1, [2, 3], 4]`, `1`, `[2, 3]`, `2`, `3`, `4` 
-# * `breadth_first` order `[1, [2, 3], 4]`, `1`, `[2, 3]`, `4`, `2`, `3` 
+# * `depth_first` order `[1, [2, 3], 4]`, `1`, `[2, 3]`, `2`, `3`, `4`
+# * `breadth_first` order `[1, [2, 3], 4]`, `1`, `[2, 3]`, `4`, `2`, `3`
 #
 # Typical use of the `tree_each` function include:
 # * a more efficient way to iterate over a tree than first using `flatten` on an array
@@ -111,7 +111,7 @@
 # **Chaining** When calling `tree_each` without a lambda the function produces an `Iterator`
 # that can be chained into another iteration. Thus it is easy to use one of:
 #
-# * `reverse_each` - get "leaves before root" 
+# * `reverse_each` - get "leaves before root"
 # * `filter` - prune the tree
 # * `map` - transform each element
 # * `reduce` - produce something else
@@ -137,7 +137,7 @@
 #
 #
 # For general examples that demonstrates iteration see the Puppet
-# [iteration](https://docs.puppetlabs.com/puppet/latest/reference/lang_iteration.html)
+# [iteration](https://puppet.com/docs/puppet/latest/lang_iteration.html)
 # documentation.
 #
 # @since 5.0.0

data/vendored/puppet/lib/puppet/functions/upcase.rb

@@ -0,0 +1,89 @@
+# Converts a String, Array or Hash (recursively) into upper case.
+#
+# This function is compatible with the stdlib function with the same name.
+#
+# The function does the following:
+# * For a `String`, its upper case version is returned. This is done using Ruby system locale which handles some, but not all
+#   special international up-casing rules (for example German double-s ß is upcased to "SS", whereas upper case double-s
+#   is downcased to ß).
+# * For `Array` and `Hash` the conversion to upper case is recursive and each key and value must be convertible by
+#   this function.
+# * When a `Hash` is converted, some keys could result in the same key - in those cases, the
+#   latest key-value wins. For example if keys "aBC", and "abC" where both present, after upcase there would only be one
+#   key "ABC".
+# * If the value is `Numeric` it is simply returned (this is for backwards compatibility).
+# * An error is raised for all other data types.
+#
+# Please note: This function relies directly on Ruby's String implementation and as such may not be entirely UTF8 compatible.
+# To ensure best compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.
+#
+# @example Converting a String to upper case
+# ```puppet
+# 'hello'.upcase()
+# upcase('hello')
+# ```
+# Would both result in "HELLO"
+#
+# @example Converting an Array to upper case
+# ```puppet
+# ['a', 'b'].upcase()
+# upcase(['a', 'b'])
+# ```
+# Would both result in ['A', 'B']
+#
+# @example Converting a Hash to upper case
+# ```puppet
+# {'a' => 'hello', 'b' => 'goodbye'}.upcase()
+# ```
+# Would result in `{'A' => 'HELLO', 'B' => 'GOODBYE'}`
+#
+# @example Converting a recursive structure
+# ```puppet
+# ['a', 'b', ['c', ['d']], {'x' => 'y'}].upcase
+# ```
+# Would result in `['A', 'B', ['C', ['D']], {'X' => 'Y'}]`
+#
+Puppet::Functions.create_function(:upcase) do
+  local_types do
+    type 'StringData = Variant[String, Numeric, Array[StringData], Hash[StringData, StringData]]'
+  end
+
+  dispatch :on_numeric do
+    param 'Numeric', :arg
+  end
+
+  dispatch :on_string do
+    param 'String', :arg
+  end
+
+  dispatch :on_array do
+    param 'Array[StringData]', :arg
+  end
+
+  dispatch :on_hash do
+    param 'Hash[StringData, StringData]', :arg
+  end
+
+  # unit function - since the old implementation skipped Numeric values
+  def on_numeric(n)
+    n
+  end
+
+  def on_string(s)
+    s.upcase
+  end
+
+  def on_array(a)
+    a.map {|x| do_upcase(x) }
+  end
+
+  def on_hash(h)
+    result = {}
+    h.each_pair {|k,v| result[do_upcase(k)] = do_upcase(v) }
+    result
+  end
+
+  def do_upcase(x)
+    x.is_a?(String) ? x.upcase : call_function('upcase', x)
+  end
+end

data/vendored/puppet/lib/puppet/functions/with.rb

@@ -1,8 +1,8 @@
-# Calls a [lambda](https://docs.puppet.com/puppet/latest/reference/lang_lambdas.html)
+# Calls a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 # with the given arguments and returns the result.
 #
 # Since a lambda's scope is
-# [local](https://docs.puppetlabs.com/puppet/latest/reference/lang_lambdas.html#lambda-scope)
+# [local](https://puppet.com/docs/puppet/latest/lang_lambdas.html#lambda-scope)
 # to the lambda, you can use the `with` function to create private blocks of code within a
 # class using variables whose values cannot be accessed outside of the lambda.
 #
@@ -10,8 +10,8 @@
 #
 # ```puppet
 # # Concatenate three strings into a single string formatted as a list.
-# $fruit = with("apples", "oranges", "bananas") |$x, $y, $z| { 
-#   "${x}, ${y}, and ${z}" 
+# $fruit = with("apples", "oranges", "bananas") |$x, $y, $z| {
+#   "${x}, ${y}, and ${z}"
 # }
 # $check_var = $x
 # # $fruit contains "apples, oranges, and bananas"

data/vendored/puppet/lib/puppet/functions/yaml_data.rb

@@ -1,5 +1,5 @@
 # The `yaml_data` is a hiera 5 `data_hash` data provider function.
-# See [the configuration guide documentation](https://docs.puppet.com/puppet/latest/hiera_config_yaml_5.html#configuring-a-hierarchy-level-built-in-backends) for
+# See [the configuration guide documentation](https://puppet.com/docs/puppet/latest/hiera_config_yaml_5.html#configuring-a-hierarchy-level-built-in-backends) for
 # how to use this function.
 #
 # @since 4.8.0
@@ -25,7 +25,9 @@ Puppet::Functions.create_function(:yaml_data) do
         if data.is_a?(Hash)
           Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
         else
-          Puppet.warning(_("%{path}: file does not contain a valid yaml hash" % { path: path }))
+          msg = _("%{path}: file does not contain a valid yaml hash" % { path: path })
+          raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
+          Puppet.warning(msg)
           {}
         end
       rescue YAML::SyntaxError => ex

data/vendored/puppet/lib/puppet/graph/simple_graph.rb

@@ -436,14 +436,14 @@ class Puppet::Graph::SimpleGraph
   # undirected Graph.  _params_ can contain any graph property specified in
   # rdot.rb. If an edge or vertex label is a kind of Hash then the keys
   # which match +dot+ properties will be used as well.
-  def to_dot_graph (params = {})
+  def to_dot_graph(params = {})
     params['name'] ||= self.class.name.gsub(/:/,'_')
     fontsize   = params['fontsize'] ? params['fontsize'] : '8'
     graph      = (directed? ? DOT::DOTDigraph : DOT::DOTSubgraph).new(params)
     edge_klass = directed? ? DOT::DOTDirectedEdge : DOT::DOTEdge
     vertices.each do |v|
       name = v.ref
-      params = {'name'     => '"'+name+'"',
+      params = {'name'     => stringify(name),
         'fontsize' => fontsize,
         'label'    => name}
       v_label = v.ref
@@ -451,8 +451,8 @@ class Puppet::Graph::SimpleGraph
       graph << DOT::DOTNode.new(params)
     end
     edges.each do |e|
-      params = {'from'     => '"'+ e.source.ref + '"',
-        'to'       => '"'+ e.target.ref + '"',
+      params = {'from'     => stringify(e.source.ref),
+        'to'       => stringify(e.target.ref),
         'fontsize' => fontsize }
       e_label = e.ref
       params.merge!(e_label) if e_label and e_label.kind_of? Hash
@@ -461,8 +461,12 @@ class Puppet::Graph::SimpleGraph
     graph
   end
 
+  def stringify(s)
+    %("#{s.gsub('"', '\\"')}")
+  end
+
   # Output the dot format as a string
-  def to_dot (params={}) to_dot_graph(params).to_s; end
+  def to_dot(params={}) to_dot_graph(params).to_s; end
 
   # Produce the graph files if requested.
   def write_graph(name)

data/vendored/puppet/lib/puppet/indirector/certificate_revocation_list/rest.rb

@@ -8,15 +8,4 @@ class Puppet::SSL::CertificateRevocationList::Rest < Puppet::Indirector::REST
   use_port_setting(:ca_port)
   use_srv_service(:ca)
 
-  def find(request)
-    if !Puppet::FileSystem.exist?(Puppet[:hostcrl])
-      msg =  "Disable certificate revocation checking when fetching the CRL and no CRL is present"
-      overrides = {certificate_revocation: false}
-      Puppet.override(overrides, msg) do
-        super
-      end
-    else
-      super
-    end
-  end
 end

data/vendored/puppet/lib/puppet/indirector/indirection.rb

@@ -1,6 +1,5 @@
 require 'puppet/util/docs'
 require 'puppet/util/profiler'
-require 'puppet/util/methodhelper'
 require 'puppet/indirector/envelope'
 require 'puppet/indirector/request'
 
@@ -8,7 +7,6 @@ require 'puppet/indirector/request'
 # back-ends.  Each indirection has a set of associated terminus classes,
 # each of which is a subclass of Puppet::Indirector::Terminus.
 class Puppet::Indirector::Indirection
-  include Puppet::Util::MethodHelper
   include Puppet::Util::Docs
 
   attr_accessor :name, :model
@@ -89,25 +87,23 @@ class Puppet::Indirector::Indirection
     text
   end
 
-  def initialize(model, name, options = {})
+  def initialize(model, name, doc: nil, indirected_class: nil, cache_class: nil, terminus_class: nil, terminus_setting: nil, extend: nil)
     @model = model
     @name = name
     @termini = {}
 
-    @cache_class = nil
-    @terminus_class = nil
+    @doc = doc
 
     raise(ArgumentError, _("Indirection %{name} is already defined") % { name: @name }) if @@indirections.find { |i| i.name == @name }
     @@indirections << self
 
-    @indirected_class = options.delete(:indirected_class)
-    if mod = options[:extend]
-      extend(mod)
-      options.delete(:extend)
-    end
+    @indirected_class = indirected_class
+    self.extend(extend) if extend
 
-    # This is currently only used for cache_class and terminus_class.
-    set_options(options)
+    # These setters depend on the indirection already being installed so they have to be at the end
+    self.cache_class = cache_class if cache_class
+    self.terminus_class = terminus_class if terminus_class
+    self.terminus_setting = terminus_setting if terminus_setting
   end
 
   # Set up our request object.

data/vendored/puppet/lib/puppet/indirector/node/exec.rb

@@ -3,7 +3,7 @@ require 'puppet/indirector/exec'
 
 class Puppet::Node::Exec < Puppet::Indirector::Exec
   desc "Call an external program to get node information.  See
-  the [External Nodes](https://docs.puppetlabs.com/guides/external_nodes.html) page for more information."
+  the [External Nodes](https://puppet.com/docs/puppet/latest/lang_write_functions_in_puppet.html) page for more information."
   include Puppet::Util
 
   def command

data/vendored/puppet/lib/puppet/indirector/node/ldap.rb

@@ -3,7 +3,7 @@ require 'puppet/indirector/ldap'
 
 class Puppet::Node::Ldap < Puppet::Indirector::Ldap
   desc "Search in LDAP for node configuration information.  See
-  the [LDAP Nodes](https://docs.puppetlabs.com/guides/ldap_nodes.html) page for more information.  This will first
+  the [LDAP Nodes](https://puppet.com/docs/puppet/latest/nodes_ldap.html) page for more information.  This will first
   search for whatever the certificate name is, then (if that name
   contains a `.`) for the short name, then `default`.
   Requires ruby-ldap with MRI ruby or jruby-ldap with puppetserver/jruby"

data/vendored/puppet/lib/puppet/indirector/request.rb

@@ -185,7 +185,11 @@ class Puppet::Indirector::Request
     return yield(self) if !self.server.nil?
 
     if Puppet.settings[:use_srv_records]
-      Puppet::Network::Resolver.each_srv_record(Puppet.settings[:srv_domain], srv_service) do |srv_server, srv_port|
+      # We may want to consider not creating a new resolver here
+      # every request eventually, to take advantage of the resolver's
+      # caching behavior.
+      resolver = Puppet::Network::Resolver.new
+      resolver.each_srv_record(Puppet.settings[:srv_domain], srv_service) do |srv_server, srv_port|
         begin
           self.server = srv_server
           self.port   = srv_port
@@ -197,23 +201,19 @@ class Puppet::Indirector::Request
     end
 
     # ... Fall back onto the default server.
-    begin
-      bound_server = Puppet.lookup(:server)
-    rescue
+     bound_server = Puppet.lookup(:server) do
       if primary_server = Puppet.settings[:server_list][0]
-        bound_server = primary_server[0]
+        primary_server[0]
       else
-        bound_server = Puppet.settings[:server]
+        Puppet.settings[:server]
       end
     end
 
-    begin
-      bound_port = Puppet.lookup(:serverport)
-    rescue
+    bound_port = Puppet.lookup(:serverport) do
       if primary_server = Puppet.settings[:server_list][0]
-        bound_port = primary_server[1]
+        primary_server[1]
       else
-        bound_port = Puppet.settings[:masterport]
+        Puppet.settings[:masterport]
       end
     end
     self.server = default_server || bound_server

data/vendored/puppet/lib/puppet/indirector/rest.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 require 'uri'
-require 'json'
+require 'puppet/util/json'
 require 'semantic_puppet'
 
 require 'puppet/network/http'
@@ -57,9 +57,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     if setting && setting != :server && Puppet.settings.set_by_config?(setting)
       Puppet.settings[setting]
     else
-      begin
-        Puppet.lookup(:server)
-      rescue
+      server = Puppet.lookup(:server) do
         if primary_server = Puppet.settings[:server_list][0]
           Puppet.debug "Dynamically-bound server lookup failed; using first entry"
           primary_server[0]
@@ -69,6 +67,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
           Puppet.settings[setting]
         end
       end
+      server
     end
   end
 
@@ -84,22 +83,21 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
        (srv_setting && srv_setting != :server && Puppet.settings.set_by_config?(srv_setting))
       Puppet.settings[setting].to_i
     else
-      begin
-        Puppet.lookup(:serverport).to_i
-      rescue
+      port = Puppet.lookup(:serverport) do
         if primary_server = Puppet.settings[:server_list][0]
           Puppet.debug "Dynamically-bound port lookup failed; using first entry"
 
           # Port might not be set, so we want to fallback in that
           # case. We know we don't need to use `setting` here, since
           # the default value of every port setting is `masterport`
-          (primary_server[1] || Puppet.settings[:masterport]).to_i
+          (primary_server[1] || Puppet.settings[:masterport])
         else
           setting ||= :masterport
           Puppet.debug "Dynamically-bound port lookup failed; falling back to #{setting} setting"
-          Puppet.settings[setting].to_i
+          Puppet.settings[setting]
         end
       end
+      port.to_i
     end
   end
 
@@ -263,7 +261,9 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def handle_response(request, response)
     server_version = response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION]
     if server_version
-      Puppet.push_context({:server_agent_version => server_version})
+      Puppet.lookup(:server_agent_version) do
+        Puppet.push_context(:server_agent_version => server_version)
+      end
       if SemanticPuppet::Version.parse(server_version).major < MAJOR_VERSION_JSON_DEFAULT &&
           Puppet[:preferred_serialization_format] != 'pson'
         #TRANSLATORS "PSON" should not be translated
@@ -301,7 +301,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     elsif response['content-type'].is_a?(String)
       content_type, body = parse_response(response)
       if content_type =~ /[pj]son/
-        returned_message = JSON.parse(body)["message"]
+        returned_message = Puppet::Util::Json.load(body)["message"]
       else
         returned_message = uncompress_body(response)
       end

data/vendored/puppet/lib/puppet/interface/action.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/methodhelper'
+# coding: utf-8
 require 'prettyprint'
 
 # This represents an action that is attached to a face. Actions should
@@ -7,12 +7,11 @@ require 'prettyprint'
 # {Puppet::Interface::ActionBuilder} in the supplied block.
 # @api private
 class Puppet::Interface::Action
-  include Puppet::Util::MethodHelper
   extend  Puppet::Interface::DocGen
   include Puppet::Interface::FullDocs
 
   # @api private
-  def initialize(face, name, attrs = {})
+  def initialize(face, name)
     raise "#{name.inspect} is an invalid action name" unless name.to_s =~ /^[a-z]\w*$/
     @face    = face
     @name    = name.to_sym
@@ -23,8 +22,6 @@ class Puppet::Interface::Action
     @authors = []
     @license  = 'All Rights Reserved'
 
-    set_options(attrs)
-
     # @options collects the added options in the order they're declared.
     # @options_hash collects the options keyed by alias for quick lookups.
     @options        = []