puppet 5.5.2 → 5.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150276769f3f7d3b0d1144c7cc955ec30ef7079f
-  data.tar.gz: 2c346495b89018f0040fd15dac9ceea9972bc241
+  metadata.gz: c34d01120ed58c4595066bcf80fd5100865c6fb9
+  data.tar.gz: f86ac9bc12aa80d03c7c6dfebfd10bd6370a3a5d
 SHA512:
-  metadata.gz: c145fc602f225f17256e87cf111da9350a28ae59e9f2574d5e6fbdaeb452f7015ac4c19ca79d87eeaaf40d57298b3e1447779662d2c4b5fa5eb8a20d6249389c
-  data.tar.gz: 05a8ba3218ee7ad635005adfe67ade21b9df1e55a57dcf7c01f82783fdcd59e9687d3efb1feec476bc6ddb6c43a6409618f10d859a0fef0b868aed6ff0d07e52
+  metadata.gz: 6cefc3d13b8da706ac064b8da16c14df3813a87858591b83ccbc180977bb450b28e1a783979dd94fc095f9b782025abe69022d21425ef526301b0423cf35adcd
+  data.tar.gz: ed5fdf1a5eb4be48d04a24190e86b7490680b2513d6527e9475b9abb15a67e53d16ada714c64fdebf4c49721a718a29a31a9307079781cc3de573a53451bffed

data/lib/puppet/application/device.rb

@@ -32,6 +32,7 @@ class Puppet::Application::Device < Puppet::Application
       :centrallogs => false,
       :setdest => false,
       :resource => false,
+      :facts => false,
       :target => nil,
       :to_yaml => false,
     }.each do |opt,val|
@@ -44,6 +45,7 @@ class Puppet::Application::Device < Puppet::Application
   option("--centrallogging")
   option("--debug","-d")
   option("--resource","-r")
+  option("--facts","-f")
   option("--to_yaml","-y")
   option("--verbose","-v")
 
@@ -93,7 +95,7 @@ USAGE
 -----
   puppet device [-d|--debug] [--detailed-exitcodes] [--deviceconfig <file>]
                 [-h|--help] [-l|--logdest syslog|<file>|console]
-                [-v|--verbose] [-w|--waitforcert <seconds>]
+                [-v|--verbose] [-w|--waitforcert <seconds>] [-f|--facts]
                 [-a|--apply <file>] [-r|--resource <type> [name]]
                 [-t|--target <device>] [--user=<user>] [-V|--version]
 
@@ -163,6 +165,9 @@ you can specify '--server <servername>' as an argument.
 * --apply:
   Apply a manifest against a remote target. Target must be specified.
 
+* --facts:
+  Displays the facts of 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.
@@ -208,18 +213,14 @@ Licensed under the Apache 2.0 License
 
   def main
     if options[:resource] and !options[:target]
-      Puppet.err _("resource command requires target")
-      exit(1)
+      raise _("resource command requires target")
+    end
+    if options[:facts] and !options[:target]
+      raise _("facts command requires target")
     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
+      raise _("missing argument: --target is required when using --apply") if options[:target].nil?
+      raise _("%{file} does not exist, cannot apply") % { file: options[:apply] } unless File.file?(options[:apply])
     end
     vardir = Puppet[:vardir]
     confdir = Puppet[:confdir]
@@ -235,7 +236,7 @@ Licensed under the Apache 2.0 License
       end
       if devices.empty?
         if options[:target]
-          Puppet.err _("Target device / certificate '%{target}' not found in %{config}") % { target: options[:target], config: Puppet[:deviceconfig] }
+          raise _("Target device / certificate '%{target}' not found in %{config}") % { target: options[:target], config: Puppet[:deviceconfig] }
         else
           Puppet.err _("No device found in %{config}") % { config: Puppet[:deviceconfig] }
           exit(1)
@@ -260,9 +261,7 @@ Licensed under the Apache 2.0 License
           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)
@@ -274,14 +273,24 @@ Licensed under the Apache 2.0 License
               end.join("\n")
             end
             (puts text)
