puppet 4.10.0 → 5.0.0

data/lib/puppet/etc.rb

@@ -2,11 +2,36 @@ require 'puppet/util/character_encoding'
 # Wrapper around Ruby Etc module allowing us to manage encoding in a single
 # place.
 # This represents a subset of Ruby's Etc module, only the methods required by Puppet.
-# Etc returns strings in variable encoding depending on
-# environment. For Puppet we specifically want UTF-8 as our input from the Etc
-# module - which is our input for many resource instance 'is' values. The
-# associated 'should' value will basically always be coming from Puppet in
-# UTF-8. Etc is defined for Windows but calls to it return nil.
+
+# On Ruby 2.1.0 and later, Etc returns strings in variable encoding depending on
+# environment. The string returned will be labeled with the environment's
+# encoding (Encoding.default_external), with one exception: If the environment
+# encoding is 7-bit ASCII, and any individual character bit representation is
+# equal to or greater than 128 - \x80 - 0b10000000 - signifying the smallest
+# 8-bit big-endian value, the returned string will be in BINARY encoding instead
+# of environment encoding.
+#
+# Barring that exception, the returned string will be labeled as encoding
+# Encoding.default_external, regardless of validity or byte-width. For example,
+# ruby will label a string containing a four-byte characters such as "\u{2070E}"
+# as EUC_KR even though EUC_KR is a two-byte width encoding.
+#
+# On Ruby 2.0.x and earlier, Etc will always return string values in BINARY,
+# ignoring encoding altogether.
+#
+# For Puppet we specifically want UTF-8 as our input from the Etc module - which
+# is our input for many resource instance 'is' values. The associated 'should'
+# value will basically always be coming from Puppet in UTF-8 - and written to
+# disk as UTF-8. Etc is defined for Windows but the majority calls to it return
+# nil and Puppet does not use it.
+#
+# That being said, we have cause to retain the original, pre-override string
+# values. `puppet resource user`
+# (Puppet::Resource::User.indirection.search('User', {})) uses self.instances to
+# query for user(s) and then iterates over the results of that query again to
+# obtain state for each user. If we've overridden the original user name and not
+# retained the original, we've lost the ability to query the system for it
+# later. Hence the Puppet::Etc::Passwd and Puppet::Etc::Group structs.
 #
 # We only use Etc for retrieving existing property values from the system. For
 # setting property values, providers leverage system tools (i.e., `useradd`)
@@ -14,11 +39,12 @@ require 'puppet/util/character_encoding'
 # @api private
 module Puppet::Etc
   class << self
+
     # Etc::getgrent returns an Etc::Group struct object
     # On first call opens /etc/group and returns parse of first entry. Each subsquent call
     # returns new struct the next entry or nil if EOF. Call ::endgrent to close file.
     def getgrent
-      convert_field_values_to_utf8!(::Etc.getgrent)
+      override_field_values_to_utf8(::Etc.getgrent)
     end
 
     # closes handle to /etc/group file
@@ -35,7 +61,7 @@ module Puppet::Etc
     # On first call opens /etc/passwd and returns parse of first entry. Each subsquent call
     # returns new struct for the next entry or nil if EOF. Call ::endgrent to close file.
     def getpwent
-      convert_field_values_to_utf8!(::Etc.getpwent)
+      override_field_values_to_utf8(::Etc.getpwent)
     end
 
     # closes handle to /etc/passwd file
@@ -53,70 +79,80 @@ module Puppet::Etc
     # returns an Etc::Passwd struct corresponding to the entry or raises
     # ArgumentError if none
     def getpwnam(username)
-      convert_field_values_to_utf8!(::Etc.getpwnam(username))
+      override_field_values_to_utf8(::Etc.getpwnam(username))
     end
 
     # Etc::getgrnam searches /etc/group file for an entry corresponding to groupname.
     # returns an Etc::Group struct corresponding to the entry or raises
     # ArgumentError if none
     def getgrnam(groupname)
-      convert_field_values_to_utf8!(::Etc.getgrnam(groupname))
+      override_field_values_to_utf8(::Etc.getgrnam(groupname))
     end
 
     # Etc::getgrid searches /etc/group file for an entry corresponding to id.
     # returns an Etc::Group struct corresponding to the entry or raises
     # ArgumentError if none
     def getgrgid(id)
