puppet 4.10.0 → 5.0.0

data/lib/puppet/application/lookup.rb

@@ -5,7 +5,7 @@ require 'puppet/parser/compiler'
 
 class Puppet::Application::Lookup < Puppet::Application
 
-  RUN_HELP = "Run 'puppet lookup --help' for more details".freeze
+  RUN_HELP = _("Run 'puppet lookup --help' for more details").freeze
   DEEP_MERGE_OPTIONS = '--knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays'.freeze
 
   run_mode :master
@@ -57,19 +57,12 @@ class Puppet::Application::Lookup < Puppet::Application
     if %w{.yaml .yml .json}.include?(arg.match(/\.[^.]*$/)[0])
       options[:fact_file] = arg
     else
-      raise "The --fact file only accepts yaml and json files.\n#{RUN_HELP}"
+      raise _("The --fact file only accepts yaml and json files.\n%{run_help}") % { run_help: RUN_HELP }
     end
   end
 
-  # Sets up the 'node_cache_terminus' default to use the Write Only Yaml terminus :write_only_yaml.
-  # If this is not wanted, the setting ´node_cache_terminus´ should be set to nil.
-  # @see Puppet::Node::WriteOnlyYaml
-  # @see #setup_node_cache
-  # @see puppet issue 16753
-  #
   def app_defaults
     super.merge({
-      :node_cache_terminus => :write_only_yaml,
       :facts_terminus => 'yaml'
     })
   end
@@ -105,132 +98,154 @@ class Puppet::Application::Lookup < Puppet::Application
   def help
     <<-'HELP'
 
-puppet-lookup(8) -- Data in modules lookup function
+puppet-lookup(8) -- Interactive Hiera lookup
 ========
 
 SYNOPSIS
 --------
-The lookup command is used for debugging and testing a given data
-configuration. For a given data key, lookup will produce either a
-value or an explanation of how that value was obtained on the standard
-output stream with the specified rendering format. Lookup is designed
-to be run on a puppet master or a node in a masterless setup.
+Does Hiera lookups from the command line.
+
+Since this command needs access to your Hiera data, make sure to run it on a
+node that has a copy of that data. This usually means logging into a Puppet
+Server node and running 'puppet lookup' with sudo.
+
+The most common version of this command is:
+
+'puppet lookup <KEY> --node <NAME> --environment <ENV> --explain'
 
 USAGE
 -----
-puppet lookup [--help] [--type <TYPESTRING>] [--merge unique|hash|deep]
+puppet lookup [--help] [--type <TYPESTRING>] [--merge first|unique|hash|deep]
   [--knock-out-prefix <PREFIX-STRING>] [--sort-merged-arrays]
-  [--merge-hash-arrays] [--explain]
+  [--merge-hash-arrays] [--explain] [--environment <ENV>]
   [--default <VALUE>] [--node <NODE-NAME>] [--facts <FILE>]
   [--compile]
   [--render-as s|json|yaml|binary|msgpack] <keys>
 
 DESCRIPTION
 -----------
-The lookup command is a CLI interface for the puppet lookup function.
-When given one or more keys, the lookup command will return the first
-value found when run from the puppet master or a masterless node.
+The lookup command is a CLI for Puppet's 'lookup()' function. It searches your
+Hiera data and returns a value for the requested lookup key, so you can test and
+explore your data. It is a modern replacement for the 'hiera' command.
+
+Hiera usually relies on a node's facts to locate the relevant data sources. By
+default, 'puppet lookup' uses facts from the node you run the command on, but
+you can get data for any other node with the '--node <NAME>' option. If
+possible, the lookup command will use the requested node's real stored facts
+from PuppetDB; if PuppetDB isn't configured or you want to provide arbitrary
+fact values, you can pass alternate facts as a JSON or YAML file with '--facts
+<FILE>'.
+
+If you're debugging your Hiera data and want to see where values are coming
+from, use the '--explain' option.
 
-When an explanation has not been requested and
-lookup is simply looking up a value, the application will exit with 0
-if a value was found and 1 otherwise. When an explanation is requested,
-lookup will always exit with 0 unless there is a major error.
+If '--explain' isn't specified, lookup exits with 0 if a value was found and 1
+otherwise. With '--explain', lookup always exits with 0 unless there is a major
+error.
 
