puppet 4.10.12 → 5.0.0

data/lib/puppet/face/catalog.rb

@@ -64,7 +64,7 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
       catalog = Puppet::Face[:catalog, "0.0.1"].find(Puppet[:certname]) or raise "Could not find catalog for #{Puppet[:certname]}"
       catalog = catalog.to_ral
 
-      report = Puppet::Transaction::Report.new("apply")
+      report = Puppet::Transaction::Report.new
       report.configuration_version = catalog.version
       report.environment = Puppet[:environment]
 

data/lib/puppet/face/catalog/select.rb

@@ -1,9 +1,9 @@
 # Select and show a list of resources of a given type.
 Puppet::Face.define(:catalog, '0.0.1') do
   action :select do
-    summary "Retrieve a catalog and filter it for resources of a given type."
-    arguments "<host> <resource_type>"
-    returns <<-'EOT'
+    summary _("Retrieve a catalog and filter it for resources of a given type.")
+    arguments _("<host> <resource_type>")
+    returns _(<<-'EOT')
       A list of resource references ("Type[title]"). When used from the API,
       returns an array of Puppet::Resource objects excised from a catalog.
     EOT
@@ -40,7 +40,7 @@ Puppet::Face.define(:catalog, '0.0.1') do
 
     when_rendering :console do |value|
       if value.nil? then
-        "no matching resources found"
+        _("no matching resources found")
       else
         value.map {|x| x.to_s }.join("\n")
       end

data/lib/puppet/face/certificate.rb

