bolt 0.15.0 → 0.16.0

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

@@ -40,12 +40,17 @@ class Puppet::Interface::OptionBuilder
   # @api public
   # @dsl Faces
   def before_action(&block)
-    block or raise ArgumentError, "#{@option} before_action requires a block"
+    unless block
+      #TRANSLATORS 'before_action' is a method name and should not be translated
+      raise ArgumentError, _("%{option} before_action requires a block") % { option: @option }
+    end
     if @option.before_action
-      raise ArgumentError, "#{@option} already has a before_action set"
+      #TRANSLATORS 'before_action' is a method name and should not be translated
+      raise ArgumentError, _("%{option} already has a before_action set") % { option: @option }
     end
     unless block.arity == 3 then
-      raise ArgumentError, "before_action takes three arguments, action, args, and options"
+      #TRANSLATORS 'before_action' is a method name and should not be translated
+      raise ArgumentError, _("before_action takes three arguments, action, args, and options")
     end
     @option.before_action = block
   end
@@ -55,12 +60,17 @@ class Puppet::Interface::OptionBuilder
   # @api public
   # @dsl Faces
   def after_action(&block)
-    block or raise ArgumentError, "#{@option} after_action requires a block"
+    unless block
+      #TRANSLATORS 'after_action' is a method name and should not be translated
+      raise ArgumentError, _("%{option} after_action requires a block") % { option: @option }
+    end
     if @option.after_action
-      raise ArgumentError, "#{@option} already has an after_action set"
+      #TRANSLATORS 'after_action' is a method name and should not be translated
+      raise ArgumentError, _("%{option} already has an after_action set") % { option: @option }
     end
     unless block.arity == 3 then
-      raise ArgumentError, "after_action takes three arguments, action, args, and options"
+      #TRANSLATORS 'after_action' is a method name and should not be translated
+      raise ArgumentError, _("after_action takes three arguments, action, args, and options")
     end
     @option.after_action = block
   end
@@ -79,12 +89,16 @@ class Puppet::Interface::OptionBuilder
   # @api public
   # @dsl Faces
   def default_to(&block)
-    block or raise ArgumentError, "#{@option} default_to requires a block"
+    unless block
+      #TRANSLATORS 'default_to' is a method name and should not be translated
+      raise ArgumentError, _("%{option} default_to requires a block") % { option: @option }
+    end
     if @option.has_default?
-      raise ArgumentError, "#{@option} already has a default value"
+      raise ArgumentError, _("%{option} already has a default value") % { option: @option }
     end
     unless block.arity == 0
-      raise ArgumentError, "#{@option} default_to block should not take any arguments"
+      #TRANSLATORS 'default_to' is a method name and should not be translated
+      raise ArgumentError, _("%{option} default_to block should not take any arguments") % { option: @option }
     end
     @option.default = block
   end

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

@@ -9,7 +9,10 @@ module Puppet::Interface::OptionManager
   def display_global_options(*args)
     @display_global_options ||= []
     [args].flatten.each do |refopt|
-      raise ArgumentError, "Global option #{refopt} does not exist in Puppet.settings" unless Puppet.settings.include? refopt
+      unless Puppet.settings.include?(refopt)
+        #TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
+        raise ArgumentError, _("Global option %{option} does not exist in Puppet.settings") % { option: refopt }
+      end
       @display_global_options << refopt if refopt
     end
     @display_global_options.uniq!
@@ -51,13 +54,15 @@ module Puppet::Interface::OptionManager
 
     option.aliases.each do |name|
       if conflict = get_option(name) then
-        raise ArgumentError, "Option #{option} conflicts with existing option #{conflict}"
+        raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict}") %
+            { option: option, conflict: conflict }
       end
 
       actions.each do |action|
         action = get_action(action)
         if conflict = action.get_option(name) then
-          raise ArgumentError, "Option #{option} conflicts with existing option #{conflict} on #{action}"
+          raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict} on %{action}") %
+              { option: option, conflict: conflict, action: action }
         end
       end
     end

data/vendored/puppet/lib/puppet/metatype/manager.rb

@@ -72,7 +72,9 @@ module Manager
   def newtype(name, options = {}, &block)
     # Handle backward compatibility
     unless options.is_a?(Hash)
