puppet 5.5.22 → 6.0.0

data/lib/puppet/environments.rb

@@ -313,14 +313,9 @@ module Puppet::Environments
       @cache_expiration_service || DefaultCacheExpirationService.new
     end
 
-    # Returns the end of time (the next Mesoamerican Long Count cycle-end after 2012 (5125+2012) = 7137,
-    # or for a 32 bit machine using Ruby < 1.9.3, the year 2038.
+    # Returns the end of time (the next Mesoamerican Long Count cycle-end after 2012 (5125+2012) = 7137
     def self.end_of_time
-      begin
-        Time.gm(7137)
-      rescue ArgumentError
-        Time.gm(2038)
-      end
+      Time.gm(7137)
     end
 
     END_OF_TIME = end_of_time

data/lib/puppet/error.rb

@@ -3,7 +3,7 @@ module Puppet
   class Error < RuntimeError
     attr_accessor :original
     def initialize(message, original=nil)
-      super(Puppet::Util::CharacterEncoding.scrub(message))
+      super(message.scrub)
       @original = original
     end
   end
@@ -12,7 +12,7 @@ module Puppet
     # This module implements logging with a filename and line number. Use this
     # for errors that need to report a location in a non-ruby file that we
     # parse.
-    attr_accessor :line, :file, :pos, :puppetstack
+    attr_accessor :line, :file, :pos
 
     # May be called with 3 arguments for message, file, line, and exception, or
     # 4 args including the position on the line.
@@ -22,18 +22,10 @@ module Puppet
         original = pos
         pos = nil
       end
-
       super(message, original)
-
       @file = file unless (file.is_a?(String) && file.empty?)
       @line = line
       @pos = pos
-
-      if original && original.respond_to?(:puppetstack)
-        @puppetstack = original.puppetstack
-      else
-        @puppetstack = Puppet::Pops::PuppetStack.stacktrace()
-      end
     end
 
     def to_s
@@ -110,4 +102,16 @@ module Puppet
   class LockError < Puppet::Error
   end
 
+  # An Error suitable for raising an error with details in a Puppet::Datatypes::Error
+  # that can be used as a value in the Puppet Language
+  #
+  class ErrorWithData < Puppet::Error
+    include ExternalFileError
+    attr_reader :error_data
+
+    def initialize(error_data, message, file: nil, line: nil, pos: nil, original:nil)
+      super(message, file, line, pos, original)
+      @error_data = error_data
+    end
+  end
 end

data/lib/puppet/etc.rb

@@ -103,26 +103,6 @@ module Puppet::Etc
       override_field_values_to_utf8(::Etc.getpwuid(id))
     end
 
-    # Etc::group returns a Ruby iterator that executes a block for
-    # each entry in the /etc/group file. The code-block is passed
-    # a Group struct. See getgrent above for more details.
-    def group
-      # The implementation here duplicates the logic in https://github.com/ruby/etc/blob/master/ext/etc/etc.c#L523-L537
-      # Note that we do not call ::Etc.group directly, because we
-      # want to use our wrappers for methods like getgrent, setgrent,
-      # endgrent, etc.
-      return getgrent unless block_given?
-
-      setgrent
-      begin
-        while cur_group = getgrent
-          yield cur_group
-        end
-      ensure
-        endgrent
-      end
-    end
-
     private
 
     # @api private
@@ -163,10 +143,12 @@ module Puppet::Etc
       struct.each_pair do |member, value|
         if value.is_a?(String)
           new_struct["canonical_#{member}".to_sym] = value.dup
-          new_struct[member] = Puppet::Util::CharacterEncoding.scrub(Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(value))
+          new_struct[member] = Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(value).scrub
         elsif value.is_a?(Array)
           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)) }
+          new_struct[member] = value.inject([]) do |acc, elem|
+            acc << Puppet::Util::CharacterEncoding.override_encoding_to_utf_8(elem).scrub
+          end
         else
           new_struct["canonical_#{member}".to_sym] = value
           new_struct[member] = value
@@ -176,6 +158,3 @@ module Puppet::Etc
     end
   end
 end
-
-
-

data/lib/puppet/external/dot.rb