-The other options are as passed into the lookup function, and the effect
-they have on the lookup is described in more detail in the header
-for the lookup function:
+You can provide multiple lookup keys to this command, but it only returns a
+value for the first found key, omitting the rest.
 
-http://links.puppetlabs.com/lookup-docs
+For more details about how Hiera works, see the Hiera documentation:
+https://docs.puppet.com/puppet/latest/hiera_intro.html
 
 OPTIONS
 -------
-These options and their effects are described in more detail in
-the puppet lookup function linked to above.
 
 * --help:
   Print this help message.
 
-* --type <TYPESTRING>:
-  Assert that the value has the specified type.
+* --explain
+  Explain the details of how the lookup was performed and where the final value
+  came from (or the reason no value was found).
 
-* --merge unique|hash|deep:
-  Specify the merge strategy. 'hash' performs a simple hash-merge by
-  overwriting keys of lower lookup priority. 'unique' appends everything
-  to an array containing no nested arrays and where all duplicates have been
-  removed. 'deep' Performs a deep merge on values of Array and Hash type. There
-  are additional option flags that can be used with 'deep'.
+* --node <NODE-NAME>
+  Specify which node to look up data for; defaults to the node where the command
+  is run. Since Hiera's purpose is to provide different values for different
+  nodes (usually based on their facts), you'll usually want to use some specific
+  node's facts to explore your data. If the node where you're running this
+  command is configured to talk to PuppetDB, the command will use the requested
+  node's most recent facts. Otherwise, you can override facts with the '--facts'
+  option.
+
+* --facts <FILE>
+  Specify a .json or .yaml file of key => value mappings to override the facts
+  for this lookup. Any facts not specified in this file maintain their
+  original value.
+
+* --environment <ENV>
+  Like with most Puppet commands, you can specify an environment on the command
+  line. This is important for lookup because different environments can have
+  different Hiera data.
+
+* --merge first|unique|hash|deep:
+  Specify the merge behavior, overriding any merge behavior from the data's
+  lookup_options. 'first' returns the first value found. 'unique' appends
+  everything to a merged, deduplicated array. 'hash' performs a simple hash
+  merge by overwriting keys of lower lookup priority. 'deep' performs a deep
+  merge on values of Array and Hash type. There are additional options that can
+  be used with 'deep'.
 
 * --knock-out-prefix <PREFIX-STRING>
-  Can be used with the 'deep' merge strategy. Specify string value to signify
-  prefix which deletes elements from existing element.
+  Can be used with the 'deep' merge strategy. Specifies a prefix to indicate a
+  value should be removed from the final result.
 
 * --sort-merged-arrays
-  Can be used with the 'deep' merge strategy. When this flag is used all
-  merged arrays will be sorted.
+  Can be used with the 'deep' merge strategy. When this flag is used, all
+  merged arrays are sorted.
 
 * --merge-hash-arrays
-  Can be used with the 'deep' merge strategy. When this flag is used arrays
-  and hashes will be merged.
-
-* --explain
-  Print an explanation for the details of how the lookup performed rather
-  than the value returned for the key. The explanation will describe how
-  the result was obtained or why lookup failed to obtain the result.
+  Can be used with the 'deep' merge strategy. When this flag is used, hashes
+  WITHIN arrays are deep-merged with their counterparts by position.
 
 * --explain-options
-  Explain if a lookup_options hash will be used and how it was assembled
-  when performing a lookup.
+  Explain whether a lookup_options hash affects this lookup, and how that hash
+  was assembled. (lookup_options is how Hiera configures merge behavior in data.)
 
 * --default <VALUE>
-  A value produced if no value was found in the lookup.
-
-* --node <NODE-NAME>
-  Specify node which defines the scope in which the lookup will be performed.
-  If a node is not given, lookup will default to the machine from which the
-  lookup is being run (which should be the master).
+  A value to return if Hiera can't find a value in data. For emulating calls to
+  the 'lookup()' function that include a default.
 
-* --facts <FILE>
-  Specify a .json, or .yaml file holding key => value mappings that will
-  override the facts for the current node. Any facts not specified by the
-  user will maintain their original value.
+* --type <TYPESTRING>:
+  Assert that the value has the specified type. For emulating calls to the
+  'lookup()' function that include a data type.
 
 * --compile
