bolt 0.15.0 → 0.16.0

data/vendored/puppet/lib/puppet/parser/ast/leaf.rb

@@ -28,7 +28,7 @@ class Puppet::Parser::AST::HostName < Puppet::Parser::AST::Leaf
     unless @value.is_a?(Regex)
       @value = @value.to_s.downcase
       if @value =~ /[^-\w.]/
-        raise Puppet::DevError, "'#{@value}' is not a valid hostname"
+        raise Puppet::DevError, _("'%{value}' is not a valid hostname") % { value: @value }
       end
     end
   end

data/vendored/puppet/lib/puppet/parser/ast/node.rb

@@ -2,9 +2,9 @@ class Puppet::Parser::AST::Node < Puppet::Parser::AST::TopLevelConstruct
   attr_accessor :names, :context
 
   def initialize(names, context = {})
-    raise ArgumentError, "names should be an array" unless names.is_a? Array
+    raise ArgumentError, _("names should be an array") unless names.is_a? Array
     if context[:parent]
-      raise Puppet::DevError, "Node inheritance is removed in Puppet 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation"
+      raise Puppet::DevError, _("Node inheritance is removed in Puppet 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation")
     end
 
     @names = names

data/vendored/puppet/lib/puppet/parser/compiler.rb

@@ -26,8 +26,8 @@ class Puppet::Parser::Compiler
     if !errors.empty?
       errors.each { |e| Puppet.err(e) } if errors.size > 1
       errmsg = [
-        "Compilation has been halted because: #{errors.first}",
-        "For more information, see https://docs.puppet.com/puppet/latest/reference/environments.html",
+        _("Compilation has been halted because: %{error}") % { error: errors.first },
+        _("For more information, see https://docs.puppet.com/puppet/latest/reference/environments.html"),
       ]
       raise(Puppet::Error, errmsg.join(' '))
     end
@@ -38,7 +38,7 @@ class Puppet::Parser::Compiler
     Puppet.log_exception(detail)
     raise
   rescue => detail
-    message = "#{detail} on node #{node.name}"
+    message = _("%{message} on node %{node}") % { message: detail, node: node.name }
     Puppet.log_exception(detail, message)
     raise Puppet::Error, message, detail.backtrace
  end
@@ -354,7 +354,7 @@ class Puppet::Parser::Compiler
   # evaluated later in the process.
   #
   def evaluate_classes(classes, scope, lazy_evaluate = true)
-    raise Puppet::DevError, "No source for scope passed to evaluate_classes" unless scope.source
+    raise Puppet::DevError, _("No source for scope passed to evaluate_classes") unless scope.source
     class_parameters = nil
     # if we are a param class, save the classes hash
     # and transform classes to be the keys
@@ -472,7 +472,8 @@ class Puppet::Parser::Compiler
         component = krt.find_hostclass(component_name)
       end
       if component.nil?
-        raise Puppet::ParseError, "Capability mapping error: #{kind} clause references nonexistent #{component_type} #{component_name}"
+        raise Puppet::ParseError, _("Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}") %
+            { kind: kind, component_type: component_type, component_name: component_name }
       end
 
       blueprint = args['blueprint']

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

@@ -152,7 +152,7 @@ module Puppet::Parser::Functions
     ftype = options[:type] || :statement
 
     unless ftype == :statement or ftype == :rvalue
-      raise Puppet::DevError, "Invalid statement type #{ftype.inspect}"
+      raise Puppet::DevError, _("Invalid statement type %{type}") % { type: ftype.inspect }
     end
 
     # the block must be installed as a method because it may use "return",

data/vendored/puppet/lib/puppet/parser/functions/fqdn_rand.rb