@@ -15,7 +15,7 @@ module DOT
 
   # if we don't like 4 spaces, we can change it any time
 
-  def change_tab (t)
+  def change_tab(t)
     $tab  = t
     $tab2 = t * 2
   end
@@ -118,7 +118,7 @@ module DOT
 
     attr_accessor :name
 
-    def initialize (params = {})
+    def initialize(params = {})
       @label = params['name'] ? params['name'] : ''
     end
 
@@ -134,7 +134,7 @@ module DOT
     # attr_reader :parent
     attr_accessor :name, :options
 
-    def initialize (params = {}, option_list = [])
+    def initialize(params = {}, option_list = [])
       super(params)
       @name   = params['name']   ? params['name']   : nil
       @parent = params['parent'] ? params['parent'] : nil
@@ -168,7 +168,7 @@ module DOT
 
     attr_accessor :label
 
-    def initialize (params = {})
+    def initialize(params = {})
       super(params)
       @name = params['label'] ? params['label'] : ''
     end
@@ -181,7 +181,7 @@ module DOT
   # node element
 
   class DOTNode < DOTElement
-    def initialize (params = {}, option_list = NODE_OPTS)
+    def initialize(params = {}, option_list = NODE_OPTS)
       super(params, option_list)
       @ports = params['ports'] ? params['ports'] : []
     end
@@ -190,11 +190,11 @@ module DOT
       @ports.each { |i| yield i }
     end
 
-    def << (thing)
+    def <<(thing)
       @ports << thing
     end
 
-    def push (thing)
+    def push(thing)
       @ports.push(thing)
     end
 
@@ -202,16 +202,16 @@ module DOT
       @ports.pop
     end
 
-    def to_s (t = '')
+    def to_s(t = '')
 
       # This code is totally incomprehensible; it needs to be replaced!
 
       label = @options['shape'] != 'record' && @ports.length == 0 ?
           @options['label'] ?
-            t + $tab + "label = \"#{@options['label']}\"\n" :
+            t + $tab + "label = #{stringify(@options['label'])}\n" :
             '' :
           t + $tab + 'label = "' + " \\\n" +
-          t + $tab2 + "#{@options['label']}| \\\n" +
+          t + $tab2 + "#{stringify(@options['label'])}| \\\n" +
           @ports.collect{ |i|
             t + $tab2 + i.to_s
           }.join( "| \\\n" ) + " \\\n" +
@@ -226,13 +226,19 @@ module DOT
         t + "]\n"
     end
 
+    private
+
+    def stringify(s)
+      %("#{s.gsub('"', '\\"')}")
+    end
+
   end
 
   # A subgraph element is the same to graph, but has another header in dot
   # notation.
 
   class DOTSubgraph < DOTElement
-    def initialize (params = {}, option_list = GRAPH_OPTS)
+    def initialize(params = {}, option_list = GRAPH_OPTS)
       super(params, option_list)
       @nodes      = params['nodes'] ? params['nodes'] : []
       @dot_string = 'graph'
@@ -242,11 +248,11 @@ module DOT
       @nodes.each{ |i| yield i }
     end
 
-    def << (thing)
+    def <<(thing)
       @nodes << thing
     end
 
-    def push (thing)
+    def push(thing)
       @nodes.push( thing )
     end
 
@@ -254,7 +260,7 @@ module DOT
       @nodes.pop
     end
 