-      Puppet.warning "Puppet::Type.newtype(#{name}) now expects a hash as the second argument, not #{options.inspect}"
+      #TRANSLATORS 'Puppet::Type.newtype' should not be translated
+      Puppet.warning(_("Puppet::Type.newtype(%{name}) now expects a hash as the second argument, not %{argument}") %
+                         { name: name, argument: options.inspect})
     end
 
     # First make sure we don't have a method sitting around
@@ -107,7 +109,8 @@ module Manager
     # Now define a "new<type>" method for convenience.
     if self.respond_to? newmethod
       # Refuse to overwrite existing methods like 'newparam' or 'newtype'.
-      Puppet.warning "'new#{name.to_s}' method already exists; skipping"
+      #TRANSLATORS 'new%{method}' will become a method name, do not translate this string
+      Puppet.warning(_("'new%{method}' method already exists; skipping") % { method: name.to_s })
     else
       selfobj.send(:define_method, newmethod) do |*args|
         klass.new(*args)
@@ -169,7 +172,8 @@ module Manager
     end
     # Try loading the type.
     if typeloader.load(name, Puppet.lookup(:current_environment))
-      Puppet.warning "Loaded puppet/type/#{name} but no class was created" unless @types.include? name
+      #TRANSLATORS 'puppet/type/%{name}' should not be translated
+      Puppet.warning(_("Loaded puppet/type/%{name} but no class was created") % { name: name }) unless @types.include? name
     elsif !Puppet[:always_retry_plugins]
       # PUP-5482 - Only look for a type once if plugin retry is disabled
       @types[name] = nil

data/vendored/puppet/lib/puppet/module.rb

@@ -206,7 +206,8 @@ class Puppet::Module
   rescue Errno::ENOENT
     {}
   rescue JSON::JSONError => e
-    msg = "#{name} has an invalid and unparsable metadata.json file. The parse error: #{e.message}"
+    #TRANSLATORS 'metadata.json' is a specific file name and should not be translated.
+    msg = _("%{name} has an invalid and unparsable metadata.json file. The parse error: %{error}") % { name: name, error: e.message }
     case Puppet[:strict]
     when :off
       Puppet.debug(msg)

data/vendored/puppet/lib/puppet/module_tool/applications/builder.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'json'
 require 'puppet/file_system'
 require 'pathspec'
+require 'facter'
 
 module Puppet::ModuleTool
   module Applications
@@ -14,6 +15,9 @@ module Puppet::ModuleTool
       end
 
       def run
+        # Disallow anything that invokes md5 to avoid un-friendly termination due to FIPS
+        raise _("Module building is prohibited in FIPS mode.") if Facter.value(:fips_enabled)
+
         load_metadata!
         create_directory
         copy_contents

data/vendored/puppet/lib/puppet/module_tool/applications/installer.rb

@@ -52,6 +52,9 @@ module Puppet::ModuleTool
       end
 
       def run
+        # Disallow anything that invokes md5 to avoid un-friendly termination due to FIPS
+        raise _("Module install is prohibited in FIPS mode.") if Facter.value(:fips_enabled)
+
         name = @name.tr('/', '-')
         version = options[:version] || '>= 0.0.0'
 

data/vendored/puppet/lib/puppet/module_tool/applications/uninstaller.rb

@@ -16,6 +16,9 @@ module Puppet::ModuleTool
       end
 
       def run
+        # Disallow anything that invokes md5 to avoid un-friendly termination due to FIPS
+        raise _("Module uninstall is prohibited in FIPS mode.") if Facter.value(:fips_enabled)
+
         results = {
           :module_name       => @name,
           :requested_version => @version,

data/vendored/puppet/lib/puppet/module_tool/applications/upgrader.rb

@@ -27,6 +27,9 @@ module Puppet::ModuleTool
       end
 
       def run
+        # Disallow anything that invokes md5 to avoid un-friendly termination due to FIPS
+        raise _("Module upgrade is prohibited in FIPS mode.") if Facter.value(:fips_enabled)
+
         name = @name.tr('/', '-')
         version = options[:version] || '>= 0.0.0'
 

data/vendored/puppet/lib/puppet/module_tool/errors/shared.rb

@@ -98,11 +98,11 @@ module Puppet::ModuleTool::Errors
     def multiline
       dependency_list = []
       dependency_list << _("You specified '%{name}' (%{version})") % { name: @source.first[:name], version: v(@requested_version) }
-      dependency_list = @source[1..-1].map do |m|
+      dependency_list += @source[1..-1].map do |m|
         #TRANSLATORS This message repeats as separate lines as a list under the heading "You specified '%{name}' (%{version})\n"
-        _("which depends on '%{name}' (%{version})") % { name: m[:name], version: v(m[:version]) }
+        _("This depends on '%{name}' (%{version})") % { name: m[:name], version: v(m[:version]) }
       end
-      message         = []
+      message = []
       message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: v(@requested_version) }
       message << _("  No version of '%{module_name}' will satisfy dependencies") % { module_name: @module_name }
       message << dependency_list.map {|s| "    #{s}".join(",\n")}

