puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/application/doc.rb

@@ -51,93 +51,51 @@ class Puppet::Application::Doc < Puppet::Application
   def help
     <<-'HELP'
 
-puppet-doc(8) -- Generate Puppet documentation and references
+puppet-doc(8) -- Generate Puppet references
 ========
 
 SYNOPSIS
 --------
 Generates a reference for all Puppet types. Largely meant for internal
-Puppet Labs use.
+Puppet Labs use. (Deprecated)
 
 
 USAGE
 -----
-puppet doc [-a|--all] [-h|--help] [-l|--list] [-o|--outputdir <rdoc-outputdir>]
-  [-m|--mode text|pdf|rdoc] [-r|--reference <reference-name>]
-  [--charset <charset>] [<manifest-file>]
+puppet doc [-h|--help] [-l|--list]
+  [-r|--reference <reference-name>]
 
 
 DESCRIPTION
 -----------
-If mode is not 'rdoc', then this command generates a Markdown document
+This deprecated command generates a Markdown document to stdout
 describing all installed Puppet types or all allowable arguments to
 puppet executables. It is largely meant for internal use and is used to
 generate the reference document available on the Puppet Labs web site.
 
-In 'rdoc' mode, this command generates an html RDoc hierarchy describing
-the manifests that are in 'manifestdir' and 'modulepath' configuration
-directives. The generated documentation directory is doc by default but
-can be changed with the 'outputdir' option.
-
-If the command is run with the name of a manifest file as an argument,
-puppet doc will output a single manifest's documentation on stdout.
+For Puppet module documentation (and all other use cases) this command
+has been superseded by the "puppet-strings"
+module - see https://github.com/puppetlabs/puppetlabs-strings for more information.
 
+This command (puppet-doc) will be removed once the
+puppetlabs internal documentation processing pipeline is completely based
+on puppet-strings.
 
 OPTIONS
 -------
-* --all:
-  Output the docs for all of the reference types. In 'rdoc' mode, this also
-  outputs documentation for all resources.
 
 * --help:
   Print this help message
 
-* --outputdir:
-  Used only in 'rdoc' mode. The directory to which the rdoc output should
-  be written.
-
-* --mode:
-  Determine the output mode. Valid modes are 'text', 'pdf' and 'rdoc'. The 'pdf'
-  mode creates PDF formatted files in the /tmp directory. The default mode is
-  'text'.
-
 * --reference:
   Build a particular reference. Get a list of references by running
   'puppet doc --list'.
 
-* --charset:
-  Used only in 'rdoc' mode. It sets the charset used in the html files produced.
-
-* --manifestdir:
-  Used only in 'rdoc' mode. The directory to scan for stand-alone manifests.
-  If not supplied, puppet doc will use the manifestdir from puppet.conf.
-
-* --modulepath:
-  Used only in 'rdoc' mode. The directory or directories to scan for modules.
-  If not supplied, puppet doc will use the modulepath from puppet.conf.
-
-* --environment:
-  Used only in 'rdoc' mode. The configuration environment from which
-  to read the modulepath and manifestdir settings, when reading said settings
-  from puppet.conf.
-
 
 EXAMPLE
 -------
     $ puppet doc -r type > /tmp/type_reference.markdown
 
-or
-
-    $ puppet doc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests
-
-or
-
-    $ puppet doc /etc/puppet/manifests/site.pp
-
-or
-
-    $ puppet doc -m pdf -r configuration
-
 
 AUTHOR
 ------
@@ -244,13 +202,13 @@ HELP
     options[:references] << :type if options[:references].empty?
   end
 
-  def setup_rdoc(dummy_argument=:work_arround_for_ruby_GC_bug)
+  def setup_rdoc
     # consume the unknown options
     # and feed them as settings
     if @unknown_args.size > 0
       @unknown_args.each do |option|
         # force absolute path for modulepath when passed on commandline
-        if option[:opt]=="--modulepath" or option[:opt] == "--manifestdir"
+        if option[:opt]=="--modulepath"
           option[:arg] = option[:arg].split(::File::PATH_SEPARATOR).collect { |p| ::File.expand_path(p) }.join(::File::PATH_SEPARATOR)
         end
         Puppet.settings.handlearg(option[:opt], option[:arg])