-  Perform a full catalog compilation prior to the lookup. This is meaningful when
-  the catalog changes global variables that are referenced in interpolated values.
-  No catalog compilation takes place unless this flag is given.
+  Perform a full catalog compilation prior to the lookup. If your hierarchy and
+  data only use the $facts, $trusted, and $server_facts variables, you don't
+  need this option; however, if your Hiera configuration uses arbitrary
+  variables set by a Puppet manifest, you might need this option to get accurate
+  data. No catalog compilation takes place unless this flag is given.
 
 * --render-as s|json|yaml|binary|msgpack
-  Determines how the results will be rendered to the standard output where
-  s means plain text. The default when lookup is producing a value is yaml
-  and the default when producing an explanation is s.
+  Specify the output format of the results; "s" means plain text. The default
+  when producing a value is yaml and the default when producing an explanation
+  is s.
 
 EXAMPLE
 -------
-  If you wanted to lookup 'key_name' within the scope of the master, you would
-  call lookup like this:
+  To look up 'key_name' using the Puppet Server node's facts:
   $ puppet lookup key_name
 
-  If you wanted to lookup 'key_name' within the scope of the agent.local node,
-  you would call lookup like this:
+  To look up 'key_name' with agent.local's facts:
   $ puppet lookup --node agent.local key_name
 
-  If you wanted to get the first value found for 'key_name_one' and 'key_name_two'
-  within the scope of the agent.local node while merging values and knocking out
-  the prefix 'foo' while merging, you would call lookup like this:
+  To get the first value found for 'key_name_one' and 'key_name_two'
+  with agent.local's facts while merging values and knocking out
+  the prefix 'foo' while merging:
   $ puppet lookup --node agent.local --merge deep --knock-out-prefix foo key_name_one key_name_two
 
-  If you wanted to lookup 'key_name' within the scope of the agent.local node,
-  and return a default value of 'bar' if nothing was found, you would call
-  lookup like this:
+  To lookup 'key_name' with agent.local's facts, and return a default value of
+  'bar' if nothing was found:
   $ puppet lookup --node agent.local --default bar key_name
 
-  If you wanted to see an explanation of how the value for 'key_name' would be
-  obtained in the context of the agent.local node, you would call lookup like this:
+  To see an explanation of how the value for 'key_name' would be found, using
+  agent.local's facts:
   $ puppet lookup --node agent.local --explain key_name
 
 COPYRIGHT
 ---------
-Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2015 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
 
     HELP
@@ -244,7 +259,7 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
     #end
 
     if (options[:sort_merge_arrays] || options[:merge_hash_arrays] || options[:prefix]) && options[:merge] != 'deep'
-      raise "The options #{DEEP_MERGE_OPTIONS} are only available with '--merge deep'\n#{RUN_HELP}"
+      raise _("The options %{deep_merge_opts} are only available with '--merge deep'\n%{run_help}") % { deep_merge_opts: DEEP_MERGE_OPTIONS, run_help: RUN_HELP }
     end
 
     use_default_value = !options[:default_value].nil?
@@ -255,7 +270,7 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
       strategies = Puppet::Pops::MergeStrategy.strategy_keys
       unless strategies.include?(merge.to_sym)
         strategies = strategies.map {|k| "'#{k}'"}
-        raise "The --merge option only accepts #{strategies[0...-1].join(', ')}, or #{strategies.last}\n#{RUN_HELP}"
+        raise _("The --merge option only accepts %{strategies}, or %{last_strategy}\n%{run_help}") % { strategies: strategies[0...-1].join(', '), last_strategy: strategies.last, run_help: RUN_HELP }
       end
 
       if merge == 'deep'
@@ -280,16 +295,15 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
         # Explain lookup_options for lookup of an unqualified value.
         keys = Puppet::Pops::Lookup::GLOBAL
       else
-        raise 'No keys were given to lookup.'
+        raise _('No keys were given to lookup.')
       end
     end
     explain = explain_data || explain_options
 
     # Format defaults to text (:s) when producing an explanation and :yaml when producing the value
     format = options[:render_as] || (explain ? :s : :yaml)
