puppet 5.3.7-universal-darwin → 5.4.0-universal-darwin

data/ext/solaris/smf/svc-puppetmasterd

@@ -24,14 +24,14 @@ start)
     ;;
 stop)
     printf "Stopping Puppet server services:"
-    kill `cat $pidfile`
+    kill `cat "$pidfile"`
 
     printf " puppetmasterd"
     echo ""
     ;;
 restart)
     printf "Restarting Puppet server services:"
-    kill -HUP `cat $pidfile`
+    kill -HUP `cat "$pidfile"`
 
     printf " puppetmasterd"
     echo ""
@@ -39,14 +39,14 @@ restart)
 reload)
     printf "Reloading Puppet server services:"
 
-    kill -HUP `cat $pidfile`
+    kill -HUP `cat "$pidfile"`
 
     printf " puppetmasterd"
     echo ""
     ;;
 status)
-    if [ -f $pidfile ]; then
-        pid=`cat $pidfile`
+    if [ -f "$pidfile" ]; then
+        pid=`cat "$pidfile"`
         curpid=`pgrep puppetmasterd`
         if [ "$pid" -eq "$curpid" ]; then
             exit 0

data/ext/windows/service/daemon.rb

@@ -142,7 +142,7 @@ class WindowsDaemon < Win32::Daemon
         :event_id    => id,     # 0x01 or 0x02, 0x03 etc.
         :data        => message # "the message"
       )
-    rescue Exception => e
+    rescue Exception
       # Ignore all errors
     ensure
       if (!eventlog.nil?)

data/install.rb

@@ -482,7 +482,6 @@ EOS
         FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
 
         tmp_file2.unlink
-        installed_wrapper = true
       end
     end
   end
@@ -495,8 +494,8 @@ FileUtils.cd File.dirname(__FILE__) do
   # Set these values to what you want installed.
   configs = glob(%w{conf/auth.conf conf/puppet.conf conf/hiera.yaml})
   bins  = glob(%w{bin/*})
-  rdoc  = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
-  ri    = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
+  #rdoc  = glob(%w{bin/* lib/**/*.rb README* }).reject { |e| e=~ /\.(bat|cmd)$/ }
+  #ri    = glob(%w{bin/*.rb lib/**/*.rb}).reject { |e| e=~ /\.(bat|cmd)$/ }
   man   = glob(%w{man/man[0-9]/*})
   libs  = glob(%w{lib/**/*})
   locales = glob(%w{locales/**/*})

data/lib/puppet/agent.rb

@@ -122,7 +122,7 @@ class Puppet::Agent
   # to it during the yield.
   def with_client(transaction_uuid, job_id = nil)
     begin
-      @client = client_class.new(Puppet::Configurer::DownloaderFactory.new, transaction_uuid, job_id)
+      @client = client_class.new(transaction_uuid, job_id)
     rescue StandardError => detail
       Puppet.log_exception(detail, _("Could not create instance of %{client_class}: %{detail}") % { client_class: client_class, detail: detail })
       return

data/lib/puppet/application/cert.rb

@@ -269,10 +269,8 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     end
     begin
       if subcommand == :destroy
-        raise _("Refusing to destroy all certs, provide an explicit list of certs to destroy") if hosts == :all
-
         signed_hosts = hosts - @ca.waiting?
-        apply(@ca, :revoke, options.merge(:to => signed_hosts)) unless signed_hosts.empty?
+        apply(@ca, :revoke, options.merge(:to => signed_hosts))
       end
       apply(@ca, subcommand, options.merge(:to => hosts, :digest => @digest))
     rescue => detail

data/lib/puppet/application/describe.rb

@@ -37,7 +37,6 @@ class Formatter
   def scrub(text)
     # For text with no carriage returns, there's nothing to do.
     return text if text !~ /\n/
-    indent = nil
 
     # If we can match an indentation, then just remove that same level of
     # indent from every line.

data/lib/puppet/application/device.rb

@@ -24,16 +24,13 @@ class Puppet::Application::Device < Puppet::Application
     end
 
     {
-      :apply => nil,
       :waitforcert => nil,
       :detailed_exitcodes => false,
       :verbose => false,
       :debug => false,
       :centrallogs => false,
       :setdest => false,
-      :resource => false,
       :target => nil,
-      :to_yaml => false,
     }.each do |opt,val|
       options[opt] = val
     end