-      convert_field_values_to_utf8!(::Etc.getgrgid(id))
+      override_field_values_to_utf8(::Etc.getgrgid(id))
     end
 
     # Etc::getpwuid searches /etc/passwd file for an entry corresponding to id.
     # returns an Etc::Passwd struct corresponding to the entry or raises
     # ArgumentError if none
     def getpwuid(id)
-      convert_field_values_to_utf8!(::Etc.getpwuid(id))
+      override_field_values_to_utf8(::Etc.getpwuid(id))
     end
 
     private
-    # Utility method for converting the String values of a struct returned by
+
+    # @api private
+    # Defines Puppet::Etc::Passwd struct class. Contains all of the original
+    # member fields of Etc::Passwd, and additional "canonical_" versions of
+    # these fields as well. API compatible with Etc::Passwd. Because Struct.new
+    # defines a new Class object, we memozie to avoid superfluous extra Class
+    # instantiations.
+    def puppet_etc_passwd_class
+      @password_class ||= Struct.new(*Etc::Passwd.members, *Etc::Passwd.members.map { |member| "canonical_#{member}".to_sym })
+    end
+
+    # @api private
+    # Defines Puppet::Etc::Group struct class. Contains all of the original
+    # member fields of Etc::Group, and additional "canonical_" versions of these
+    # fields as well. API compatible with Etc::Group. Because Struct.new
+    # defines a new Class object, we memoize to avoid superfluous extra Class
+    # instantiations.
+    def puppet_etc_group_class
+      @group_class ||= Struct.new(*Etc::Group.members, *Etc::Group.members.map { |member| "canonical_#{member}".to_sym })
+    end
+
+    # Utility method for overriding the String values of a struct returned by
     # the Etc module to UTF-8. Structs returned by the ruby Etc module contain
     # members with fields of type String, Integer, or Array of Strings, so we
     # handle these types. Otherwise ignore fields.
     #
-    # NOTE: If a string cannot be converted to UTF-8, this leaves the original
-    # string string intact in the Struct.
-    #
-    # Warning! This is a destructive method - the struct passed is modified!
-    #
     # @api private
     # @param [Etc::Passwd or Etc::Group struct]
-    # @return [Etc::Passwd or Etc::Group struct] the original struct with values
-    #   converted to UTF-8 if possible, or the original value intact if not
-    def convert_field_values_to_utf8!(struct)
+    # @return [Puppet::Etc::Passwd or Puppet::Etc::Group struct] a new struct
+    #   object with the original struct values overidden to UTF-8, if valid. For
+    #   invalid values originating in UTF-8, invalid characters are replaced with
+    #   '?'. For each member the struct also contains a corresponding
+    #   :canonical_<member name> struct member.
+    def override_field_values_to_utf8(struct)
       return nil if struct.nil?
-      struct.each_with_index do |value, index|
+      new_struct = struct.is_a?(Etc::Passwd) ? puppet_etc_passwd_class.new : puppet_etc_group_class.new
+      struct.each_pair do |member, value|
         if value.is_a?(String)
-            converted = Puppet::Util::CharacterEncoding.convert_to_utf_8!(value)
-            struct[index] = converted if !converted.nil?
+          new_struct["canonical_#{member}".to_sym] = value.dup
+          new_struct[member] = Puppet::Util::CharacterEncoding.scrub(Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(value))
         elsif value.is_a?(Array)
-          struct[index] = convert_array_values_to_utf8!(value)
+          new_struct["canonical_#{member}".to_sym] = value.inject([]) { |acc, elem| acc << elem.dup }
+          new_struct[member] = value.inject([]) { |acc, elem| acc << Puppet::Util::CharacterEncoding.scrub(Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(elem)) }
+        else
+          new_struct["canonical_#{member}".to_sym] = value
+          new_struct[member] = value
         end
       end