data/vendored/puppet/lib/puppet/network/auth_config_parser.rb

@@ -29,11 +29,14 @@ class AuthConfigParser
       when /^\s*(allow(?:_ip)?|deny(?:_ip)?|method|environment|auth(?:enticated)?)\s+(.+?)(\s*#.*)?$/
         if right.nil?
           #TRANSLATORS "path" is a configuration file entry and should not be translated
-          raise Puppet::ConfigurationError, _("Missing or invalid 'path' before right directive at line %{count} of %{file}") % { count: count, file: @file }
+          raise Puppet::ConfigurationError, _("Missing or invalid 'path' before right directive at %{error_location}") %
+              { error_location: Puppet::Util::Errors.error_location(@file, count) }
         end
         parse_right_directive(right, $1, $2, count)
       else
-        raise Puppet::ConfigurationError, _("Invalid line %{count}: %{line}") % { count: count, line: line }
+        error_location_str = Puppet::Util::Errors.error_location(nil, count)
+        raise Puppet::ConfigurationError, _("Invalid entry at %{error_location}: %{file_text}") %
+            { error_location: error_location_str, file_text: line }
       end
       count += 1
     }
@@ -65,8 +68,9 @@ class AuthConfigParser
     when /auth(?:enticated)?/
       modify_right(right, :restrict_authenticated, value, _("adding authentication %{value}"), count)
     else
-      raise Puppet::ConfigurationError,
-        _("Invalid argument '%{var}' at line %{count}") % { var: var, count: count }
+      error_location_str = Puppet::Util::Errors.error_location(nil, count)
+      raise Puppet::ConfigurationError, _("Invalid argument '%{var}' at %{error_location}") %
+          { var: var, error_location: error_location_str }
     end
   end
 
@@ -77,7 +81,8 @@ class AuthConfigParser
         right.info msg % { value: val }
         right.send(method, val)
       rescue Puppet::AuthStoreError => detail
-        raise Puppet::ConfigurationError, _("%{detail} at line %{count} of %{file}") % { detail: detail, count: count, file: @file }, detail.backtrace
+        error_location_str = Puppet::Util::Errors.error_location(@file, count)
+        raise Puppet::ConfigurationError, "#{detail} #{error_location_str}", detail.backtrace
       end
     end
   end

data/vendored/puppet/lib/puppet/network/authstore.rb

@@ -19,7 +19,7 @@ module Puppet
         # This is probably unnecessary, and can cause some weirdnesses in
         # cases where we're operating over localhost but don't have a real
         # IP defined.
-        raise Puppet::DevError, "Name and IP must be passed to 'allowed?'" unless name and ip
+        raise Puppet::DevError, _("Name and IP must be passed to 'allowed?'") unless name and ip
         # else, we're networked and such
       else
         # we're local
@@ -186,7 +186,7 @@ module Puppet
       # Set the declaration type.  Either :allow or :deny.
       def type=(type)
         type = type.intern
-        raise ArgumentError, "Invalid declaration type #{type}" unless VALID_TYPES.include?(type)
+        raise ArgumentError, _("Invalid declaration type %{type}") % { type: type } unless VALID_TYPES.include?(type)
         @type = type
       end
 

data/vendored/puppet/lib/puppet/network/client_request.rb

@@ -12,7 +12,7 @@ module Puppet::Network # :nodoc:
     # are responsible for setting the values correctly, but this common
     # format makes it possible to check rights.
     def call