@@ -3,9 +3,9 @@ require 'puppet/ssl/host'
 
 Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   copyright "Puppet Inc.", 2011
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "Provide access to the CA for certificate management."
+  summary _("Provide access to the CA for certificate management.")
   description <<-EOT
     This subcommand interacts with a local or remote Puppet certificate
     authority. Currently, its behavior is not a full superset of `puppet
@@ -14,9 +14,9 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
     signed certificate.
   EOT
 
-  option "--ca-location LOCATION" do
+  option "--ca-location " + _("LOCATION") do
     required
-    summary "Which certificate authority to use (local or remote)."
+    summary _("Which certificate authority to use (local or remote).")
     description <<-EOT
       Whether to act on the local certificate authority or one provided by a
       remote puppet master. Allowed values are 'local' and 'remote.'
@@ -26,15 +26,15 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
 
     before_action do |action, args, options|
       unless [:remote, :local, :only].include? options[:ca_location].to_sym
-        raise ArgumentError, "Valid values for ca-location are 'remote', 'local', 'only'."
+        raise ArgumentError, _("Valid values for ca-location are 'remote', 'local', 'only'.")
       end
       Puppet::SSL::Host.ca_location = options[:ca_location].to_sym
     end
   end
 
   action :generate do
-    summary "Generate a new certificate signing request."
-    arguments "<host>"
+    summary _("Generate a new certificate signing request.")
+    arguments _("<host>")
     returns "Nothing."
     description <<-EOT
       Generates and submits a certificate signing request (CSR) for the
@@ -53,8 +53,8 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
 
     # Duplicate the option here explicitly to distinguish if it was passed arg
     # us vs. set in the config file.
-    option "--dns-alt-names NAMES" do
-      summary "Additional DNS names to add to the certificate request"
+    option "--dns-alt-names "+ _("NAMES") do
+      summary _("Additional DNS names to add to the certificate request")
       description Puppet.settings.setting(:dns_alt_names).desc
     end
 
@@ -70,7 +70,7 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
       # jeffweiss 17 april 2012
 
       global_setting_from_cli = Puppet.settings.set_by_cli?(:dns_alt_names) == true
-      raise ArgumentError, "Can't specify both --dns_alt_names and --dns-alt-names" if options[:dns_alt_names] and global_setting_from_cli
+      raise ArgumentError, _("Can't specify both --dns_alt_names and --dns-alt-names") if options[:dns_alt_names] and global_setting_from_cli
       options[:dns_alt_names] = Puppet[:dns_alt_names] if global_setting_from_cli
 
       # If dns_alt_names are specified via the command line, we will always add
@@ -86,7 +86,7 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   end
 
   action :list do
-    summary "List all certificate signing requests."
+    summary _("List all certificate signing requests.")
     returns <<-EOT
       An array of #inspect output from CSR objects. This output is
       currently messy, but does contain the names of nodes requesting
@@ -102,8 +102,8 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   end
 
   action :sign do
-    summary "Sign a certificate signing request for HOST."
-    arguments "<host>"
+    summary _("Sign a certificate signing request for HOST.")
+    arguments _("<host>")
     returns <<-EOT
       A string that appears to be (but isn't) an x509 certificate.
     EOT
@@ -114,14 +114,14 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
     EOT
 
     option("--[no-]allow-dns-alt-names") do
-      summary "Whether or not to accept DNS alt names in the certificate request"
+      summary _("Whether or not to accept DNS alt names in the certificate request")
     end
 
     when_invoked do |name, options|
       host = Puppet::SSL::Host.new(name)
       if Puppet::SSL::Host.ca_location == :remote
         if options[:allow_dns_alt_names]
-          raise ArgumentError, "--allow-dns-alt-names may not be specified with a remote CA"
+          raise ArgumentError, _("--allow-dns-alt-names may not be specified with a remote CA")
         end
 
         host.desired_state = 'signed'
@@ -130,7 +130,7 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
         # We have to do this case manually because we need to specify
         # allow_dns_alt_names.
         unless ca = Puppet::SSL::CertificateAuthority.instance
-          raise ArgumentError, "This process is not configured as a certificate authority"
+          raise ArgumentError, _("This process is not configured as a certificate authority")
         end
 
         signing_options = {allow_dns_alt_names: options[:allow_dns_alt_names]}
@@ -142,8 +142,8 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
 
   # Indirector action doc overrides
   find = get_action(:find)
-  find.summary "Retrieve a certificate."
-  find.arguments "<host>"
+  find.summary _("Retrieve a certificate.")
+  find.arguments _("<host>")
   find.render_as = :s
   find.returns <<-EOT
     An x509 SSL certificate.
@@ -153,8 +153,8 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do
   EOT
 
   destroy = get_action(:destroy)
-  destroy.summary "Delete a certificate."
-  destroy.arguments "<host>"
+  destroy.summary _("Delete a certificate.")
+  destroy.arguments _("<host>")
   destroy.returns "Nothing."
   destroy.description <<-EOT
     Deletes a certificate. This action currently only works on the local CA.

data/lib/puppet/face/config.rb

@@ -3,17 +3,17 @@ require 'puppet/settings/ini_file'
 
 Puppet::Face.define(:config, '0.0.1') do
   copyright "Puppet Inc.", 2011
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "Interact with Puppet's settings."
+  summary _("Interact with Puppet's settings.")
 
   description "This subcommand can inspect and modify settings from Puppet's
     'puppet.conf' configuration file. For documentation about individual settings,
     see https://docs.puppetlabs.com/puppet/latest/reference/configuration.html."
 
-  option "--section SECTION_NAME" do
+  option "--section " + _("SECTION_NAME") do
     default_to { "main" }
-    summary "The section of the configuration file to interact with."
+    summary _("The section of the configuration file to interact with.")
     description <<-EOT
       The section of the puppet.conf configuration file to interact with.
 
@@ -31,8 +31,8 @@ Puppet::Face.define(:config, '0.0.1') do
   end
 
   action(:print) do
-    summary "Examine Puppet's current settings."
-    arguments "(all | <setting> [<setting> ...]"
+    summary _("Examine Puppet's current settings.")
+    arguments _("(all | <setting> [<setting> ...]")
     description <<-'EOT'
       Prints the value of a single setting or a list of settings.
 
@@ -68,7 +68,7 @@ Puppet::Face.define(:config, '0.0.1') do
       }
 
       Puppet.override(Puppet.base_context(loader_settings),
-                     "New environment loaders generated from the requested section.") do
+                     _("New environment loaders generated from the requested section.")) do
         # And now we can lookup values that include those from environments configured from
         # the requested section
         values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
@@ -85,8 +85,8 @@ Puppet::Face.define(:config, '0.0.1') do
   end
 
   action(:set) do
-    summary "Set Puppet's settings."
-    arguments "[setting_name] [setting_value]"
+    summary _("Set Puppet's settings.")
+    arguments _("[setting_name] [setting_value]")
     description <<-'EOT'
       Updates values in the `puppet.conf` configuration file.
     EOT
@@ -106,19 +106,6 @@ Puppet::Face.define(:config, '0.0.1') do
     EOT
 
     when_invoked do |name, value, options|
-      if name == 'environment' && options[:section] == 'main'
-        Puppet.warning _(<<-EOM).chomp
-The environment should be set in either the `[user]`, `[agent]`, or `[master]`
-section. Variables set in the `[agent]` section are used when running
-`puppet agent`. Variables set in the `[user]` section are used when running
-various other puppet subcommands, like `puppet apply` and `puppet module`; these
-require the defined environment directory to exist locally. Set the config
-section by using the `--section` flag. For example,
-`puppet config --section user set environment foo`. For more information, see
-https://puppet.com/docs/puppet/latest/configuration.html#environment
-        EOM
-      end
-
       path = Puppet::FileSystem.pathname(Puppet.settings.which_configuration_file)
       Puppet::FileSystem.touch(path)
       Puppet::FileSystem.open(path, nil, 'r+:UTF-8') do |file|

data/lib/puppet/face/epp.rb

@@ -5,14 +5,14 @@ require 'puppet/file_system'
 
 Puppet::Face.define(:epp, '0.0.1') do
   copyright "Puppet Inc.", 2014
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "Interact directly with the EPP template parser/renderer."
+  summary _("Interact directly with the EPP template parser/renderer.")
 
   action(:validate) do
-    summary "Validate the syntax of one or more EPP templates."
-    arguments "[<template>] [<template> ...]"
-    returns "Nothing, or encountered syntax errors."
+    summary _("Validate the syntax of one or more EPP templates.")
+    arguments _("[<template>] [<template> ...]")
+    returns _("Nothing, or encountered syntax errors.")
     description <<-'EOT'
       This action validates EPP syntax without producing any output.
 
@@ -31,7 +31,7 @@ Puppet::Face.define(:epp, '0.0.1') do
     EOT
 
     option("--[no-]continue_on_error") do
-      summary "Whether or not to continue after errors are reported for a template."
+      summary _("Whether or not to continue after errors are reported for a template.")
     end
 
     examples <<-'EOT'
@@ -75,7 +75,7 @@ Puppet::Face.define(:epp, '0.0.1') do
         else
           # This is not an error since a validate of all files in an empty
           # directory should not be treated as a failed validation.
-          Puppet.notice "No template specified. No action taken"
+          Puppet.notice _("No template specified. No action taken")
         end
       end
 
@@ -92,19 +92,19 @@ Puppet::Face.define(:epp, '0.0.1') do
         end
       end
       if !missing_files.empty?
-        raise Puppet::Error, "One or more file(s) specified did not exist:\n" + missing_files.map { |f| "   #{f}" }.join("\n")
+        raise Puppet::Error, _("One or more file(s) specified did not exist:\n") + missing_files.map { |f| "   #{f}" }.join("\n")
       else
         # Exit with 1 if there were errors
-        raise Puppet::Error, "Errors while validating epp" unless status
+        raise Puppet::Error, _("Errors while validating epp") unless status
       end
     end
   end
 
 
   action (:dump) do
-    summary "Outputs a dump of the internal template parse tree for debugging"
+    summary _("Outputs a dump of the internal template parse tree for debugging")
     arguments "-e <source> | [<templates> ...] "
-    returns "A dump of the resulting AST model unless there are syntax or validation errors."
+    returns _("A dump of the resulting AST model unless there are syntax or validation errors.")
     description <<-'EOT'
       The dump action parses and validates the EPP syntax and dumps the resulting AST model
       in a human readable (but not necessarily an easy to understand) format.
@@ -127,17 +127,17 @@ Puppet::Face.define(:epp, '0.0.1') do
       This command ignores the --render-as setting/option.
     EOT
 
-    option("--e <source>") do
+    option("--e " + _("<source>")) do
       default_to { nil }
-      summary "Dump one epp source expression given on the command line."
+      summary _("Dump one epp source expression given on the command line.")
     end
 
     option("--[no-]validate") do
-      summary "Whether or not to validate the parsed result, if no-validate only syntax errors are reported."
+      summary _("Whether or not to validate the parsed result, if no-validate only syntax errors are reported.")
     end
 
     option("--[no-]header") do
-      summary "Whether or not to show a file name header between files."
+      summary _("Whether or not to show a file name header between files.")
     end
 
     when_invoked do |*args|
@@ -161,7 +161,7 @@ Puppet::Face.define(:epp, '0.0.1') do
         if ! STDIN.tty?
           buffer.print dump_parse(STDIN.read, 'stdin', options, false)
         else
-          raise Puppet::Error, "No input to parse given on command line or stdin"
+          raise Puppet::Error, _("No input to parse given on command line or stdin")
         end
       else
         templates, missing_files = args.reduce([[],[]]) do |memo, file|
@@ -180,7 +180,7 @@ Puppet::Face.define(:epp, '0.0.1') do
         end
 
         if !missing_files.empty?
-          raise Puppet::Error, "One or more file(s) specified did not exist:\n" + missing_files.collect { |f| "   #{f}" }.join("\n")
+          raise Puppet::Error, _("One or more file(s) specified did not exist:\n") + missing_files.collect { |f| "   #{f}" }.join("\n")
         end
       end
       buffer.string
@@ -188,9 +188,9 @@ Puppet::Face.define(:epp, '0.0.1') do
   end
 
   action (:render) do
-    summary "Renders an epp template as text"
+    summary _("Renders an epp template as text")
     arguments "-e <source> | [<templates> ...] "
-    returns "A rendered result of one or more given templates."
+    returns _("A rendered result of one or more given templates.")
     description <<-'EOT'
       This action renders one or more EPP templates.
 
@@ -286,29 +286,29 @@ Puppet::Face.define(:epp, '0.0.1') do
           $ puppet epp render -e '<% $facts[osfamily] %>' --facts data.yaml
     EOT
 
-    option("--node <node_name>") do
-      summary "The name of the node for which facts are obtained. Defaults to facts for the local node."
+    option("--node " + _("<node_name>")) do
+      summary _("The name of the node for which facts are obtained. Defaults to facts for the local node.")
     end
 
-    option "--e <source>" do
+    option("--e " + _("<source>")) do
       default_to { nil }
-      summary "Render one inline epp template given on the command line."
+      summary _("Render one inline epp template given on the command line.")
     end
 
-    option("--values <values_hash>") do
-      summary "A Hash in Puppet DSL form given as arguments to the template being rendered."
+    option("--values " + _("<values_hash>")) do
+      summary _("A Hash in Puppet DSL form given as arguments to the template being rendered.")
     end
 
-    option("--values_file <pp_or_yaml_file>") do
-      summary "A .pp or .yaml file that is processed to produce a hash of values for the template."
+    option("--values_file " + _("<pp_or_yaml_file>")) do
+      summary _("A .pp or .yaml file that is processed to produce a hash of values for the template.")
     end
 
-    option("--facts <facts_file>") do
-      summary "A .yaml or .json file containing a hash of facts made available in $facts and $trusted"
+    option("--facts " + _("<facts_file>")) do
+      summary _("A .yaml or .json file containing a hash of facts made available in $facts and $trusted")
     end
 
     option("--[no-]header") do
-      summary "Whether or not to show a file name header between rendered results."
+      summary _("Whether or not to show a file name header between rendered results.")
     end
 
     when_invoked do |*args|
@@ -316,36 +316,34 @@ Puppet::Face.define(:epp, '0.0.1') do
       options[:header] = options[:header].nil? ? true : options[:header]
 
       compiler = create_compiler(options)
-      compiler.with_context_overrides('For rendering epp') do
-
-        # Print to a buffer since the face needs to return the resulting string
-        # and the face API is "all or nothing"
-        #
-        buffer = StringIO.new
-        status = true
-        if options[:e]
-          buffer.print render_inline(options[:e], compiler, options)
-        elsif args.empty?
-          if ! STDIN.tty?
-            buffer.print render_inline(STDIN.read, compiler, options)
-          else
-            raise Puppet::Error, "No input to process given on command line or stdin"
-          end
+
+      # Print to a buffer since the face needs to return the resulting string
+      # and the face API is "all or nothing"
+      #
+      buffer = StringIO.new
+      status = true
+      if options[:e]
+        buffer.print render_inline(options[:e], compiler, options)
+      elsif args.empty?
+        if ! STDIN.tty?
+          buffer.print render_inline(STDIN.read, compiler, options)
         else
-          show_filename = args.count > 1
-          file_nbr = 0
-          args.each do |file|
-            begin
-              buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
-            rescue Puppet::ParseError => detail
-              Puppet.err(detail.message)
-              status = false
-            end
+          raise Puppet::Error, _("No input to process given on command line or stdin")
+        end
+      else
+        show_filename = args.count > 1
+        file_nbr = 0
+        args.each do |file|
+          begin
+            buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
+          rescue Puppet::ParseError => detail
+            Puppet.err(detail.message)
+            status = false
           end
         end
-        raise Puppet::Error, "error while rendering epp" unless status
-        buffer.string
       end
+      raise Puppet::Error, _("error while rendering epp") unless status
+      buffer.string
     end
   end
 
@@ -383,13 +381,13 @@ Puppet::Face.define(:epp, '0.0.1') do
           evaluating_parser = Puppet::Pops::Parser::EvaluatingParser.new
           template_values = evaluating_parser.evaluate_file(compiler.topscope, values_file)
         else
-          Puppet.err("Only .yaml or .pp can be used as a --values_file")
+          Puppet.err(_("Only .yaml or .pp can be used as a --values_file"))
         end
       rescue => e
-        Puppet.err("Could not load --values_file #{e.message}")
+        Puppet.err(_("Could not load --values_file %{error}") % { error: e.message })
       end
       if !(template_values.nil? || template_values.is_a?(Hash))
-        Puppet.err("--values_file option must evaluate to a Hash or undef/nil, got: '#{template_values.class}'")
+        Puppet.err(_("--values_file option must evaluate to a Hash or undef/nil, got: '%{template_class}'") % { template_class: template_values.class })
       end
     end
 
@@ -402,7 +400,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       when Hash
         template_values.nil? ? result : template_values.merge(result)
       else
-        Puppet.err("--values option must evaluate to a Hash or undef, got: '#{result.class}'")
+        Puppet.err(_("--values option must evaluate to a Hash or undef, got: '%{values_class}'") % { values_class: result.class })
       end
     else
       template_values
@@ -488,7 +486,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       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
       # It is difficult to add to or modify the set of facts once the node is created
       # as changes does not show up in parameters. Rather than manually patching up