-    renderer = Puppet::Network::FormatHandler.format(format == :json ? :pson : format)
-    raise "Unknown rendering format '#{format}'" if renderer.nil?
-
+    renderer = Puppet::Network::FormatHandler.format(format)
+    raise _("Unknown rendering format '%{format}'") % { format: format } if renderer.nil?
 
     generate_scope do |scope|
       lookup_invocation = Puppet::Pops::Lookup::Invocation.new(scope, {}, {}, explain ? Puppet::Pops::Lookup::Explainer.new(explain_options, only_explain_options) : nil)
@@ -315,7 +329,6 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
       # If we want to lookup the node we are currently on
       # we must returning these settings to their default values
       Puppet.settings[:facts_terminus] = 'facter'
-      Puppet.settings[:node_cache_terminus] = nil
     end
 
     node = Puppet::Node.indirection.find(node) unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
@@ -331,7 +344,7 @@ Copyright (c) 2015 Puppet Labs, LLC Licensed under the Apache 2.0 License
       end
 
       unless given_facts.instance_of?(Hash)
-        raise "Incorrect formatted data in #{fact_file} given via the --facts flag"
+        raise _("Incorrect formatted data in %{fact_file} given via the --facts flag") % { fact_file: fact_file }
       end
 
       node.parameters = original_facts.merge(given_facts)

data/lib/puppet/application/master.rb

@@ -130,27 +130,20 @@ Luke Kanies
 
 COPYRIGHT
 ---------
-Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2012 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     HELP
   end
 
-  # Sets up the 'node_cache_terminus' default to use the Write Only Yaml terminus :write_only_yaml.
-  # If this is not wanted, the setting ´node_cache_terminus´ should be set to nil.
-  # @see Puppet::Node::WriteOnlyYaml
-  # @see #setup_node_cache
-  # @see puppet issue 16753
-  #
   def app_defaults
     super.merge({
-      :node_cache_terminus => :write_only_yaml,
       :facts_terminus => 'yaml'
     })
   end
 
   def preinit
     Signal.trap(:INT) do
-      $stderr.puts "Canceling startup"
+      $stderr.puts _("Canceling startup")
       exit(0)
     end
 
@@ -169,12 +162,12 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def compile
     begin
       unless catalog = Puppet::Resource::Catalog.indirection.find(options[:node])
-        raise "Could not compile catalog for #{options[:node]}"
+        raise _("Could not compile catalog for %{node}") % { node: options[:node] }
       end
 
-      puts PSON::pretty_generate(catalog.to_resource, :allow_nan => true, :max_nesting => false)
+      puts JSON::pretty_generate(catalog.to_resource, :allow_nan => true, :max_nesting => false)
     rescue => detail
-      Puppet.log_exception(detail, "Failed to compile catalog for node #{options[:node]}: #{detail}")
+      Puppet.log_exception(detail, _("Failed to compile catalog for node %{node}: %{detail}") % { node: options[:node], detail: detail })
       exit(30)
     end
     exit(0)
@@ -194,20 +187,20 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
         begin
           Puppet::Util.chuser
         rescue => detail
-          Puppet.log_exception(detail, "Could not change user to #{Puppet[:user]}: #{detail}")
+          Puppet.log_exception(detail, _("Could not change user to %{user}: %{detail}") % { user: Puppet[:user], detail: detail })
           exit(39)
         end
       else
-        Puppet.err("Could not change user to #{Puppet[:user]}. User does not exist and is required to continue.")
+        Puppet.err(_("Could not change user to %{user}. User does not exist and is required to continue.") % { user: Puppet[:user] })
         exit(74)
       end
     end
 
     if options[:rack]
-      Puppet.deprecation_warning("The Rack Puppet master server is deprecated and will be removed in a future release. Please use Puppet Server instead. See http://links.puppetlabs.com/deprecate-rack-webrick-servers for more information.")
+      Puppet.deprecation_warning(_("The Rack Puppet master server is deprecated and will be removed in a future release. Please use Puppet Server instead. See http://links.puppet.com/deprecate-rack-webrick-servers for more information."))
       start_rack_master
     else
-      Puppet.deprecation_warning("The WEBrick Puppet master server is deprecated and will be removed in a future release. Please use Puppet Server instead. See http://links.puppetlabs.com/deprecate-rack-webrick-servers for more information.")
+      Puppet.deprecation_warning(_("The WEBrick Puppet master server is deprecated and will be removed in a future release. Please use Puppet Server instead. See http://links.puppet.com/deprecate-rack-webrick-servers for more information."))
       start_webrick_master
     end
   end