@@ -259,14 +217,9 @@ HELP
   end
 
   def setup_logging
-  # Handle the logging settings.
-    if options[:debug]
-      Puppet::Util::Log.level = :debug
-    elsif options[:verbose]
-      Puppet::Util::Log.level = :info
-    else
-      Puppet::Util::Log.level = :warning
-    end
+    Puppet::Util::Log.level = :warning
+
+    set_log_level
 
     Puppet::Util::Log.newdestination(:console)
   end

data/lib/puppet/application/epp.rb

@@ -0,0 +1,5 @@
+require 'puppet/application/face_base'
+require 'puppet/face'
+
+class Puppet::Application::Epp < Puppet::Application::FaceBase
+end

data/lib/puppet/application/face_base.rb

@@ -5,17 +5,28 @@ require 'pp'
 
 class Puppet::Application::FaceBase < Puppet::Application
   option("--debug", "-d") do |arg|
-    Puppet::Util::Log.level = :debug
+    set_log_level(:debug => true)
   end
 
   option("--verbose", "-v") do |_|
-    Puppet::Util::Log.level = :info
+    set_log_level(:verbose => true)
   end
 
   option("--render-as FORMAT") do |format|
     self.render_as = format.to_sym
   end
 
+  option("--help", "-h") do |arg|
+    if action && !@is_default_action
+      # Only invoke help on the action if it was specified, not if
+      # it was the default action.
+      puts Puppet::Face[:help, :current].help(face.name, action.name)
+    else
+      puts Puppet::Face[:help, :current].help(face.name)
+    end
+    exit
+  end
+
   attr_accessor :face, :action, :type, :arguments, :render_as
 
   def render_as=(format)
@@ -108,6 +119,14 @@ class Puppet::Application::FaceBase < Puppet::Application
       if @action = @face.get_default_action() then
         @is_default_action = true
       else
+        # First try to handle global command line options
+        # But ignoring invalid options as this is a invalid action, and
+        # we want the error message for that instead.
+        begin
+          super
+        rescue OptionParser::InvalidOption
+        end
+
         face   = @face.name
         action = action_name.nil? ? 'default' : "'#{action_name}'"
         msg = "'#{face}' has no #{action} action.  See `puppet help #{face}`."
@@ -121,9 +140,9 @@ class Puppet::Application::FaceBase < Puppet::Application
 
     # Now we can interact with the default option code to build behaviour
     # around the full set of options we now know we support.
-    @action.options.each do |option|
-      option = @action.get_option(option) # make it the object.
-      self.class.option(*option.optparse) # ...and make the CLI parse it.
+    @action.options.each do |o|
+      o = @action.get_option(o) # make it the object.
+      self.class.option(*o.optparse) # ...and make the CLI parse it.
     end
 
     # ...and invoke our parent to parse all the command line options.

data/lib/puppet/application/master.rb

@@ -86,11 +86,6 @@ generated by running puppet master with '--genconfig'.
   service), 'console', or the path to a log file. If debugging or verbosity is
   enabled, this defaults to 'console'. Otherwise, it defaults to 'syslog'.
 
-  A path ending with '.json' will receive structured output in JSON format. The
-  log file will not have an ending ']' automatically written to it due to the
-  appending nature of logging. It must be appended manually to make the content
-  valid JSON.
-
 * --masterport:
   The port on which to listen for traffic.
   (This is a Puppet setting, and can go in puppet.conf.)
@@ -245,6 +240,8 @@ Copyright (c) 2012 Puppet Labs, LLC Licensed under the Apache 2.0 License
     else
       Puppet::SSL::Host.ca_location = :none
     end
+    Puppet::SSL::Oids.register_puppet_oids
+    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

data/lib/puppet/application/resource.rb

@@ -11,11 +11,7 @@ class Puppet::Application::Resource < Puppet::Application
   option("--debug","-d")
   option("--verbose","-v")
   option("--edit","-e")
-
-  option("--host HOST","-H") do |arg|
-    Puppet.warning("Accessing resources on the network is deprecated. See http://links.puppetlabs.com/deprecate-networked-resource")
-    @host = arg
-  end
+  option("--to_yaml","-y")
 
   option("--types", "-t") do |arg|
     types = []