@@ -43,18 +40,12 @@ class Puppet::Application::Device < Puppet::Application
 
   option("--centrallogging")
   option("--debug","-d")
-  option("--resource","-r")
-  option("--to_yaml","-y")
   option("--verbose","-v")
 
   option("--detailed-exitcodes") do |arg|
     options[:detailed_exitcodes] = true
   end
 
-  option("--apply MANIFEST") do |arg|
-    options[:apply] = arg.to_s
-  end
-
   option("--logdest DEST", "-l DEST") do |arg|
     handle_logdest_arg(arg)
   end
@@ -94,7 +85,6 @@ USAGE
   puppet device [-d|--debug] [--detailed-exitcodes] [--deviceconfig <file>]
                 [-h|--help] [-l|--logdest syslog|<file>|console]
                 [-v|--verbose] [-w|--waitforcert <seconds>]
-                [-a|--apply <file>] [-r|--resource <type> [name]]
                 [-t|--target <device>] [--user=<user>] [-V|--version]
 
 
@@ -160,21 +150,10 @@ you can specify '--server <servername>' as an argument.
   appending nature of logging. It must be appended manually to make the content
   valid JSON.
 
-* --apply:
-  Apply a manifest against a remote target. Target must be specified.
-
-* --resource:
-  Displays a resource state as Puppet code, roughly equivalent to
-  `puppet resource`.  Can be filterd by title. Requires --target be specified.
-
 * --target:
   Target a specific device/certificate in the device.conf. Doing so will perform a
   device run against only that device/certificate.
 
-* --to_yaml:
-  Output found resources in yaml format, suitable to use with Hiera and
-  create_resources.
-
 * --user:
   The user to run as.
 
@@ -191,7 +170,7 @@ you can specify '--server <servername>' as an argument.
 
 EXAMPLE
 -------
-      $ puppet device --target remotehost --verbose
+      $ puppet device --server puppet.domain.com
 
 AUTHOR
 ------
@@ -207,20 +186,6 @@ Licensed under the Apache 2.0 License
 
 
   def main
-    if options[:resource] and !options[:target]
-      Puppet.err _("resource command requires target")
-      exit(1)
-    end
-    unless options[:apply].nil?
-      if options[:target].nil?
-        Puppet.err _("missing argument: --target is required when using --apply")
-        exit(1)
-      end
-      unless File.file?(options[:apply])
-        Puppet.err _("%{file} does not exist, cannot apply") % { file: options[:apply] }
-        exit(1)
-      end
-    end
     vardir = Puppet[:vardir]
     confdir = Puppet[:confdir]
     certname = Puppet[:certname]
@@ -247,61 +212,27 @@ Licensed under the Apache 2.0 License
           # Handle nil scheme & port
           scheme = "#{device_url.scheme}://" if device_url.scheme
           port = ":#{device_url.port}" if device_url.port