@@ -256,18 +249,17 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
     Puppet::SSL::Oids.load_custom_oid_file(Puppet[:trusted_oid_mapping_file])
   end
 
-  # Sets up a special node cache "write only yaml" that collects and stores node data in yaml
-  # but never finds or reads anything (this since a real cache causes stale data to be served
-  # in circumstances when the cache can not be cleared).
-  # @see puppet issue 16753
-  # @see Puppet::Node::WriteOnlyYaml
+  # Honor the :node_cache_terminus setting if users have specified it directly.
+  # We normally want this nil as use-cases for querying nodes should be going to
+  # PuppetDB.
+  # @see PUP-6060
   # @return [void]
   def setup_node_cache
     Puppet::Node.indirection.cache_class = Puppet[:node_cache_terminus]
   end
 
   def setup
-    raise Puppet::Error.new("Puppet master is not supported on Microsoft Windows") if Puppet.features.microsoft_windows?
+    raise Puppet::Error.new(_("Puppet master is not supported on Microsoft Windows")) if Puppet.features.microsoft_windows?
 
     setup_logs
 
@@ -316,6 +308,6 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def announce_start_of_master
-    Puppet.notice "Starting Puppet master version #{Puppet.version}"
+    Puppet.notice _("Starting Puppet master version %{version}") % { version: Puppet.version }
   end
 end

data/lib/puppet/application/resource.rb

@@ -123,32 +123,35 @@ Luke Kanies
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     HELP
   end
 
   def main
-    type, name, params = parse_args(command_line.args)
+    env = Puppet.lookup(:environments).get(Puppet[:environment])
+    Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
+      type, name, params = parse_args(command_line.args)
 
-    raise "Editing with Yaml output is not supported" if options[:edit] and options[:to_yaml]
+      raise _("Editing with Yaml output is not supported") if options[:edit] and options[:to_yaml]
 
-    resources = find_or_save_resources(type, name, params)
+      resources = find_or_save_resources(type, name, params)
 
     if options[:to_yaml]
-      text = resources.
-        map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml }.
-        join("\n")
+      text = resources.map do |resource|
+        resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml.force_encoding(Encoding.default_external)
+      end.join("\n")
       text.prepend("#{type.downcase}:\n")
     else
-      text = resources.
-        map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest }.
-        join("\n")
+      text = resources.map do |resource|
+        resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)
+      end.join("\n")
     end
 
-    options[:edit] ?
-      handle_editing(text) :
-      (puts text)
+      options[:edit] ?
+        handle_editing(text) :
+        (puts text)
+    end
   end
 
   def setup
@@ -186,15 +189,15 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def parse_args(args)
-    type = args.shift or raise "You must specify the type to display"
-    Puppet::Type.type(type) or raise "Could not find type #{type}"
+    type = args.shift or raise _("You must specify the type to display")
+    Puppet::Type.type(type) or raise _("Could not find type %{type}") % { type: type }
     name = args.shift
     params = {}
     args.each do |setting|
       if setting =~ /^(\w+)=(.+)$/
         params[$1] = $2
       else
-        raise "Invalid parameter setting #{setting}"
+        raise _("Invalid parameter setting %{setting}") % { setting: setting }
       end
     end
 
@@ -216,7 +219,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       end
     else
       if type == "file"
-        raise "Listing all file instances is not supported.  Please specify a file or directory, e.g. puppet resource file /etc"
+        raise _("Listing all file instances is not supported.  Please specify a file or directory, e.g. puppet resource file /etc")
       end
       Puppet::Resource.indirection.search( key, {} )
     end

data/lib/puppet/application.rb

@@ -228,7 +228,7 @@ class Application
       begin
         require @loader.expand(application_name.to_s.downcase)
       rescue LoadError => e
-        Puppet.log_and_raise(e, "Unable to find application '#{application_name}'. #{e}")
+        Puppet.log_and_raise(e, _("Unable to find application '%{application_name}'. %{error}") % { application_name: application_name, error: e })
       end
 
       class_name = Puppet::Util::ConstantInflector.file2constant(application_name.to_s)
@@ -249,7 +249,7 @@ class Application
       ################################################################
 
       if clazz.nil?
