Merge branch 'pr/2158'

* pr/2158:
  (Maint) Fix deprecation message to point to the right alternative
  (#23373) Only parse section lines once
  (#23373) Restore 'all' functionality
  (Maint) Remove unused code
  (#23373) Don't apply all metadata
  (#23373) Use puppet config set in tests
  (#23373) Don't set metadata when it isn't supported
  (#23373) Check for minimal use of [main]
  (#23373) Reuse existing section headers
  (#23373) Add section control to the config print action
  (#23373) Pull apart settings into a few more classes
  (#23373) Provide a more structure config file parse
  (#23373) Have config parsing use IniFile's sections
  (#23373) Support selecting the section

Closes GH-2158

Author: joshcooper

acceptance/tests/face/loadable_from_modules.rb

@@ -12,15 +12,10 @@
   user_modulepath = get_test_file_path(agent, 'user/modules')
 
   # make sure that we use the modulepath from the dev environment
-  create_test_file(agent, 'puppet.conf', <<"END")
-[user]
-environment=dev
-modulepath=#{user_modulepath}
-
-[dev]
-modulepath=#{dev_modulepath}
-END
   puppetconf = get_test_file_path(agent, 'puppet.conf')
+  on agent, puppet("config", "set", "environment", "dev", "--section", "user", "--config", puppetconf)
+  on agent, puppet("config", "set", "modulepath", user_modulepath, "--section", "user", "--config", puppetconf)
+  on agent, puppet("config", "set", "modulepath", dev_modulepath, "--section", "user", "--config", puppetconf)
 
   on agent, 'rm -rf puppetlabs-helloworld'
   on agent, puppet("module", "generate", "puppetlabs-helloworld")

lib/puppet/face/config.rb

@@ -7,13 +7,14 @@
 
   summary "Interact with Puppet's configuration options."
 
+  option "--section SECTION_NAME" do
+    default_to { "main" }
+    summary "The section of the configuration file to interact with."
+  end
+
   action(:print) do
     summary "Examine Puppet's current configuration settings."
     arguments "(all | <setting> [<setting> ...]"
-    returns <<-'EOT'
-      A single value when called with one config setting, and a list of
-      settings and values when called with multiple options or "all."
-    EOT
     description <<-'EOT'
       Prints the value of a single configuration option or a list of
       configuration options.
@@ -22,8 +23,8 @@
       `puppet <subcommand> --configprint`.
     EOT
     notes <<-'EOT'
-      By default, this action reads the configuration in agent mode.
-      Use the '--run_mode' and '--environment' flags to examine other
+      By default, this action reads the general configuration in in the 'main'
+      section. Use the '--section' and '--environment' flags to examine other
       configuration domains.
     EOT
     examples <<-'EOT'
@@ -33,16 +34,22 @@
 
       Get a list of important directories from the master's config:
 
-      $ puppet config print all --run_mode master | grep -E "(path|dir)"
+      $ puppet config print all --section master | grep -E "(path|dir)"
     EOT
 
     when_invoked do |*args|
-      args.pop
+      options = args.pop
 
-      args = [ "all" ] if args.empty?
+      args = Puppet.settings.to_a.collect(&:first) if args.empty? || args == ['all']
 
-      Puppet.settings[:configprint] = args.join(",")
-      Puppet.settings.print_config_options
+      values = Puppet.settings.values(Puppet[:environment].to_sym, options[:section].to_sym)
+      if args.length == 1
+        puts values.interpolate(args[0].to_sym)
+      else
+        args.each do |setting_name|
+          puts "#{setting_name} = #{values.interpolate(setting_name.to_sym)}"
+        end
+      end
       nil
     end
   end
@@ -53,20 +60,27 @@
     description <<-'EOT'
       Update values in the `puppet.conf` configuration file.
     EOT
+    notes <<-'EOT'
+      By default, this action manipulates the configuration in the
+      'main' section. Use the '--section' flag to manipulate other
+      configuration domains.
+    EOT
     examples <<-'EOT'
       Set puppet's runfile directory:
 
       $ puppet config set rundir /var/run/puppet
-    EOT
 
-    when_invoked do |*args|
-      name, value = args
+      Set the vardir for only the agent:
+
+      $ puppet config set vardir /var/lib/puppetagent --section agent
+    EOT
 
+    when_invoked do |name, value, options|
       file = Puppet::FileSystem::File.new(Puppet.settings.which_configuration_file)
       file.touch
       file.open(nil, 'r+') do |file|
         Puppet::Settings::IniFile.update(file) do |config|
-          config.set(name, value)
+          config.set(options[:section], name, value)
         end
       end
       nil

lib/puppet/node/environment.rb

@@ -456,7 +456,7 @@ def validate_dirs(dirs)
   def perform_initial_import
     return empty_parse_result if Puppet.settings[:ignoreimport]
     parser = Puppet::Parser::ParserFactory.parser(self)
-    if code = Puppet.settings.uninterpolated_value(:code, name.to_s) and code != ""
+    if code = Puppet.settings.value(:code, name.to_s) and code != ""
       parser.string = code
       parser.parse
     else