@@ -46,7 +42,7 @@ Uses the Puppet RAL to directly interact with the system.
 USAGE
 -----
 puppet resource [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit]
-  [-H|--host <host>] [-p|--param <parameter>] [-t|--types] <type>
+  [-p|--param <parameter>] [-t|--types] [-y|--to_yaml] <type>
   [<name>] [<attribute>=<value> ...]
 
 
@@ -104,6 +100,8 @@ configuration options can also be generated by running puppet with
 * --verbose:
   Print extra information.
 
+* --to_yaml:
+  Output found resources in yaml format, suitable to use with Hiera and create_resources.
 
 EXAMPLE
 -------
@@ -137,12 +135,20 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def main
     type, name, params = parse_args(command_line.args)
 
-    raise "You cannot edit a remote host" if options[:edit] and @host
+    raise "Editing with Yaml output is not supported" if options[:edit] and options[:to_yaml]
 
     resources = find_or_save_resources(type, name, params)
-    text = resources.
-      map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest }.
-      join("\n")
+
+    if options[:to_yaml]
+      text = resources.
+        map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml }.
+        join("\n")
+      text.prepend("#{type.downcase}:\n")
+    else
+      text = resources.
+        map { |resource| resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest }.
+        join("\n")
+    end
 
     options[:edit] ?
       handle_editing(text) :
@@ -156,12 +162,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
   private
 
-  def remote_key(type, name)
-    Puppet::Resource.indirection.terminus_class = :rest
-    port = Puppet[:puppetport]
-    ["https://#{@host}:#{port}", "production", "resources", type, name].join('/')
-  end
-
   def local_key(type, name)
     [type, name].join('/')
   end
@@ -206,7 +206,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def find_or_save_resources(type, name, params)
-    key = @host ? remote_key(type, name) : local_key(type, name)
+    key = local_key(type, name)
 
     if name
       if params.empty?

data/lib/puppet/application_support.rb

@@ -0,0 +1,57 @@
+require 'yaml'
+
+require 'puppet'
+require 'puppet/node/environment'
+require 'puppet/file_system'
+require 'puppet/indirector'
+
+module Puppet
+  module ApplicationSupport
+
+    # Pushes a Puppet Context configured with a remote environment for an agent
+    # (one that exists at the master end), and a regular environment for other
+    # modes. The configuration is overridden with options from the command line
+    # before being set in a pushed Puppet Context.
+    #
+    # @param run_mode [Puppet::Util::RunMode] Puppet's current Run Mode.
+    # @return [void]
+    # @api private
+    def self.push_application_context(run_mode)
+      Puppet.push_context(Puppet.base_context(Puppet.settings), "Update for application settings (#{run_mode})")
+      # This use of configured environment is correct, this is used to establish
+      # the defaults for an application that does not override, or where an override
+      # has not been made from the command line.
+      #
+      configured_environment_name = Puppet[:environment]
+      if run_mode.name == :agent
+        configured_environment = Puppet::Node::Environment.remote(configured_environment_name)
+      else
+        configured_environment = Puppet.lookup(:environments).get!(configured_environment_name)
+      end
+      configured_environment = configured_environment.override_from_commandline(Puppet.settings)
+
+      # Setup a new context using the app's configuration
+      Puppet.push_context({:current_environment => configured_environment},
+                          "Update current environment from application's configuration")
+    end
+
+    # Reads the routes YAML settings from the file specified by Puppet[:route_file]
+    # and resets indirector terminii for the current application class if listed.
+    #
+    # For instance, PE uses this to set the master facts terminus
+    # to 'puppetdb' and its cache terminus to 'yaml'.
+    #
+    # @param application_name [String] The name of the current application.
+    # @return [void]
+    # @api private
+    def self.configure_indirector_routes(application_name)
+      route_file = Puppet[:route_file]
+      if Puppet::FileSystem.exist?(route_file)
+        routes = YAML.load_file(route_file)
+        application_routes = routes[application_name]
+        Puppet::Indirector.configure_routes(application_routes) if application_routes
+      end
+    end
+
+  end
+end

data/lib/puppet/configurer.rb

@@ -116,7 +116,7 @@ class Puppet::Configurer
     report = options[:report]
     report.configuration_version = catalog.version
 