-    end
-
-    # Helper method for ::convert_field_values_to_utf8!
-    #
-    # Warning! This is a destructive method - the array passed is modified!
-    #
-    # @api private
-    # @param [Array] object containing String values to convert to UTF-8
-    # @return [Array] original Array with String values converted to UTF-8 if
-    #   convertible, or original, unmodified values if not.
-    def convert_array_values_to_utf8!(string_array)
-      string_array.map! do |elem|
-        converted = Puppet::Util::CharacterEncoding.convert_to_utf_8!(elem)
-        converted.nil? ? elem : converted
-      end
+      new_struct
     end
   end
 end

data/lib/puppet/external/pson/common.rb

@@ -1,5 +1,9 @@
 require 'puppet/external/pson/version'
 
+# PSON is a vendored version of pure_json v1.1.9 plus puppet patches. It
+# is deprecated and should not be used for future work. Use JSON instead.
+#
+# @deprecated
 module PSON
   class << self
     # If _object_ is string-like parse the string and return the parsed result

data/lib/puppet/face/ca.rb

@@ -1,10 +1,10 @@
 require 'puppet/face'
 
 Puppet::Face.define(:ca, '0.1.0') do
-  copyright "Puppet Labs", 2011
-  license   "Apache 2 license; see COPYING"
+  copyright "Puppet Inc.", 2011
+  license   _("Apache 2 license; see COPYING")
 
-  summary "Local Puppet Certificate Authority management."
+  summary _("Local Puppet Certificate Authority management.")
 
   description <<-TEXT
     This provides local management of the Puppet Certificate Authority.
@@ -14,7 +14,7 @@ Puppet::Face.define(:ca, '0.1.0') do
   TEXT
 
   action :list do
-    summary "List certificates and/or certificate requests."
+    summary _("List certificates and/or certificate requests.")
 
     description <<-TEXT
       This will list the current certificates and certificate signing requests
@@ -23,23 +23,23 @@ Puppet::Face.define(:ca, '0.1.0') do
     TEXT
 
     option "--[no-]all" do
-      summary "Include all certificates and requests."
+      summary _("Include all certificates and requests.")
     end
 
     option "--[no-]pending" do
-      summary "Include pending certificate signing requests."
+      summary _("Include pending certificate signing requests.")
     end
 
     option "--[no-]signed" do
-      summary "Include signed certificates."
+      summary _("Include signed certificates.")
     end
 
-    option "--digest ALGORITHM" do
-      summary "The hash algorithm to use when displaying the fingerprint"
+    option "--digest " + _("ALGORITHM") do
+      summary _("The hash algorithm to use when displaying the fingerprint")
     end
 
-    option "--subject PATTERN" do
-      summary "Only list if the subject matches PATTERN."
+    option "--subject " + _("PATTERN") do
+      summary _("Only list if the subject matches PATTERN.")
 
       description <<-TEXT
         Only include certificates or requests where subject matches PATTERN.
@@ -50,9 +50,11 @@ Puppet::Face.define(:ca, '0.1.0') do
     end
 
     when_invoked do |options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      #TRANSLATORS "CA" stands for "certificate authority"
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        #TRANSLATORS "CA" stands for "certificate authority"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :only
 
@@ -77,7 +79,7 @@ Puppet::Face.define(:ca, '0.1.0') do
 
     when_rendering :console do |hosts, options|
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        raise _("Unable to fetch the CA")
       end
 
       length = hosts.map{|x| x.name.length }.max.to_i + 1
@@ -99,11 +101,11 @@ Puppet::Face.define(:ca, '0.1.0') do
   end
 
   action :destroy do
-    summary "Destroy named certificate or pending certificate request."
+    summary _("Destroy named certificate or pending certificate request.")
     when_invoked do |host, options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :local
 
@@ -112,11 +114,11 @@ Puppet::Face.define(:ca, '0.1.0') do
   end
 
   action :revoke do
-    summary "Add certificate to certificate revocation list."
+    summary _("Add certificate to certificate revocation list.")
     when_invoked do |host, options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :only
 
@@ -127,22 +129,22 @@ Puppet::Face.define(:ca, '0.1.0') do
         # destroy action.  The underlying tools could be nicer for that sort
         # of thing; they have fairly inconsistent reporting of failures.
         raise unless e.to_s =~ /Could not find a serial number for /