-        raise Puppet::Error.new("Unable to load application class '#{class_name}' from file 'puppet/application/#{application_name}.rb'")
+        raise Puppet::Error.new(_("Unable to load application class '%{class_name}' from file 'puppet/application/%{application_name}.rb'") % { class_name: class_name, application_name: application_name })
       end
 
       return clazz
@@ -339,27 +339,27 @@ class Application
     # I don't really like the names of these lifecycle phases.  It would be nice to change them to some more meaningful
     # names, and make deprecated aliases.  --cprice 2012-03-16
 
-    exit_on_fail("get application-specific default settings") do
+    exit_on_fail(_("get application-specific default settings")) do
       initialize_app_defaults
     end
 
     Puppet::ApplicationSupport.push_application_context(self.class.run_mode)
 
-    exit_on_fail("initialize")                                   { preinit }
-    exit_on_fail("parse application options")                    { parse_options }
-    exit_on_fail("prepare for execution")                        { setup }
+    exit_on_fail(_("initialize"))                                   { preinit }
+    exit_on_fail(_("parse application options"))                    { parse_options }
+    exit_on_fail(_("prepare for execution"))                        { setup }
 
     if deprecated?
       Puppet.deprecation_warning(_("`puppet %{name}` is deprecated and will be removed in a future release.") % { name: name })
     end
 
-    exit_on_fail("configure routes from #{Puppet[:route_file]}") { configure_indirector_routes }
-    exit_on_fail("log runtime debug info")                       { log_runtime_environment }
-    exit_on_fail("run")                                          { run_command }
+    exit_on_fail(_("configure routes from %{route_file}") % { route_file: Puppet[:route_file] }) { configure_indirector_routes }
+    exit_on_fail(_("log runtime debug info"))                       { log_runtime_environment }
+    exit_on_fail(_("run"))                                          { run_command }
   end
 
   def main
-    raise NotImplementedError, "No valid command or main"
+    raise NotImplementedError, _("No valid command or main")
   end
 
   def run_command
@@ -472,7 +472,7 @@ class Application
   end
 
   def help
-    "No help available for puppet #{name}"
+    _("No help available for puppet %{app_name}") % { app_name: name }
   end
 end
 end

data/lib/puppet/configurer/downloader.rb

@@ -6,7 +6,7 @@ class Puppet::Configurer::Downloader
 
   # Evaluate our download, returning the list of changed values.
   def evaluate
-    Puppet.info "Retrieving #{name}"
+    Puppet.info _("Retrieving %{name}") % { name: name }
 
     files = []
     begin
@@ -17,7 +17,7 @@ class Puppet::Configurer::Downloader
         end
       end
     rescue Puppet::Error => detail
-      Puppet.log_exception(detail, "Could not retrieve #{name}: #{detail}")
+      Puppet.log_exception(detail, _("Could not retrieve %{name}: %{detail}") % { name: name, detail: detail })
     end
     files
   end

data/lib/puppet/configurer/fact_handler.rb

@@ -21,7 +21,7 @@ module Puppet::Configurer::FactHandler
     rescue SystemExit,NoMemoryError
       raise
     rescue Exception => detail
-      message = "Could not retrieve local facts: #{detail}"
+      message = _("Could not retrieve local facts: %{detail}") % { detail: detail }
       Puppet.log_exception(detail, message)
       raise Puppet::Error, message, detail.backtrace
     end
@@ -30,8 +30,17 @@ module Puppet::Configurer::FactHandler
   def facts_for_uploading
     facts = find_facts
 
-    text = facts.render(:pson)
-
-    {:facts_format => :pson, :facts => CGI.escape(text)}
+    # NOTE: :facts specified as parameters are URI encoded here,
+    # then  encoded for a second time depending on their length:
+    #
+    # <= 1024 characters sent via query string of a HTTP GET, additionally query string encoded
+    # > 1024 characters sent in POST data, additionally x-www-form-urlencoded
+    # so it's only important that encoding method here return original values
+    # correctly when CGI.unescape called against it (in compiler code)
+    if Puppet[:preferred_serialization_format] == "pson"
+      {:facts_format => :pson, :facts => Puppet::Util.uri_query_encode(facts.render(:pson)) }
+    else
+      {:facts_format => 'application/json', :facts => Puppet::Util.uri_query_encode(facts.render(:json)) }
+    end
   end
 end