-      raise ArgumentError, "Request is not set up; cannot build call" unless handler and method
+      raise ArgumentError, _("Request is not set up; cannot build call") unless handler and method
 
       [handler, method].join(".")
     end

data/vendored/puppet/lib/puppet/network/format.rb

@@ -40,7 +40,7 @@ class Puppet::Network::Format
       init_attribute(method, value)
     end
 
-    raise ArgumentError, "Unsupported option(s) #{@options.keys}" unless @options.empty?
+    raise ArgumentError, _("Unsupported option(s) %{options_list}") % { options_list: @options.keys } unless @options.empty?
 
     @options = nil
 
@@ -69,8 +69,8 @@ class Puppet::Network::Format
   def render_multiple(instances)
     # This method implicitly assumes that all instances are of the same type.
     return instances[0].class.send(render_multiple_method, instances) if instances[0].class.respond_to?(render_multiple_method)
-    raise NotImplementedError, _("%{klass} does not respond to %{method}; can not render multiple instances to %{mime}") \
-                               % { klass: instances[0].class, method: render_multiple_method, mime: mime }
+    raise NotImplementedError, _("%{klass} does not respond to %{method}; can not render multiple instances to %{mime}") %
+        { klass: instances[0].class, method: render_multiple_method, mime: mime }
   end
 
   def required_methods_present?(klass)

data/vendored/puppet/lib/puppet/network/http/api/indirection_type.rb

@@ -26,7 +26,7 @@ class Puppet::Network::HTTP::API::IndirectionType
     when :master
       master_url_prefix
     else
-      raise ArgumentError, "Not a valid indirection type"
+      raise ArgumentError, _("Not a valid indirection type")
     end
   end
 end

data/vendored/puppet/lib/puppet/network/http/api/master/v3/environment.rb

@@ -36,12 +36,15 @@ class Puppet::Network::HTTP::API::Master::V3::Environment
 
       nonexistent_components = mapped_components - required_components
       if nonexistent_components.any?
-        raise Puppet::ParseError.new("Application #{app} assigns nodes to non-existent components: #{nonexistent_components.join(', ')}", file, line)
+        raise Puppet::ParseError.new(
+            _("Application %{application} assigns nodes to non-existent components: %{component_list}") %
+                { application: app, component_list: nonexistent_components.join(', ') }, file, line)
       end
 
       missing_components = required_components - mapped_components
       if missing_components.any?
-        raise Puppet::ParseError.new("Application #{app} has components without assigned nodes: #{missing_components.join(', ')}", file, line)
+        raise Puppet::ParseError.new(_("Application %{application} has components without assigned nodes: %{component_list}") %
+                                         { application: app, component_list: missing_components.join(', ') }, file, line)
       end
 
       # Turn the 'nodes' hash into a map component ref => node name

data/vendored/puppet/lib/puppet/network/http/webrick.rb

@@ -17,8 +17,6 @@ class Puppet::Network::HTTP::WEBrick
   def listen(address, port)
     @server = create_server(address, port)
 
-    @server.listeners.each { |l| l.start_immediately = false }
-
     @server.mount('/', Puppet::Network::HTTP::WEBrickREST)
 
     raise _("WEBrick server is already listening") if @listening
@@ -102,7 +100,7 @@ class Puppet::Network::HTTP::WEBrick
 
     results[:SSLPrivateKey] = host.key.content
     results[:SSLCertificate] = host.certificate.content
-    results[:SSLStartImmediately] = true
+    results[:SSLStartImmediately] = false
     results[:SSLEnable] = true
     results[:SSLOptions] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
 

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

@@ -27,10 +27,10 @@ class Puppet::Node
     @name       = data['name']       || (raise ArgumentError, _("No name provided in serialized data"))
     @classes    = data['classes']    || []
     @parameters = data['parameters'] || {}
-    env_name = data['environment']
+    env_name = data['environment'] || @parameters[ENVIRONMENT]
     env_name = env_name.intern unless env_name.nil?
     @environment_name = env_name
-    environment = env_name # rubocop:disable Lint/UselessAssignment
+    self.environment = env_name
   end
 
   def self.from_data_hash(data)
@@ -45,10 +45,17 @@ class Puppet::Node
       'environment' => environment.name.to_s,
     }
     result['classes'] = classes unless classes.empty?