-        "Nothing was revoked"
+        _("Nothing was revoked")
       end
     end
   end
 
   action :generate do
-    summary "Generate a certificate for a named client."
-    option "--dns-alt-names NAMES" do
-      summary "Additional DNS names to add to the certificate request"
+    summary _("Generate a certificate for a named client.")
+    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
 
     when_invoked do |host, options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :local
 
@@ -150,13 +152,13 @@ Puppet::Face.define(:ca, '0.1.0') do
         ca.generate(host, :dns_alt_names => options[:dns_alt_names])
       rescue RuntimeError => e
         if e.to_s =~ /already has a requested certificate/
-          "#{host} already has a certificate request; use sign instead"
+          _("%{host} already has a certificate request; use sign instead") % { host: host }
         else
           raise
         end
       rescue ArgumentError => e
         if e.to_s =~ /A Certificate already exists for /
-          "#{host} already has a certificate"
+          _("%{host} already has a certificate") % { host: host }
         else
           raise
         end
@@ -165,15 +167,15 @@ Puppet::Face.define(:ca, '0.1.0') do
   end
 
   action :sign do
-    summary "Sign an outstanding certificate request."
+    summary _("Sign an outstanding certificate request.")
     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 |host, options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :only
 
@@ -193,11 +195,11 @@ Puppet::Face.define(:ca, '0.1.0') do
   end
 
   action :print do
-    summary "Print the full-text version of a host's certificate."
+    summary _("Print the full-text version of a host's certificate.")
     when_invoked do |host, options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :only
 
@@ -206,15 +208,18 @@ Puppet::Face.define(:ca, '0.1.0') do
   end
 
   action :fingerprint do
-    summary "Print the DIGEST (defaults to the signing algorithm) fingerprint of a host's certificate."
-    option "--digest ALGORITHM" do
-      summary "The hash algorithm to use when displaying the fingerprint"
+    #TRANSLATORS "DIGEST" refers to a hash algorithm
+    summary _("Print the DIGEST (defaults to the signing algorithm) fingerprint of a host's certificate.")
+    option "--digest " + _("ALGORITHM") do
+      summary _("The hash algorithm to use when displaying the fingerprint")
     end
 
     when_invoked do |host, options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      #TRANSLATORS "CA" stands for "certificate authority"
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        #TRANSLATORS "CA" stands for "certificate authority"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :only
 
@@ -229,9 +234,11 @@ Puppet::Face.define(:ca, '0.1.0') do
   action :verify do
     summary "Verify the named certificate against the local CA certificate."
     when_invoked do |host, options|
-      raise "Not a CA" unless Puppet::SSL::CertificateAuthority.ca?
+      #TRANSLATORS "CA" stands for "certificate authority"
+      raise _("Not a CA") unless Puppet::SSL::CertificateAuthority.ca?
       unless ca = Puppet::SSL::CertificateAuthority.instance
-        raise "Unable to fetch the CA"
+        #TRANSLATORS "CA" stands for "certificate authority"
+        raise _("Unable to fetch the CA")
       end
       Puppet::SSL::Host.ca_location = :only
 
@@ -250,7 +257,7 @@ Puppet::Face.define(:ca, '0.1.0') do
       if value[:valid]
         nil
       else
-        "Could not verify #{value[:host]}: #{value[:error]}"
+        _("Could not verify %{host}: %{error}") % { host: value[:host], error: value[:error] }
       end
     end
   end

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/catalog.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:catalog, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Compile, save, view, and convert catalogs."
@@ -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/certificate.rb

@@ -2,10 +2,10 @@ require 'puppet/indirector/face'
 require 'puppet/ssl/host'
 
 Puppet::Indirector::Face.define(:certificate, '0.0.1') do
-  copyright "Puppet Labs", 2011
-  license   "Apache 2 license; see COPYING"
+  copyright "Puppet Inc.", 2011
+  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/certificate_request.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:certificate_request, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Manage certificate requests."

data/lib/puppet/face/certificate_revocation_list.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:certificate_revocation_list, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Manage the list of revoked certificates."