@@ -1,4 +1,4 @@
-require 'digest/md5'
+require 'digest/sha2'
 
 Puppet::Parser::Functions::newfunction(:fqdn_rand, :arity => -2, :type => :rvalue, :doc =>
   "Usage: `fqdn_rand(MAX, [SEED])`. MAX is required and must be a positive
@@ -16,6 +16,10 @@ Puppet::Parser::Functions::newfunction(:fqdn_rand, :arity => -2, :type => :rvalu
   node. (For example, `fqdn_rand(30)`, `fqdn_rand(30, 'expensive job 1')`, and
   `fqdn_rand(30, 'expensive job 2')` will produce totally different numbers.)") do |args|
     max = args.shift.to_i
-    seed = Digest::MD5.hexdigest([self['::fqdn'],max,args].join(':')).hex
+ 
+    # We are consciously not using different hash algs based on fips mode here
+    # since the randomness is not guaranteed to be predictable for a given node
+    # It just needs to be unique for a given node
+    seed = Digest::SHA256.hexdigest([self['::fqdn'],max,args].join(':')).hex
     Puppet::Util.deterministic_rand_int(seed,max)
 end

data/vendored/puppet/lib/puppet/parser/functions/generate.rb

@@ -21,13 +21,11 @@ Puppet::Parser::Functions::newfunction(:generate, :arity => -2, :type => :rvalue
       end
 
       unless valid
-        raise Puppet::ParseError,
-          _("Generators can only contain alphanumerics, file separators, and dashes")
+        raise Puppet::ParseError, _("Generators can only contain alphanumerics, file separators, and dashes")
       end
 
       if args[0] =~ /\.\./
-        raise Puppet::ParseError,
-          _("Can not use generators with '..' in them.")
+        raise Puppet::ParseError, _("Can not use generators with '..' in them.")
       end
 
       begin

data/vendored/puppet/lib/puppet/parser/functions/inline_template.rb

@@ -20,8 +20,7 @@ Puppet::Parser::Functions::newfunction(:inline_template, :type => :rvalue, :arit
       begin
         wrapper.result(string)
       rescue => detail
-        raise Puppet::ParseError,
-          _("Failed to parse inline template: %{detail}") % { detail: detail }, detail.backtrace
+        raise Puppet::ParseError, _("Failed to parse inline template: %{detail}") % { detail: detail }, detail.backtrace
       end
     end.join("")
 end

data/vendored/puppet/lib/puppet/parser/functions/sha256.rb

@@ -0,0 +1,5 @@
+require 'digest/sha2'
+
+Puppet::Parser::Functions::newfunction(:sha256, :type => :rvalue, :arity => 1, :doc => "Returns a SHA256 hash value from a provided string.") do |args|
+  Digest::SHA256.hexdigest(args[0])
+end

data/vendored/puppet/lib/puppet/parser/functions/template.rb

@@ -28,8 +28,12 @@ Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :arity => -2
         wrapper.result
       rescue => detail
         info = detail.backtrace.first.split(':')
-        raise Puppet::ParseError,
-          "Failed to parse template #{file}:\n  Filepath: #{info[0]}\n  Line: #{info[1]}\n  Detail: #{detail}\n"
+        message = []
+        message << _("Failed to parse template %{file}:") % { file: file }
+        message << _("  Filepath: %{file_path}") % { file_path: info[0] }
+        message << _("  Line: %{line}") % { line: info[1] }
+        message << _("  Detail: %{detail}") % { detail: detail }
+        raise Puppet::ParseError, message.join("\n") + "\n"
       end
     end.join("")
 end

data/vendored/puppet/lib/puppet/parser/resource.rb

@@ -169,72 +169,18 @@ class Puppet::Parser::Resource < Puppet::Resource
     end
 
     if evaluated?
+      error_location_str = Puppet::Util::Errors.error_location(file, line)
+      msg = if error_location_str.empty?
+              _('Attempt to override an already evaluated resource with new values')
+            else
+              _('Attempt to override an already evaluated resource, defined at %{error_location}, with new values') % { error_location: error_location_str }
+            end
       strict = Puppet[:strict]
       unless strict == :off
         if strict == :error
-          msg = if file && file != ''
-                  if line
-                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values') % { file: file, line: line }
-                  else
-                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values') % { file: file }
-                  end
-                else
-                  if line
-                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values') % { line: line }
-                  else
-                    _('Attempt to override an already evaluated resource with new values')
-                  end
-                end
           raise Puppet::ParseError.new(msg, resource.file, resource.line)
         else
-          msg = case
-                  # all 4 variables set
-                  when file && file != '' && line && resource.file && resource.file != '' && resource.line
-                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values at %{resource_file}:%{resource_line}') %
-                        { file: file, line: line, resource_file: resource.file, resource_line: resource.line }
-
-                  # 3 variables set
-                  when file && file != '' && line && resource.file && resource.file != ''
-                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values in %{resource_file}') %
-                        { file: file, line: line, resource_file: resource.file }
-                  when file && file != '' && line && resource.line
-                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values at line %{resource_line}') %
-                        { file: file, line: line, resource_line: resource.line }
-                  when file && file != '' && resource.file && resource.file != '' && resource.line
-                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values at %{resource_file}:%{resource_line}') %
-                        { file: file, resource_file: resource.file, resource_line: resource.line }
-                  when line && resource.file && resource.file != '' && resource.line
-                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values at %{resource_file}:%{resource_line}') %
-                        { line: line, resource_file: resource.file, resource_line: resource.line }
-
-                  # 2 variables set
-                  when file && file != '' && line
-                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values') % { file: file, line: line }
-                  when file && file != '' && resource.file && resource.file != ''
-                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values in %{resource_file}') % { file: file, resource_file: resource.file }
-                  when file && file != '' && resource.line
-                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values at line %{resource_line}') % { file: file, resource_line: resource.line }
-                  when line && resource.file && resource.file != ''
-                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values in %{resource_file}') % { line: line, resource_file: resource.file }
-                  when line && resource.line
-                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values at line %{resource_line}') % { line: line, resource_line: resource.line }
-                  when resource.file && resource.file != '' && resource.line
-                    _('Attempt to override an already evaluated resource with new values at %{resource_file}:%{resource_line}') % { resource_file: resource.file, resource_line: resource.line }
-
-                  # 1 variable set
-                  when file && file != ''
-                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values') % { file: file }
-                  when line
-                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values') % { line: line }
-                  when resource.file && resource.file != ''
-                    _('Attempt to override an already evaluated resource with new values in %{resource_file}') % { resource_file: resource.file }
-                  when resource.line
-                    _('Attempt to override an already evaluated resource with new values at line %{resource_line}') % { resource_line: resource.line }
-
-                  else
-                    # no variables set
-                    _('Attempt to override an already evaluated resource with new values')
-                end
+          msg += Puppet::Util::Errors.error_location_with_space(resource.file, resource.line)
           Puppet.warning(msg)
         end
       end
@@ -410,41 +356,22 @@ class Puppet::Parser::Resource < Puppet::Resource
 
     # The parameter is already set.  Fail if they're not allowed to override it.
     unless param.source.child_of?(current.source) || param.source.equal?(current.source) && scope.is_default?(type, param.name, current.value)
+      error_location_str = Puppet::Util::Errors.error_location(current.file, current.line)
       msg = if current.source.to_s == ''
-              if current.file && current.file != ''
-                if current.line
-                  _("Parameter '%{name}' is already set on %{resource} at %{file}:%{line}; cannot redefine") %
-                      { name: param.name, resource: ref, file: current.file, line: current.line }
-                else
-                  _("Parameter '%{name}' is already set on %{resource} in %{file}; cannot redefine") %
-                      { name: param.name, resource: ref, file: current.file }
-                end
+              if error_location_str.empty?
+                _("Parameter '%{name}' is already set on %{resource}; cannot redefine") %
+                    { name: param.name, resource: ref }
               else
-                if current.line
-                  _("Parameter '%{name}' is already set on %{resource} at line %{line}; cannot redefine") %
-                      { name: param.name, resource: ref, line: current.line }
-                else
-                  _("Parameter '%{name}' is already set on %{resource}; cannot redefine") %
-                      { name: param.name, resource: ref }
-                end
+                _("Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine") %
+                    { name: param.name, resource: ref, error_location: error_location_str }
               end
             else
-              if current.file && current.file != ''
-                if current.line
-                  _("Parameter '%{name}' is already set on %{resource} by %{source} at %{file}:%{line}; cannot redefine") %
-                      { name: param.name, resource: ref, source: current.source.to_s, file: current.file, line: current.line }
-                else
-                  _("Parameter '%{name}' is already set on %{resource} by %{source} in %{file}; cannot redefine") %
-                      { name: param.name, resource: ref, source: current.source.to_s, file: current.file }
-                end
+              if error_location_str.empty?
+                _("Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine") %
+                    { name: param.name, resource: ref, source: current.source.to_s }
               else
-                if current.line
-                  _("Parameter '%{name}' is already set on %{resource} by %{source} at line %{line}; cannot redefine") %
-                      { name: param.name, resource: ref, source: current.source.to_s, line: current.line }
-                else
-                  _("Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine") %
-                      { name: param.name, resource: ref, source: current.source.to_s }
-                end
+                _("Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine") %
+                    { name: param.name, resource: ref, source: current.source.to_s, error_location: error_location_str }
               end
             end
       raise Puppet::ParseError.new(msg, param.file, param.line)

data/vendored/puppet/lib/puppet/parser/scope.rb

@@ -378,7 +378,7 @@ class Puppet::Parser::Scope
     if compiler.is_a? Puppet::Parser::AbstractCompiler
       @compiler = compiler
     else
-      raise Puppet::DevError, "you must pass a compiler instance to a new scope object"
+      raise Puppet::DevError, _("you must pass a compiler instance to a new scope object")
     end
 
     set_options(options)
@@ -638,11 +638,9 @@ class Puppet::Parser::Scope
     unless Puppet[:strict_variables]
       # Do not issue warning if strict variables are on, as an error will be raised by variable_not_found
       location = if position[:lineproc]
-                   " at #{position[:lineproc].call}"
-                 elsif position[:file] && position[:line]
-                   " at #{position[:file]}:#{position[:line]}"
+                   Puppet::Util::Errors.error_location_with_space(nil, position[:lineproc].call)
                  else
-                   ""
+                   Puppet::Util::Errors.error_location_with_space(position[:file], position[:line])
                  end
       variable_not_found("#{class_name}::#{variable_name}", "#{reason}#{location}")
       return nil
@@ -765,7 +763,7 @@ class Puppet::Parser::Scope
       raise Puppet::ParseError.new(_("Cannot assign to a numeric match result variable '$%{name}'") % { name: name }) # unless options[:ephemeral]
     end
     unless name.is_a? String
-      raise Puppet::ParseError, _("Scope variable name %{value0} is a %{value1}, not a string") % { value0: name.inspect, value1: name.class }
+      raise Puppet::ParseError, _("Scope variable name %{name} is a %{class_type}, not a string") % { name: name.inspect, class_type: name.class }
     end
 
     # Check for reserved variable names
@@ -1018,17 +1016,17 @@ class Puppet::Parser::Scope
 
   # @api private
   def find_resource_type(type)
-    raise Puppet::DevError, "Scope#find_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
+    raise Puppet::DevError, _("Scope#find_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead")
   end
 
   # @api private
   def find_builtin_resource_type(type)
-    raise Puppet::DevError, "Scope#find_builtin_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
+    raise Puppet::DevError, _("Scope#find_builtin_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead")
   end
 
   # @api private
   def find_defined_resource_type(type)
-    raise Puppet::DevError, "Scope#find_defined_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
+    raise Puppet::DevError, _("Scope#find_defined_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead")
   end
 
 
@@ -1042,14 +1040,14 @@ class Puppet::Parser::Scope
     if respond_to? method
       send(method, *args)
     else
-      raise Puppet::DevError, "Function #{name} not defined despite being loaded!"
+      raise Puppet::DevError, _("Function %{name} not defined despite being loaded!") % { name: name }
     end
   end
 
   # To be removed when enough time has passed after puppet 5.0.0
   # @api private
   def resolve_type_and_titles(type, titles)
-    raise Puppet::DevError, "Scope#resolve_type_and_title() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
+    raise Puppet::DevError, _("Scope#resolve_type_and_title() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead")
   end
 
   # Transforms references to classes to the form suitable for
@@ -1068,7 +1066,10 @@ class Puppet::Parser::Scope
   def transform_and_assert_classnames(names)
     names.map do |name|
       case name
+      when NilClass
+        raise ArgumentError, _("Cannot use undef as a class name")
       when String
+        raise ArgumentError, _("Cannot use empty string as a class name") if name.empty?
         name.sub(/^([^:]{1,2})/, '::\1')
 
       when Puppet::Resource

data/vendored/puppet/lib/puppet/parser/templatewrapper.rb

@@ -62,7 +62,7 @@ class Puppet::Parser::TemplateWrapper
   # @api private
   def file=(filename)
     unless @__file__ = Puppet::Parser::Files.find_template(filename, scope.compiler.environment)
-      raise Puppet::ParseError, "Could not find template '#{filename}'"
+      raise Puppet::ParseError, _("Could not find template '%{filename}'") % { filename: filename }
     end
   end
 

data/vendored/puppet/lib/puppet/pops/evaluator/collector_transformer.rb

@@ -10,7 +10,8 @@ class CollectorTransformer
   end
 
   def transform(o, scope)
-    raise ArgumentError, "Expected CollectExpression" unless o.is_a? Model::CollectExpression
+    #TRANSLATORS 'CollectExpression' is a class name and should not be translated
+    raise ArgumentError, _("Expected CollectExpression") unless o.is_a? Model::CollectExpression
 
     raise "LHS is not a type" unless o.type_expr.is_a? Model::QualifiedReference
     type = o.type_expr.value().downcase()

data/vendored/puppet/lib/puppet/pops/evaluator/collectors/abstract_collector.rb

@@ -27,7 +27,7 @@ class Puppet::Pops::Evaluator::Collectors::AbstractCollector
     @scope = scope
 
     if !(overrides.nil? || overrides[:parameters])
-      raise ArgumentError, "Exported resource try to override without parameters"
+      raise ArgumentError, _("Exported resource try to override without parameters")
     end
 
     @overrides = overrides

data/vendored/puppet/lib/puppet/pops/evaluator/epp_evaluator.rb

@@ -4,7 +4,9 @@ class Puppet::Pops::Evaluator::EppEvaluator
 
   def self.inline_epp(scope, epp_source, template_args = nil)
     unless epp_source.is_a?(String)
-      raise ArgumentError, "inline_epp(): the first argument must be a String with the epp source text, got a #{epp_source.class}"
+      #TRANSLATORS 'inline_epp()' is a method name and 'epp' refers to 'Embedded Puppet (EPP) template' and should not be translated
+      raise ArgumentError, _("inline_epp(): the first argument must be a String with the epp source text, got a %{class_name}") %
+          { class_name: epp_source.class }
     end
 
     # Parse and validate the source
@@ -12,7 +14,8 @@ class Puppet::Pops::Evaluator::EppEvaluator
     begin
       result = parser.parse_string(epp_source, 'inlined-epp-text')
     rescue Puppet::ParseError => e
-      raise ArgumentError, "inline_epp(): Invalid EPP: #{e.message}"
+      #TRANSLATORS 'inline_epp()' is a method name and 'EPP' refers to 'Embedded Puppet (EPP) template' and should not be translated
+      raise ArgumentError, _("inline_epp(): Invalid EPP: %{detail}") % { detail: e.message }
     end
 
     # Evaluate (and check template_args)
@@ -21,7 +24,8 @@ class Puppet::Pops::Evaluator::EppEvaluator
 
   def self.epp(scope, file, env_name, template_args = nil)
     unless file.is_a?(String)
-      raise ArgumentError, "epp(): the first argument must be a String with the filename, got a #{file.class}"
+      #TRANSLATORS 'epp()' is a method name and should not be translated
+      raise ArgumentError, _("epp(): the first argument must be a String with the filename, got a %{class_name}") % { class_name: file.class }
     end
 
     unless Puppet::FileSystem.exist?(file)
@@ -41,7 +45,8 @@ class Puppet::Pops::Evaluator::EppEvaluator
     begin
       result = parser.parse_file(template_file)
     rescue Puppet::ParseError => e
-      raise ArgumentError, "epp(): Invalid EPP: #{e.message}"
+      #TRANSLATORS 'epp()' is a method name and 'EPP' refers to 'Embedded Puppet (EPP) template' and should not be translated
+      raise ArgumentError, _("epp(): Invalid EPP: %{detail}") % { detail: e.message }
     end
 
     # Evaluate (and check template_args)
@@ -55,13 +60,19 @@ class Puppet::Pops::Evaluator::EppEvaluator
 
     body = parse_result.body
     unless body.is_a?(Puppet::Pops::Model::LambdaExpression)
-      raise ArgumentError, "#{func_name}(): the parser did not produce a LambdaExpression, got '#{body.class}'"
+      #TRANSLATORS 'LambdaExpression' is a class name and should not be translated
+      raise ArgumentError, _("%{function_name}(): the parser did not produce a LambdaExpression, got '%{class_name}'") %
+          { function_name: func_name, class_name: body.class }
     end
     unless body.body.is_a?(Puppet::Pops::Model::EppExpression)
-      raise ArgumentError, "#{func_name}(): the parser did not produce an EppExpression, got '#{body.body.class}'"
+      #TRANSLATORS 'EppExpression' is a class name and should not be translated
+      raise ArgumentError, _("%{function_name}(): the parser did not produce an EppExpression, got '%{class_name}'") %
+          { function_name: func_name, class_name: body.body.class }
     end
     unless parse_result.definitions.empty?
-      raise ArgumentError, "#{func_name}(): The EPP template contains illegal expressions (definitions)"
+      #TRANSLATORS 'EPP' refers to 'Embedded Puppet (EPP) template'
+      raise ArgumentError, _("%{function_name}(): The EPP template contains illegal expressions (definitions)") %
+          { function_name: func_name }
     end
 
     parameters_specified = body.body.parameters_specified
@@ -99,7 +110,9 @@ class Puppet::Pops::Evaluator::EppEvaluator
       [{}, false]
     else
       unless template_args.is_a?(Hash)
-        raise ArgumentError, "#{func_name}(): the template_args must be a Hash, got a #{template_args.class}"
+        #TRANSLATORS 'template_args' is a variable name and should not be translated
+        raise ArgumentError, _("%{function_name}(): the template_args must be a Hash, got a %{class_name}") %
+            { function_name: func_name, class_name: template_args.class }
       end
       [template_args, true]
     end