+            0
+          elsif options[:facts]
+            Puppet.info _("retrieving facts 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 }
+            remote_facts = Puppet::Node::Facts.indirection.find(name, :environment => env)
+            # Give a proper name to the facts
+            remote_facts.name = remote_facts.values['clientcert']
+            renderer = Puppet::Network::FormatHandler.format(:console)
+            puts renderer.render(remote_facts)
+            0
           elsif options[:apply]
+            # ensure we have a cache folder structure exists for the device
+            FileUtils.mkdir_p(Puppet[:statedir]) unless File.directory?(Puppet[:statedir])
             # 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
@@ -353,26 +362,30 @@ Licensed under the Apache 2.0 License
 
   def setup
     setup_logs
+    if options[:apply] || options[:facts] || options[:resource]
+      Puppet::Util::Log.newdestination(:console)
+      Puppet.settings.use :main, :agent, :ssl
+    else
+      args[:Server] = Puppet[:server]
+      if options[:centrallogs]
+        logdest = args[:Server]
 
-    args[:Server] = Puppet[:server]
-    if options[:centrallogs]
-      logdest = args[:Server]
-
-      logdest += ":" + args[:Port] if args.include?(:Port)
-      Puppet::Util::Log.newdestination(logdest)
-    end
+        logdest += ":" + args[:Port] if args.include?(:Port)
+        Puppet::Util::Log.newdestination(logdest)
+      end
 
-    Puppet.settings.use :main, :agent, :device, :ssl
+      Puppet.settings.use :main, :agent, :device, :ssl
 
-    # We need to specify a ca location for all of the SSL-related
-    # indirected classes to work; in fingerprint mode we just need
-    # access to the local files and we don't need a ca.
-    Puppet::SSL::Host.ca_location = :remote
+      # We need to specify a ca location for all of the SSL-related
+      # indirected classes to work; in fingerprint mode we just need
+      # access to the local files and we don't need a ca.
+      Puppet::SSL::Host.ca_location = :remote
 
-    Puppet::Transaction::Report.indirection.terminus_class = :rest
+      Puppet::Transaction::Report.indirection.terminus_class = :rest
 
-    if Puppet[:catalog_cache_terminus]
-      Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus].intern
+      if Puppet[:catalog_cache_terminus]
+        Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus].intern
+      end
     end
   end
 end

data/lib/puppet/defaults.rb