-    def to_s (t = '')
+    def to_s(t = '')
       hdr = t + "#{@dot_string} #{@name} {\n"
 
       options = @options.to_a.collect{ |name, val|
@@ -275,7 +281,7 @@ module DOT
 
   class DOTDigraph < DOTSubgraph
 
-  def initialize (params = {}, option_list = GRAPH_OPTS)
+  def initialize(params = {}, option_list = GRAPH_OPTS)
     super(params, option_list)
     @dot_string = 'digraph'
   end
@@ -288,7 +294,7 @@ module DOT
 
     attr_accessor :from, :to
 
-    def initialize (params = {}, option_list = EDGE_OPTS)
+    def initialize(params = {}, option_list = EDGE_OPTS)
       super(params, option_list)
       @from = params['from'] ? params['from'] : nil
       @to   = params['to'] ? params['to'] : nil
@@ -298,7 +304,7 @@ module DOT
       '--'
     end
 
-    def to_s (t = '')
+    def to_s(t = '')
       t + "#{@from} #{edge_link} #{to} [\n" +
         @options.to_a.collect{ |i|
           i[1] && i[0] != 'label' ?

data/lib/puppet/face/config.rb

@@ -35,7 +35,7 @@ Puppet::Face.define(:config, '0.0.1') do
 
   action(:print) do
     summary _("Examine Puppet's current settings.")
-    arguments _("all | <setting> [<setting> ...]")
+    arguments _("(all | <setting> [<setting> ...]")
     description <<-'EOT'
       Prints the value of a single setting or a list of settings.
 
@@ -66,18 +66,41 @@ Puppet::Face.define(:config, '0.0.1') do
         @default_section = true
       end
 
-      if Puppet::Util::Log.sendlevel?(:info)
-        warn_default_section(options[:section]) if @default_section
-        report_section_and_environment(options[:section], Puppet.settings[:environment])
-      end
+      render_all_settings = args.empty? || args == ['all']
 
-      names = if args.empty? || args == ['all']
-                :all
-              else
-                args
-              end
+      args = Puppet.settings.to_a.collect(&:first) if render_all_settings
+
+      values_from_the_selected_section =
+        Puppet.settings.values(nil, options[:section].to_sym)
+
+      loader_settings = {
+        :environmentpath => values_from_the_selected_section.interpolate(:environmentpath),
+        :basemodulepath => values_from_the_selected_section.interpolate(:basemodulepath),
+      }
+
+      to_be_rendered = nil
+      Puppet.override(Puppet.base_context(loader_settings),
+                     _("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)
+
+        if Puppet::Util::Log.sendlevel?(:info)
+          warn_default_section(options[:section]) if @default_section
+          report_section_and_environment(options[:section], Puppet.settings[:environment])
+        end
 
-      Puppet.settings.stringify_settings(options[:section], names)
+        to_be_rendered = {}
+        args.sort.each do |setting_name|
+          to_be_rendered[setting_name] = values.print(setting_name.to_sym)
+        end
+      end
+
+      # convert symbols to strings before formatting output
+      if render_all_settings
+        to_be_rendered = stringifyhash(to_be_rendered)
+      end
+      to_be_rendered
     end
 
     when_rendering :console do |to_be_rendered|
@@ -94,6 +117,21 @@ Puppet::Face.define(:config, '0.0.1') do
     end
   end
 
+  def stringifyhash(hash)
+    newhash = {}
+    hash.each do |key, val|
+      key = key.to_s
+      if val.is_a? Hash
+        newhash[key] = stringifyhash(val)
+      elsif val.is_a? Symbol
+        newhash[key] = val.to_s
+      else
+        newhash[key] = val
+      end
+    end
+    newhash
+  end
+
   def warn_default_section(section_name)
     messages = []
     messages << _("No section specified; defaulting to '%{section_name}'.") %
@@ -172,7 +210,7 @@ https://puppet.com/docs/puppet/latest/configuration.html#environment
 
   action(:delete) do
     summary _("Delete a Puppet setting.")
-    arguments _("<setting>")
+    arguments _("(<setting>")
     #TRANSLATORS 'main' is a specific section name and should not be translated
     description "Deletes a setting from the specified section. (The default is the section 'main')."
     notes <<-'EOT'

data/lib/puppet/face/epp.rb

@@ -405,7 +405,7 @@ Puppet::Face.define(:epp, '0.0.1') do
     if values_file = options[:values_file]
       begin
         if values_file =~ /\.yaml$/
-          template_values = YAML.load_file(values_file)
+          template_values = Puppet::Util::Yaml.safe_load_file(values_file, [Symbol])
         elsif values_file =~ /\.pp$/
           evaluating_parser = Puppet::Pops::Parser::EvaluatingParser.new
           template_values = evaluating_parser.evaluate_file(compiler.topscope, values_file)
@@ -511,7 +511,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       elsif fact_file.end_with?("json")
         given_facts = Puppet::Util::Json.load(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
       else
-        given_facts = YAML.load(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
+        given_facts = Puppet::Util::Yaml.safe_load_file(fact_file)
       end
 
       unless given_facts.instance_of?(Hash)

data/lib/puppet/face/facts.rb

@@ -81,7 +81,7 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
                     node: Puppet[:node_name_value],
                     server: server})
 
-      Puppet::Node::Facts.indirection.save(facts, nil, :environment => Puppet.lookup(:current_environment))
+      Puppet::Node::Facts.indirection.save(facts)
     end
   end
 end

data/lib/puppet/face/help.rb

@@ -132,19 +132,21 @@ Puppet::Face.define(:help, '0.0.1') do
   #  element in the outer array is a pair whose first element is a String containing the application
   #  name, and whose second element is a String containing the summary for that application.
   def all_application_summaries()
-    Puppet::Application.available_application_names.sort.inject([]) do |result, appname|
+    available_application_names_special_sort().inject([]) do |result, appname|
       next result if exclude_from_docs?(appname)
 
-      if (is_face_app?(appname))
+      if (appname == COMMON || appname == SPECIALIZED || appname == BLANK)
+        result << appname
+      elsif (is_face_app?(appname))
         begin
           face = Puppet::Face[appname, :current]
           # Add deprecation message to summary if the face is deprecated
           summary = face.deprecated? ? face.summary + ' ' + _("(Deprecated)") : face.summary
-          result << [appname, summary]
+          result << [appname, summary, '  ']
         rescue StandardError, LoadError
           error_message = _("!%{sub_command}! Subcommand unavailable due to error.") % { sub_command: appname }
           error_message += ' ' + _("Check error logs.")
-          result << [ error_message ]
+          result << [ error_message, '', '  ' ]
         end
       else
         begin
@@ -152,16 +154,28 @@ Puppet::Face.define(:help, '0.0.1') do
           if summary.empty?
             summary = horribly_extract_summary_from(appname)
           end
-          result << [appname, summary]
+          result << [appname, summary, '  ']
         rescue StandardError, LoadError
           error_message = _("!%{sub_command}! Subcommand unavailable due to error.") % { sub_command: appname }
           error_message += ' ' + _("Check error logs.")
-          result << [ error_message ]
+          result << [ error_message, '', '  ' ]
         end
       end
     end
   end
 
+  COMMON = 'Common:'.freeze
+  SPECIALIZED = 'Specialized:'.freeze
+  BLANK = "\n".freeze
+  def available_application_names_special_sort()
+    full_list = Puppet::Application.available_application_names
+    a_list = full_list & %w{apply agent config help lookup module resource}
+    a_list = a_list.sort
+    also_ran = full_list - a_list
+    also_ran = also_ran.sort
+    [[COMMON], a_list, [BLANK], [SPECIALIZED], also_ran].flatten(1)
+  end
+
   def horribly_extract_summary_from(appname)
     help = Puppet::Application[appname].help.split("\n")
     # Now we find the line with our summary, extract it, and return it.  This
@@ -181,7 +195,7 @@ Puppet::Face.define(:help, '0.0.1') do
   #private :horribly_extract_summary_from
 
   def exclude_from_docs?(appname)
-    %w{face_base indirection_base}.include? appname
+    %w{face_base indirection_base cert key man plugin report status}.include? appname
   end
   # This should absolutely be a private method, but for some reason it appears
   #  that you can't use the 'private' keyword inside of a Face definition.

data/lib/puppet/face/help/global.erb

@@ -7,8 +7,8 @@ Available subcommands:
         because faces can't be run without an application stub.  However, when #6753 is resolved,
         all of the application stubs for faces will go away, and this will need to be updated
         to reflect that.  --cprice 2012-04-26 %>
-<% all_application_summaries.each do |appname, summary| -%>
-  <%= appname.to_s.ljust(16) %>  <%= summary %>
+<% all_application_summaries.each do |appname, summary, indent| -%>
+  <%= indent %><%= appname.to_s.ljust(16) %>  <%= summary %>
 <% end -%>
 
 See 'puppet help <subcommand> <action>' for help on a specific subcommand action.