-    result['parameters'] = parameters unless parameters.empty?
+    serialized_params = self.serializable_parameters
+    result['parameters'] = serialized_params unless serialized_params.empty?
     result
   end
 
+  def serializable_parameters
+    new_params = parameters.dup
+    new_params.delete(ENVIRONMENT)
+    new_params
+  end
+
   def environment
     if @environment
       @environment
@@ -60,7 +67,7 @@ class Puppet::Node
       else
         # This should not be :current_environment, this is the default
         # for a node when it has not specified its environment
-        # Tt will be used to establish what the current environment is.
+        # it will be used to establish what the current environment is.
         #
         self.environment = Puppet.lookup(:environments).get!(Puppet[:environment])
       end
@@ -78,7 +85,8 @@ class Puppet::Node
 
     # Keep environment_name attribute and parameter in sync if they have been set
     unless @environment.nil?
-      @parameters[ENVIRONMENT] = @environment.name.to_s if @parameters.include?(ENVIRONMENT)
+      # always set the environment parameter. It becomes top scope $environment for a manifest during catalog compilation.
+      @parameters[ENVIRONMENT] = @environment.name.to_s
       self.environment_name = @environment.name if instance_variable_defined?(:@environment_name)
     end
     @environment
@@ -132,7 +140,10 @@ class Puppet::Node
 
     if !@facts.nil?
       @facts.sanitize
+      # facts should never modify the environment parameter
+      orig_param_env = @parameters[ENVIRONMENT]
       merge(@facts.values)
+      @parameters[ENVIRONMENT] = orig_param_env
     end
   end
 
@@ -145,8 +156,6 @@ class Puppet::Node
         @parameters[name] = value
       end
     end
-
-    @parameters[ENVIRONMENT] ||= self.environment.name.to_s
   end
 
   # Add extra facts, such as facts given to lookup on the command line The

data/vendored/puppet/lib/puppet/parameter.rb

@@ -338,7 +338,7 @@ class Puppet::Parameter
       self.resource = resource
       options.delete(:resource)
     else
-      raise Puppet::DevError, "No resource set for #{self.class.name}"
+      raise Puppet::DevError, _("No resource set for %{name}") % { name: self.class.name }
     end
 
     set_options(options)
@@ -425,7 +425,7 @@ class Puppet::Parameter
       Puppet.debug "Reraising #{detail}"
       raise
     rescue => detail
-      raise Puppet::DevError, "Munging failed for value #{value.inspect} in class #{self.name}: #{detail}", detail.backtrace
+      raise Puppet::DevError, _("Munging failed for value %{value} in class %{class_name}: %{detail}") % { value: value.inspect, class_name: self.name, detail: detail }, detail.backtrace
     end
     ret
   end
@@ -459,7 +459,7 @@ class Puppet::Parameter
     rescue Puppet::Error, TypeError
       raise
     rescue => detail
-      raise Puppet::DevError, "Validate method failed for class #{self.name}: #{detail}", detail.backtrace
+      raise Puppet::DevError, _("Validate method failed for class %{class_name}: %{detail}") % { class_name: self.name, detail: detail }, detail.backtrace
     end
   end
 

data/vendored/puppet/lib/puppet/parameter/value_collection.rb

@@ -19,7 +19,7 @@ class Puppet::Parameter::ValueCollection
   def aliasvalue(name, other)
     other = other.to_sym
     unless value = match?(other)
-      raise Puppet::DevError, "Cannot alias nonexistent value #{other}"
+      raise Puppet::DevError, _("Cannot alias nonexistent value %{value}") % { value: other }
     end
 
     value.alias(name)
@@ -133,7 +133,10 @@ class Puppet::Parameter::ValueCollection
     call_opt = options[:call]
     unless call_opt.nil?
       devfail "Cannot use obsolete :call value '#{call_opt}' for property '#{self.class.name}'" unless call_opt == :none || call_opt == :instead
-      Puppet.deprecation_warning(_("Property option :call is deprecated and no longer used. Please remove it."))
+      #TRANSLATORS ':call' is a property and should not be translated
+      message = _("Property option :call is deprecated and no longer used.")
+      message += ' ' + _("Please remove it.")
+      Puppet.deprecation_warning(message)
       options = options.reject { |k,v| k == :call }
     end