@@ -258,10 +258,10 @@ module Puppet
     },
     :configprint => {
         :default  => "",
-        :desc     => "Print the value of a specific configuration setting.  If the name of a
+        :desc     => "Prints the value of a specific configuration setting.  If the name of a
           setting is provided for this, then the value is printed and puppet
           exits.  Comma-separate multiple values.  For a list of all values,
-          specify 'all'.",
+          specify 'all'. This setting is deprecated, the 'puppet config' command replaces this functionality.",
     },
     :color => {
       :default => "ansi",
@@ -735,7 +735,8 @@ A comma-separated list of alternate DNS names for Puppet Server. These are extra
 hostnames (in addition to its `certname`) that the server is allowed to use when
 serving agents. Puppet checks this setting when automatically requesting a
 certificate for Puppet agent or Puppet Server, and when manually generating a
-certificate with `puppet cert generate`.
+certificate with `puppet cert generate`. These can be either IP or DNS, and the type
+should be specified and followed with a colon. Untyped inputs will default to DNS.
 
 In order to handle agent requests at a given hostname (like
 "puppet.example.com"), Puppet Server needs a certificate that proves it's
@@ -1621,7 +1622,9 @@ EOT
       :type       => :boolean,
       :desc       => "Whether to only use the cached catalog rather than compiling a new catalog
         on every run.  Puppet can be run with this enabled by default and then selectively
-        disabled when a recompile is desired.",
+        disabled when a recompile is desired. Because a Puppet agent using cached catalogs
+        does not contact the master for a new catalog, it also does not upload facts at
+        the beginning of the Puppet run.",
     },
     :ignoremissingtypes => {
       :default    => false,

data/lib/puppet/environments.rb

@@ -443,10 +443,9 @@ module Puppet::Environments
     # Also clears caches in Settings that may prevent the entry from being updated
     def evict_if_expired(name)
       if (result = @cache[name]) && (result.expired? || @cache_expiration_service.expired?(name))
-      Puppet.debug {"Evicting cache entry for environment '#{name}'"}
-        @cache.delete(name)
+        Puppet.debug {"Evicting cache entry for environment '#{name}'"}
         @cache_expiration_service.evicted(name)
-
+        clear(name)
         Puppet.settings.clear_environment_settings(name)
       end
     end

data/lib/puppet/face/config.rb

@@ -39,7 +39,7 @@ Puppet::Face.define(:config, '0.0.1') do
     description <<-'EOT'
       Prints the value of a single setting or a list of settings.
 
-      This action is an alternate interface to the information available with
+      This action is a replacement interface to the information available with
       `puppet <subcommand> --configprint`.
     EOT
     notes <<-'EOT'

data/lib/puppet/face/module/build.rb

@@ -52,6 +52,9 @@ Puppet::Face.define(:module, '1.0.0') do
         end
       end
 
+      #TRANSLATORS 'puppet module build' is the name of the puppet command and 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
+      Puppet.deprecation_warning _("`puppet module build` is deprecated and will be removed in a future release. This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html.")
+
       Puppet::ModuleTool.set_option_defaults options
       Puppet::ModuleTool::Applications::Builder.run(module_path, options)
     end
@@ -60,5 +63,7 @@ Puppet::Face.define(:module, '1.0.0') do
       # Get the string representation of the Pathname object.
       _("Module built: %{path}") % { path: return_value.expand_path.to_s }
     end
+
+    deprecate
   end
 end

data/lib/puppet/gettext/config.rb

@@ -6,6 +6,7 @@ module Puppet::GettextConfig
   POSIX_PATH = File.absolute_path('../../../../../share/locale', File.dirname(__FILE__))
   WINDOWS_PATH = File.absolute_path('../../../../../../../puppet/share/locale', File.dirname(__FILE__))
 
+  # This is the only domain name that won't be a symbol, making it unique from environments.
   DEFAULT_TEXT_DOMAIN = 'default-text-domain'
 
   # Load gettext helpers and track whether they're available.
@@ -59,10 +60,12 @@ module Puppet::GettextConfig
   # Clears the translation repository for the given text domain,
   # creating it if it doesn't exist, then adds default translations
   # and switches to using this domain.
-  # @param [String] domain_name the name of the domain to create
+  # @param [String, Symbol] domain_name the name of the domain to create
   def self.reset_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+    domain_name = domain_name.to_sym
 
+    Puppet.debug "Reset text domain to #{domain_name.inspect}"
     FastGettext.add_text_domain(domain_name,
                                 type: :chain,
                                 chain: [],
@@ -71,6 +74,18 @@ module Puppet::GettextConfig
     FastGettext.text_domain = domain_name
   end
 
+  # @api private
+  # Resets the thread's configured text_domain to the default text domain.
+  # In Puppet Server, thread A may process a compile request that configures
+  # a domain, while thread B may invalidate that environment and delete the
+  # domain. That leaves thread A with an invalid text_domain selected.
+  # To avoid that, clear_text_domain after any processing that needs the
+  # non-default text domain.
+  def self.clear_text_domain
+    return if @gettext_disabled || !gettext_loaded?
+    FastGettext.text_domain = nil
+  end
+
   # @api private
   # Creates a default text domain containing the translations for
   # Puppet as the start of chain. When semantic_puppet gets initialized,
@@ -94,12 +109,16 @@ module Puppet::GettextConfig
 
   # @api private
   # Switches the active text domain, if the requested domain exists.
-  # @param [String] domain_name the name of the domain to switch to
+  # @param [String, Symbol] domain_name the name of the domain to switch to
   def self.use_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+    domain_name = domain_name.to_sym
 
     if FastGettext.translation_repositories.include?(domain_name)
+      Puppet.debug "Use text domain #{domain_name.inspect}"
       FastGettext.text_domain = domain_name
+    else
+      Puppet.debug "Requested unknown text domain #{domain_name.inspect}"
     end
   end
 
@@ -113,13 +132,17 @@ module Puppet::GettextConfig
 
   # @api private
   # Deletes the text domain with the given name
-  # @param [String] domain_name the name of the domain to delete
+  # @param [String, Symbol] domain_name the name of the domain to delete
   def self.delete_text_domain(domain_name)
     return if @gettext_disabled || !gettext_loaded?
+    domain_name = domain_name.to_sym
 
-    FastGettext.translation_repositories.delete(domain_name)
+    deleted = FastGettext.translation_repositories.delete(domain_name)
     if FastGettext.text_domain == domain_name
+      Puppet.debug "Deleted current text domain #{domain_name.inspect}: #{!deleted.nil?}"
       FastGettext.text_domain = nil
+    else
+      Puppet.debug "Deleted text domain #{domain_name.inspect}: #{!deleted.nil?}"
     end
   end
 
@@ -145,7 +168,7 @@ module Puppet::GettextConfig
   # Since we are currently (Nov 2017) vendoring semantic_puppet, in normal
   # flows these translations will be copied along with Puppet's.
   #
-  # @param [String] domain_name the name of the domain to add translations to
+  # @param [Symbol] domain_name the name of the domain to add translations to
   def self.copy_default_translations(domain_name)
     return if @gettext_disabled || !gettext_loaded?
 

data/lib/puppet/indirector/catalog/compiler.rb

@@ -49,14 +49,12 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     node = node_from_request(facts, request)
     node.trusted_data = Puppet.lookup(:trusted_information) { Puppet::Context::TrustedInformation.local(node) }.to_h
 
-    node.environment.use_text_domain if node.environment
-
-    if catalog = compile(node, request.options)
-      return catalog
+    if node.environment
+      node.environment.with_text_domain do
+        compile(node, request.options)
+      end
     else
-      # This shouldn't actually happen; we should either return
-      # a config or raise an exception.
-      return nil
+      compile(node, request.options)
     end
   end
 

data/lib/puppet/node/environment.rb

@@ -435,7 +435,7 @@ class Puppet::Node::Environment
 
   # Loads module translations for the current environment once for
   # the lifetime of the environment.
-  def use_text_domain
+  def with_text_domain
     return if Puppet[:disable_i18n]
 
     if @text_domain.nil?
@@ -445,6 +445,10 @@ class Puppet::Node::Environment
     else
       Puppet::GettextConfig.use_text_domain(@text_domain)
     end
+
+    yield
+  ensure
+    Puppet::GettextConfig.clear_text_domain
   end
 
   # Checks if a reparse is required (cache of files is stale).

data/lib/puppet/provider/selmodule/semodule.rb

@@ -22,7 +22,7 @@ Puppet::Type.type(:selmodule).provide(:semodule) do
     self.debug "Checking for module #{@resource[:name]}"
     execpipe("#{command(:semodule)} --list") do |out|
       out.each_line do |line|
-        if line =~ /#{@resource[:name]}\b/
+        if line =~ /^#{@resource[:name]}\b/
           return :true
         end
       end

data/lib/puppet/provider/service/upstart.rb

@@ -16,6 +16,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     Facter.value(:operatingsystem) == 'LinuxMint',
   ]
 
+  confine :exists => "/var/run/upstart-socket-bridge.pid"
+
   defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["10.04", "12.04", "14.04", "14.10"]
 
   commands :start   => "/sbin/start",

data/lib/puppet/reference/configuration.rb

@@ -54,6 +54,12 @@ config.header = <<EOT
 
 * Each of these settings can be specified in `puppet.conf` or on the
   command line.
+* Puppet Enterprise (PE) and open source Puppet share the configuration settings
+  that are documented here. However, PE defaults for some settings differ from
+  the open source Puppet defaults. Some examples of settings that have different
+  PE defaults include `disable18n`, `environment_timeout`, `always_retry_plugins`,
+  and the Puppet Server JRuby `max-active-instances` setting. To verify PE
+  configuration defaults, check the `puppet.conf` file after installation.
 * When using boolean settings on the command line, use `--setting` and
   `--no-setting` instead of `--setting (true|false)`. (Using `--setting false`
   results in "Error: Could not parse application options: needless argument".)

data/lib/puppet/resource/status.rb

@@ -193,6 +193,7 @@ module Puppet
         @changed = data['changed']
         @skipped = data['skipped']
         @failed = data['failed']
+        @failed_to_restart = data['failed_to_restart']
         @corrective_change = data['corrective_change']
         @events = data['events'].map do |event|
           # Older versions contain tags that causes Psych to create instances directly
@@ -213,6 +214,7 @@ module Puppet
           'tags' => @tags.to_a,
           'time' => @time.iso8601(9),
           'failed' => @failed,
+          'failed_to_restart' => self.failed_to_restart?,
           'changed' => @changed,
           'out_of_sync' => @out_of_sync,
           'skipped' => @skipped,

data/lib/puppet/resource/type_collection.rb

@@ -208,7 +208,7 @@ class Puppet::Resource::TypeCollection
       if environment.config_version.nil? || environment.config_version == ""
         @version = Time.now.to_i
       else
-        @version = Puppet::Util::Execution.execute([environment.config_version]).strip
+        @version = Puppet::Util::Execution.execute([environment.config_version]).to_s.strip
       end
     end
 

data/lib/puppet/settings.rb

@@ -452,6 +452,12 @@ class Puppet::Settings
   # Prints the contents of a config file with the available config settings, or it
   # prints a single value of a config setting.
   def print_config_options
+    if Puppet::Util::Log.sendlevel?(:info)
+      Puppet::Util::Log.newdestination(:console)
+      message = (_("Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."))
+      Puppet.deprecation_warning(message)
+    end
+
     env = value(:environment)
     val = value(:configprint)
     if val == "all"

data/lib/puppet/ssl/certificate_request.rb

@@ -262,9 +262,17 @@ DOC
     end
 
     if options[:dns_alt_names]
-      names = options[:dns_alt_names].split(/\s*,\s*/).map(&:strip) + [name]
-      names = names.sort.uniq.map {|name| "DNS:#{name}" }.join(", ")
-      alt_names_ext = extension_factory.create_extension("subjectAltName", names, false)
+      raw_names = options[:dns_alt_names].split(/\s*,\s*/).map(&:strip) + [name]
+
+      parsed_names = raw_names.map do |name|
+        if !name.start_with?("IP:") && !name.start_with?("DNS:")
+          "DNS:#{name}"
+        else
+          name
+        end
+      end.sort.uniq.join(", ")
+
+      alt_names_ext = extension_factory.create_extension("subjectAltName", parsed_names, false)
 
       extensions << alt_names_ext
     end