-    benchmark(:notice, "Finished catalog run") do
+    benchmark(:notice, "Applied catalog") do
       catalog.apply(options)
     end
 
@@ -176,9 +176,7 @@ class Puppet::Configurer
               query_options = nil
             end
           end
-        rescue SystemExit,NoMemoryError
-          raise
-        rescue Exception => detail
+        rescue StandardError => detail
           Puppet.warning("Unable to fetch my node definition, but the agent run will continue:")
           Puppet.warning(detail)
         end
@@ -295,9 +293,7 @@ class Puppet::Configurer
         query_options.merge(:ignore_cache => true, :environment => Puppet::Node::Environment.remote(@environment), :fail_on_404 => true))
     end
     result
-  rescue SystemExit,NoMemoryError
-    raise
-  rescue Exception => detail
+  rescue StandardError => detail
     Puppet.log_exception(detail, "Could not retrieve catalog from remote server: #{detail}")
     return nil
   end

data/lib/puppet/configurer/downloader.rb

@@ -45,6 +45,7 @@ class Puppet::Configurer::Downloader
     defargs = {
       :path => path,
       :recurse => true,
+      :links => :follow,
       :source => source,
       :source_permissions => @source_permissions,
       :tag => name,

data/lib/puppet/configurer/fact_handler.rb

@@ -12,7 +12,7 @@ module Puppet::Configurer::FactHandler
     # finding facts and the 'rest' terminus for caching them.  Thus, we'll
     # compile them and then "cache" them on the server.
     begin
-      facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value], :environment => @environment)
+      facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value], :environment => Puppet::Node::Environment.remote(@environment))
       unless Puppet[:node_name_fact].empty?
         Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
         facts.name = Puppet[:node_name_value]

data/lib/puppet/daemon.rb

@@ -24,7 +24,6 @@ class Puppet::Daemon
   SIGNAL_CHECK_INTERVAL = 5
 
   attr_accessor :agent, :server, :argv
-  attr_reader :signals
 
   def initialize(pidfile, scheduler = Puppet::Scheduler::Scheduler.new())
     @scheduler = scheduler
@@ -108,21 +107,13 @@ class Puppet::Daemon
   # Trap a couple of the main signals.  This should probably be handled
   # in a way that anyone else can register callbacks for traps, but, eh.
   def set_signal_traps
-    [:INT, :TERM].each do |signal|
-      Signal.trap(signal) do
-        Puppet.notice "Caught #{signal}; exiting"
-        stop
-      end
-    end
-
+    signals = {:INT => :stop, :TERM => :stop }
     # extended signals not supported under windows
-    if !Puppet.features.microsoft_windows?
-      signals = {:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }
-      signals.each do |signal, method|
-        Signal.trap(signal) do
-          Puppet.notice "Caught #{signal}; storing #{method}"
-          @signals << method
-        end
+    signals.update({:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs }) unless Puppet.features.microsoft_windows?
+    signals.each do |signal, method|
+      Signal.trap(signal) do
+        Puppet.notice "Caught #{signal}; storing #{method}"
+        @signals << method
       end
     end
   end

data/lib/puppet/data_providers.rb

@@ -0,0 +1,28 @@
+module Puppet::DataProviders
+
+  def self.assert_loaded
+    unless @loaded
+      require 'puppet/pops'
+      require 'puppet/data_providers/data_adapter'
+    end
+    @loaded = true
+  end
+
+  def self.lookup_in_environment(name, scope, merge)
+    assert_loaded()
+    adapter = Puppet::DataProviders::DataAdapter.adapt(Puppet.lookup(:current_environment))
+    adapter.env_provider.lookup(name, scope, merge)
+  end
+
+  MODULE_NAME = 'module_name'.freeze
+
+  def self.lookup_in_module(name, scope, merge)
+    # Do not attempt to do a lookup in a module if evaluated code is not in a module
+    # which is detected by checking if "MODULE_NAME" exists in scope
+    return nil unless scope.exist?(MODULE_NAME)
+
+    assert_loaded()
+    adapter = Puppet::DataProviders::DataAdapter.adapt(Puppet.lookup(:current_environment))
+    adapter.module_provider(scope[MODULE_NAME]).lookup(name, scope, merge)
+  end
+end