+          Puppet.info _("starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
 
           # override local $vardir and $certname
           Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
           Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
           Puppet[:certname] = device.name
 
+          # this will reload and recompute default settings and create the devices sub vardir, or we hope so :-)
+          Puppet.settings.use :main, :agent, :ssl
+
           # this init the device singleton, so that the facts terminus
           # and the various network_device provider can use it
           Puppet::Util::NetworkDevice.init(device)
 
-          if options[:resource]
-            type, name = parse_args(command_line.args)
-            Puppet.info _("retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { resource: type, target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
-
-            resources = find_resources(type, name)
-
-            if options[:to_yaml]
-              text = resources.map do |resource|
-                resource.prune_parameters(:parameters_to_include => @extra_params).to_hierayaml.force_encoding(Encoding.default_external)
-              end.join("\n")
-              text.prepend("#{type.downcase}:\n")
-            else
-              text = resources.map do |resource|
-                resource.prune_parameters(:parameters_to_include => @extra_params).to_manifest.force_encoding(Encoding.default_external)
-              end.join("\n")
-            end
-            (puts text)
-          elsif options[:apply]
-            # avoid reporting to server
-            Puppet::Transaction::Report.indirection.terminus_class = :yaml
-            Puppet::Resource::Catalog.indirection.cache_class = nil
-
-            require 'puppet/application/apply'
-            begin
-
-              Puppet[:node_terminus] = :plain
-              Puppet[:catalog_terminus] = :compiler
-              Puppet[:catalog_cache_terminus] = nil
-              Puppet[:facts_terminus] = :network_device
-              Puppet.override(:network_device => true) do
-                Puppet::Application::Apply.new(Puppet::Util::CommandLine.new('puppet', ["apply", options[:apply]])).run_command
-              end
-            end
-          else
-            Puppet.info _("starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
-            # this will reload and recompute default settings and create the devices sub vardir
-            Puppet.settings.use :main, :agent, :ssl
-            # ask for a ssl cert if needed, but at least
-            # setup the ssl system for this device.
-            setup_host
-
-            require 'puppet/configurer'
-            configurer = Puppet::Configurer.new
-            configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_pluginsync?)
-          end
+          # ask for a ssl cert if needed, but at least
+          # setup the ssl system for this device.
+          setup_host
+
+          require 'puppet/configurer'
+          configurer = Puppet::Configurer.new
+          configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_pluginsync?)
         rescue => detail
           Puppet.log_exception(detail)
           # If we rescued an error, then we return 1 as the exit code
@@ -327,24 +258,6 @@ Licensed under the Apache 2.0 License
     end
   end
 
-  def parse_args(args)
-    type = args.shift or raise _("You must specify the type to display")
-    Puppet::Type.type(type) or raise _("Could not find type %{type}") % { type: type }
-    name = args.shift
-
-    [type, name]
-  end
-
-  def find_resources(type, name)
-    key = [type, name].join('/')
-
-    if name
-      [ Puppet::Resource.indirection.find( key ) ]
-    else
-      Puppet::Resource.indirection.search( key, {} )
-    end
-  end
-
   def setup_host
     @host = Puppet::SSL::Host.new
     waitforcert = options[:waitforcert] || (Puppet[:onetime] ? 0 : Puppet[:waitforcert])

data/lib/puppet/application/filebucket.rb

@@ -66,7 +66,8 @@ central filebucket.
 Note that 'filebucket' defaults to using a network-based filebucket
 available on the server named 'puppet'. To use this, you'll have to be
 running as a user with valid Puppet certificates. Alternatively, you can
-use your local file bucket by specifying '--local'.
+use your local file bucket by specifying '--local', or by specifying
+'--bucket' with a local path.
 
 
 OPTIONS
@@ -77,33 +78,40 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+https://puppet.com/docs/puppet/latest/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.
 
+* --bucket:
+  Specify a local filebucket path. This overrides the default path
+  set in '$clientbucketdir'.
+
 * --debug:
   Enable full debugging.
 
 * --fromdate:
-  (list only) Select bucket files from 'fromdate'
+  (list only) Select bucket files from 'fromdate'.
 
 * --help:
-  Print this help message
+  Print this help message.
 
 * --local:
-  Use the local filebucket. This will use the default configuration
-  information.
+  Use the local filebucket. This uses the default configuration
+  information and the bucket located at the '$clientbucketdir'
+  setting by default. If '--bucket' is set, puppet uses that
+  path instead.
 
 * --remote:
-  Use a remote filebucket. This will use the default configuration
-  information.
+  Use a remote filebucket. This uses the default configuration
+  information and the bucket located at the '$bucketdir' setting
+  by default.
 
 * --server:
   The server to send the file to, instead of locally.
 
 * --todate:
-  (list only) Select bucket files until 'todate'
+  (list only) Select bucket files until 'todate'.
 
 * --verbose:
   Print extra information.
@@ -154,6 +162,11 @@ EXAMPLES
 
     $ puppet filebucket -l -t "2015-05-11 09:30:00" list
     d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
+    ## Manage files in a specific local filebucket
+    $ puppet filebucket -b /tmp/TestBucket backup /tmp/TestFile2
+    /tmp/TestFile2: d41d8cd98f00b204e9800998ecf8427e
+    $ puppet filebucket -b /tmp/TestBucket list
+    d41d8cd98f00b204e9800998ecf8427e 2015-05-11 09:33:22 /tmp/TestFile2
 
     ## From a Puppet master, list files in the master bucketdir
     $ puppet filebucket -b $(puppet config print bucketdir --section master) list
@@ -266,10 +279,18 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     require 'puppet/file_bucket/dipper'
     begin
       if options[:local] or options[:bucket]
-        path = options[:bucket] || Puppet[:bucketdir]
+        path = options[:bucket] || Puppet[:clientbucketdir]
         @client = Puppet::FileBucket::Dipper.new(:Path => path)
       else
-        @client = Puppet::FileBucket::Dipper.new(:Server => Puppet[:server])
+        if Puppet[:server_list] && !Puppet[:server_list].empty?
+          server = Puppet[:server_list].first
+          @client = Puppet::FileBucket::Dipper.new(
+            :Server => server[0],
+            :Port => server[1]
+          )
+        else
+          @client = Puppet::FileBucket::Dipper.new(:Server => Puppet[:server])
+        end
       end
     rescue => detail
       Puppet.log_exception(detail)

data/lib/puppet/application/lookup.rb

@@ -335,17 +335,7 @@ Copyright (c) 2015 Puppet Inc., LLC Licensed under the Apache 2.0 License
       Puppet.settings[:facts_terminus] = 'facter'
     end
 
-    unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
-      ni = Puppet::Node.indirection
-      tc = ni.terminus_class
-      if tc == :plain || options[:compile]
-        node = ni.find(node)
-      else
-        ni.terminus_class = :plain
-        node = ni.find(node)
-        ni.terminus_class = tc
-      end
-    end
+    node = Puppet::Node.indirection.find(node) unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
 
     fact_file = options[:fact_file]
 

data/lib/puppet/application/script.rb

@@ -0,0 +1,261 @@
+require 'puppet/application'
+require 'puppet/configurer'
+require 'puppet/util/profiler/aggregate'
+require 'puppet/parser/script_compiler'
+
+class Puppet::Application::Script < Puppet::Application
+
+  option("--debug","-d")
+  option("--execute EXECUTE","-e") do |arg|
+    options[:code] = arg
+  end
+  option("--test","-t")
+  option("--verbose","-v")
+
+  option("--logdest LOGDEST", "-l") do |arg|
+    handle_logdest_arg(arg)
+  end
+
+  def summary
+    _("Run a puppet manifests as a script without compiling a catalog")
+  end
+
+  def help
+    <<-HELP
+
+puppet-script(8) -- #{summary}
+========
+
+SYNOPSIS
+--------
+Runs a puppet language script without compiling a catalog.
+
+
+USAGE
+-----
+puppet script [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose]
+  [-e|--execute]
+  [-l|--logdest syslog|eventlog|<FILE>|console] [--noop]
+  <file>
+
+
+DESCRIPTION
+-----------
+This is a standalone puppet script runner tool; use it to run puppet code
+without compiling a catalog.
+
+When provided with a modulepath, via command line or config file, puppet
+script can load functions, types, tasks and plans from modules.
+
+OPTIONS
+-------
+Note that any setting that's valid in the configuration
+file is also a valid long argument. For example, 'environment' is a
+valid setting, so you can specify '--environment mytest'
+as an argument.
+
+See the configuration file documentation at
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for the
+full list of acceptable parameters. A commented list of all
+configuration options can also be generated by running puppet with
+'--genconfig'.
+
+* --debug:
+  Enable full debugging.
+
+* --help:
+  Print this help message
+
+
+* --logdest:
+  Where to send log messages. Choose between 'syslog' (the POSIX syslog
+  service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
+  file. Defaults to 'console'.
+
+  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.
+
+* --noop:
+  Use 'noop' mode where Puppet runs in a no-op or dry-run mode. This
+  is useful for seeing what changes Puppet will make without actually
+  executing the changes. Applies to tasks only.
+
+* --execute:
+  Execute a specific piece of Puppet code
+
+* --verbose:
+  Print extra information.
+
+EXAMPLE
+-------
+    $ puppet script -l /tmp/manifest.log manifest.pp
+    $ puppet script --modulepath=/root/dev/modules -e 'notice("hello world")'
+
+
+AUTHOR
+------
+Henrik Lindberg
+
+
+COPYRIGHT
+---------
+Copyright (c) 2017 Puppet Inc., LLC Licensed under the Apache 2.0 License
+
+    HELP
+  end
+
+  def app_defaults
+    super.merge({
+      :default_file_terminus => :file_server,
+    })
+  end
+
+  def run_command
+    if Puppet.features.bolt?
+      Puppet.override(:bolt_executor => Bolt::Executor.new) do
+        main
+      end
+    else
+      raise _("Bolt must be installed to use the script application")
+    end
+  end
+
+  def main
+    # The tasks feature is always on
+    Puppet[:tasks] = true
+
+    # Set the puppet code or file to use.
+    if options[:code] || command_line.args.length == 0
+      Puppet[:code] = options[:code] || STDIN.read
+    else
+      manifest = command_line.args.shift
+      raise _("Could not find file %{manifest}") % { manifest: manifest } unless Puppet::FileSystem.exist?(manifest)
+      Puppet.warning(_("Only one file can be used per run. Skipping %{files}") % { files: command_line.args.join(', ') }) if command_line.args.size > 0
+    end
+
+    unless Puppet[:node_name_fact].empty?
+      # Collect the facts specified for that node
+      unless facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
+        raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] }
+      end
+
+      Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
+      facts.name = Puppet[:node_name_value]
+    end
+
+    # Find the Node
+    unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
+      raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] }
+    end
+
+    configured_environment = node.environment || Puppet.lookup(:current_environment)
+
+    apply_environment = manifest ?
+      configured_environment.override_with(:manifest => manifest) :
+      configured_environment
+
+    # Modify the node descriptor to use the special apply_environment.
+    # It is based on the actual environment from the node, or the locally
+    # configured environment if the node does not specify one.
+    # If a manifest file is passed on the command line, it overrides
+    # the :manifest setting of the apply_environment.
+    node.environment = apply_environment
+
+    # TRANSLATION, the string "For puppet script" is not user facing
+    Puppet.override({:current_environment => apply_environment}, "For puppet script") do
+      # Merge in the facts.
+      node.merge(facts.values) if facts
+
+      # Add server facts so $server_facts[environment] exists when doing a puppet script
+      # SCRIPT TODO: May be needed when running scripts under orchestrator. Leave it for now.
+      #
+      node.add_server_facts({})
+
+      begin
+        # Compile the catalog
+
+        # When compiling, the compiler traps and logs certain errors
+        # Those that do not lead to an immediate exit are caught by the general
+        # rule and gets logged.
+        #
+        begin
+          # support the following features when evaluating puppet code
+          # * $facts with facts from host running the script
+          # * $settings with 'settings::*' namespace populated, and '$settings::all_local' hash
+          # * $trusted as setup when using puppet apply
+          # * an environment
+          #
+
+          # fixup trusted information
+          node.sanitize()
+
+          compiler = Puppet::Parser::ScriptCompiler.new(node.environment, node.name)
+          topscope = compiler.topscope
+
+          # When scripting the trusted data are always local, but set them anyway
+          topscope.set_trusted(node.trusted_data)
+
+          # Server facts are always about the local node's version etc.
+          topscope.set_server_facts(node.server_facts)
+
+          # Set $facts for the node running the script
+          facts_hash = node.facts.nil? ? {} : node.facts.values
+          topscope.set_facts(facts_hash)
+
+          # create the $settings:: variables
+          topscope.merge_settings(node.environment.name, false)
+
+          compiler.compile()
+
+        rescue Puppet::ParseErrorWithIssue, Puppet::Error
+          # already logged and handled by the compiler for these two cases
+          exit(1)
+        end
+
+        exit(0)
+      rescue => detail
+        Puppet.log_exception(detail)
+        exit(1)
+      end
+    end
+
+  ensure
+    if @profiler
+      Puppet::Util::Profiler.remove_profiler(@profiler)
+      @profiler.shutdown
+    end
+  end
+
+  def setup
+
+    exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
+
+    Puppet::Util::Log.newdestination(:console) unless options[:setdest]
+
+    Signal.trap(:INT) do
+      $stderr.puts _("Exiting")
+      exit(1)
+    end
+
+    # TODO: This skips applying the settings catalog for these settings, but
+    # the effect of doing this is unknown. It may be that it only works if there is a puppet
+    # installed where a settings catalog have already been applied...
+    # This saves 1/5th of the startup time
+
+#    Puppet.settings.use :main, :agent, :ssl
+
+    # When running a script, the catalog is not relevant, and neither is caching of it
+    Puppet::Resource::Catalog.indirection.cache_class = nil
+
+    # we do not want the last report to be persisted
+    Puppet::Transaction::Report.indirection.cache_class = nil
+
+    set_log_level
+
+    if Puppet[:profile]
+      @profiler = Puppet::Util::Profiler.add_profiler(Puppet::Util::Profiler::Aggregate.new(Puppet.method(:info), "script"))
+    end
+  end
+end