puppet 6.6.0 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25cdda3cd645130128e5edab7617970fe15a3c89c99524e57bcddf8327158ec5
-  data.tar.gz: 1d7890b03b68677b5ad1756cb8265d6684888e4420d0103fd9a5b13e4e479264
+  metadata.gz: 6739b00b930cc1e7e8f361e958769b3c3f02ab6ee88e96bdf018a98b847cfb09
+  data.tar.gz: 5b7812551d0fb9dcfc0c2793b5cb3ef36997efde0c878567b09f520808e41bd2
 SHA512:
-  metadata.gz: fca7ac8a9c7a69ab904f1537d93b43596cd6cf1002ca4497e385eef749a20f172df43e4e6e14abf75649e9315c28822f0de2e4261c74a218119e8f744c9bc00c
-  data.tar.gz: 8e0fc73cc45eb035cd1e5fe555301a8f015074812ae1b59eee2dda61a099d4529dfb257dcc185681c341bcb96b508da4aeec39660b8984da312de48cc173ea67
+  metadata.gz: 526dcbc10b75e92ca4028824567e2e83bb2c80938be0796e6574b0cb5efffb8dc1ad235763aa41e75946315c218aafd771d388e5cadeaaffae51cb338325eb6f
+  data.tar.gz: c800fbda4bfae645c209742ff25ed10ef07368da5920b241c81f6c6bcd54e4b113e32c08aa52be4a717b22da77cd6ab6e0ffeef5d5620abd9f83426d69bb6d3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.6.0)
+    puppet (6.7.0)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1)
@@ -23,7 +23,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    facter (2.5.1)
+    facter (2.5.5)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
@@ -32,7 +32,7 @@ GEM
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2)
       locale
-    hashdiff (0.4.0)
+    hashdiff (1.0.0)
     hiera (3.5.0)
     hiera-eyaml (3.0.0)
       highline (~> 1.6.19)
@@ -44,14 +44,14 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     locale (2.1.2)
-    memory_profiler (0.9.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     minitar (0.8)
     msgpack (1.3.0)
     multi_json (1.13.1)
     mustache (1.1.0)
     optimist (3.0.0)
-    packaging (0.99.35)
+    packaging (0.99.36)
       artifactory (~> 2)
       rake (~> 12.3)
     parallel (1.17.0)
@@ -64,7 +64,7 @@ GEM
     public_suffix (3.1.1)
     puppet-resource_api (1.8.4)
       hocon (>= 1.0)
-    puppetserver-ca (1.3.1)
+    puppetserver-ca (1.3.2)
       facter (>= 2.0.1, < 4)
     racc (1.4.9)
     rainbow (2.2.2)
@@ -82,7 +82,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-collection_matchers (1.1.3)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -114,7 +114,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.19)
+    yard (0.9.20)
 
 PLATFORMS
   ruby

data/ext/solaris/smf/puppet.xml

@@ -28,6 +28,8 @@
 
     <exec_method type="method" name="stop" exec="/lib/svc/method/puppet stop" timeout_seconds="60"/>
 
+    <exec_method type="method" name="refresh" exec=":kill" timeout_seconds="60"/>
+
   <stability value="Evolving"/>
 
     <template>

data/ext/yaml_nodes.rb

@@ -74,7 +74,7 @@ info = read_node(node)
 
 # Iterate over any provided parents, merging in there information.
 parents_seen = []
-while parent = info["parent"]
+while parent = info["parent"] #rubocop:disable Lint/AssignmentInCondition
   raise "Found inheritance loop with parent #{parent}" if parents_seen.include?(parent)
 
   parents_seen << parent
@@ -84,21 +84,21 @@ while parent = info["parent"]
   parent_info = read_node(parent)
 
   # Include any parent classes in our list.
-  if pclasses = parent_info["classes"]
-    info["classes"] += pclasses
+  if parent_info["classes"]
+    info["classes"] += parent_info["classes"]
     info["classes"].uniq!
   end
 
   # And inherit parameters from our parent, while preferring our own values.
-  if pparams = parent_info["parameters"]
+  if parent_info["parameters"]
     # When using Hash#merge, the hash being merged in wins, and we
     # want the subnode parameters to be the parent node parameters.
-    info["parameters"] = pparams.merge(info["parameters"])
+    info["parameters"] = parent_info["parameters"].merge(info["parameters"])
   end
 
   # Copy over any parent node name.
-  if pparent = parent_info["parent"]
-    info["parent"] = pparent
+  if parent_info["parent"]
+    info["parent"] = parent_info["parent"]
   end
 end
 

data/lib/hiera_puppet.rb

@@ -58,7 +58,8 @@ module HieraPuppet
   def hiera_config
     config = {}
 
-    if config_file = hiera_config_file
+    config_file = hiera_config_file
+    if config_file
       config = Hiera::Config.load(config_file)
     end
 

data/lib/puppet/application/apply.rb

@@ -349,9 +349,8 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     facts = nil
     unless Puppet[:node_name_fact].empty?
       # Collect our facts.
-      unless facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
-        raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] }
-      end
+      facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
+      raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] } unless facts
 
       Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
       facts.name = Puppet[:node_name_value]

data/lib/puppet/application/doc.rb

@@ -156,7 +156,8 @@ HELP
     exit_code = 0
     require 'puppet/util/reference'
     options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-      raise _("Could not find reference %{name}") % { name: name } unless section = Puppet::Util::Reference.reference(name)
+      section = Puppet::Util::Reference.reference(name)
+      raise _("Could not find reference %{name}") % { name: name } unless section
 
       begin
         # Add the per-section text, but with no ToC

data/lib/puppet/application/face_base.rb

@@ -74,32 +74,38 @@ class Puppet::Application::FaceBase < Puppet::Application
     index       = -1
     until action_name or (index += 1) >= command_line.args.length do
       item = command_line.args[index]
-      if item =~ /^-/ then
+      if item =~ /^-/
         option = @face.options.find do |name|
           item =~ /^-+#{name.to_s.gsub(/[-_]/, '[-_]')}(?:[ =].*)?$/
         end
-        if option then
+        if option
           option = @face.get_option(option)
           # If we have an inline argument, just carry on.  We don't need to
           # care about optional vs mandatory in that case because we do a real
           # parse later, and that will totally take care of raising the error
           # when we get there. --daniel 2011-04-04
-          if option.takes_argument? and !item.index('=') then
+          if option.takes_argument? and !item.index('=')
             index += 1 unless
               (option.optional_argument? and command_line.args[index + 1] =~ /^-/)
           end
-        elsif option = find_global_settings_argument(item) then
-          unless Puppet.settings.boolean? option.name then
-            # As far as I can tell, we treat non-bool options as always having
-            # a mandatory argument. --daniel 2011-04-05
-            # ... But, the mandatory argument will not be the next item if an = is
-            # employed in the long form of the option. --jeffmccune 2012-09-18
-            index += 1 unless item =~ /^--#{option.name}=/
-          end
-        elsif option = find_application_argument(item) then
-          index += 1 if (option[:argument] and not option[:optional])
         else
-          raise OptionParser::InvalidOption.new(item.sub(/=.*$/, ''))
+          option = find_global_settings_argument(item)
+          if option
+            unless Puppet.settings.boolean? option.name
+              # As far as I can tell, we treat non-bool options as always having
+              # a mandatory argument. --daniel 2011-04-05
+              # ... But, the mandatory argument will not be the next item if an = is
+              # employed in the long form of the option. --jeffmccune 2012-09-18
+              index += 1 unless item =~ /^--#{option.name}=/
+            end
+          else 
+            option = find_application_argument(item)
+            if option
+              index += 1 if (option[:argument] and not option[:optional])
+            else
+              raise OptionParser::InvalidOption.new(item.sub(/=.*$/, ''))
+            end
+          end
         end
       else
         # Stash away the requested action name for later, and try to fetch the
@@ -112,7 +118,8 @@ class Puppet::Application::FaceBase < Puppet::Application
     end
 
     if @action.nil?
-      if @action = @face.get_default_action() then
+      @action = @face.get_default_action()
+      if @action
         @is_default_action = true
       else
         # First try to handle global command line options

data/lib/puppet/application/script.rb

@@ -140,18 +140,16 @@ Copyright (c) 2017 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     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
+      facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
+      raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] } unless facts
 
       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
+    node = Puppet::Node.indirection.find(Puppet[:node_name_value])
+    raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] } unless node
 
     configured_environment = node.environment || Puppet.lookup(:current_environment)
 

data/lib/puppet/configurer.rb

@@ -67,7 +67,8 @@ class Puppet::Configurer
   # Get the remote catalog, yo.  Returns nil if no catalog can be found.
   def retrieve_catalog(query_options)
     query_options ||= {}
-    if (Puppet[:use_cached_catalog] && result = retrieve_catalog_from_cache(query_options))
+    result = retrieve_catalog_from_cache(query_options) if Puppet[:use_cached_catalog]
+    if result
       @cached_catalog_status = 'explicitly_requested'
 
       Puppet.info _("Using cached catalog from environment '%{environment}'") % { environment: result.environment }
@@ -104,7 +105,8 @@ class Puppet::Configurer
 
     catalog_conversion_time = thinmark do
       # Will mutate the result and replace all Deferred values with resolved values
-      if facts = options[:convert_with_facts]
+      facts = options[:convert_with_facts]
+      if facts
         Puppet::Pops::Evaluator::DeferredResolver.resolve_and_replace(facts, result)
       end
 
@@ -257,7 +259,8 @@ class Puppet::Configurer
       Puppet::GettextConfig.reset_text_domain('agent')
       Puppet::ModuleTranslations.load_from_vardir(Puppet[:vardir])
 
-      if catalog = prepare_and_retrieve_catalog_from_cache(options)
+      catalog = prepare_and_retrieve_catalog_from_cache(options)
+      if catalog
         options[:catalog] = catalog
         @cached_catalog_status = 'explicitly_requested'
 
@@ -339,7 +342,8 @@ class Puppet::Configurer
       query_options[:configured_environment] = configured_environment
       options[:convert_for_node] = node
 
-      unless catalog = prepare_and_retrieve_catalog(options, query_options)
+      catalog = prepare_and_retrieve_catalog(options, query_options)
+      unless catalog
         return nil
       end
 
@@ -364,7 +368,8 @@ class Puppet::Configurer
         query_options = get_facts(options)
         query_options[:configured_environment] = configured_environment
 
-        return nil unless catalog = prepare_and_retrieve_catalog(options, query_options)
+        catalog = prepare_and_retrieve_catalog(options, query_options)
+        return nil unless catalog
         tries += 1
       end
 

data/lib/puppet/confine_collection.rb

@@ -11,7 +11,8 @@ class Puppet::ConfineCollection
       for_binary = false
     end
     hash.each do |test, values|
-      if klass = Puppet::Confine.test(test)
+      klass = Puppet::Confine.test(test)
+      if klass
         @confines << klass.new(values)
         @confines[-1].for_binary = true if for_binary
       else

data/lib/puppet/daemon.rb

@@ -38,7 +38,8 @@ class Puppet::Daemon
 
   # Put the daemon into the background.
   def daemonize
-    if pid = fork
+    pid = fork
+    if pid
       Process.detach(pid)
       exit(0)
     end
@@ -181,7 +182,7 @@ class Puppet::Daemon
     end
 
     signal_loop = Puppet::Scheduler.create_job(SIGNAL_CHECK_INTERVAL) do
-      while method = @signals.shift
+      while method = @signals.shift #rubocop:disable Lint/AssignmentInCondition
         Puppet.notice "Processing #{method}"
         send(method)
       end

data/lib/puppet/defaults.rb

@@ -913,6 +913,14 @@ EOT
       :group => "service",
       :desc => "Where each client stores the CA certificate."
     },
+    :ca_fingerprint => {
+      :default => nil,
+      :type   => :string,
+      :desc => "The expected fingerprint of the CA certificate. If specified, the agent
+        will compare the CA certificate fingerprint that it downloads against this value
+        and reject the CA certificate if the values do not match. This only applies
+        during the first download of the CA certificate."
+    },
     :ssl_client_ca_auth => {
       :type  => :file,
       :mode  => "0644",

data/lib/puppet/environments.rb

@@ -141,17 +141,16 @@ module Puppet::Environments
   class StaticDirectory < Static
     # Accepts a single environment in the given directory having the given name (not required to be reflected as the name
     # of the directory)
-    # 
     def initialize(env_name, env_dir, environment)
       super(environment)
       @env_dir = env_dir
-      @env_name = env_name
+      @env_name = env_name.intern
     end
 
     # @!macro loader_get_conf
     def get_conf(name)
-      return nil unless name == @env_name
-      Puppet::Settings::EnvironmentConf.load_from(@env_dir, '')
+      return nil unless name.intern == @env_name
+      Puppet::Settings::EnvironmentConf.load_from(@env_dir, [])
     end
   end
 
@@ -268,7 +267,8 @@ module Puppet::Environments
     # @!macro loader_get
     def get(name)
       @loaders.each do |loader|
-        if env = loader.get(name)
+        env = loader.get(name)
+        if env 
           return env
         end
       end
@@ -278,7 +278,8 @@ module Puppet::Environments
     # @!macro loader_get_conf
     def get_conf(name)
       @loaders.each do |loader|
-        if conf = loader.get_conf(name)
+        conf = loader.get_conf(name)
+        if conf
           return conf
         end
       end
@@ -349,7 +350,8 @@ module Puppet::Environments
       # This strategy favors smaller memory footprint over environment
       # retrieval time.
       clear_all_expired
-      if result = @cache[name]
+      result = @cache[name]
+      if result
         # found in cache
         return result.value
       elsif (result = @loader.get(name))

data/lib/puppet/etc.rb

@@ -115,7 +115,7 @@ module Puppet::Etc
 
       setgrent
       begin
-        while cur_group = getgrent
+        while cur_group = getgrent #rubocop:disable Lint/AssignmentInCondition
           yield cur_group
         end
       ensure

data/lib/puppet/external/pson/pure/parser.rb

@@ -180,7 +180,8 @@ module PSON
         if scan(STRING)
           return '' if self[1].empty?
           string = self[1].gsub(%r{(?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff])}n) do |c|
-            if u = UNESCAPE_MAP[$MATCH[1]]
+            u = UNESCAPE_MAP[$MATCH[1]]
+            if u
               u
             else # \uXXXX
               bytes = ''

data/lib/puppet/face/epp.rb

@@ -402,7 +402,8 @@ Puppet::Face.define(:epp, '0.0.1') do
 
   def get_values(compiler, options)
     template_values = nil
-    if values_file = options[:values_file]
+    values_file = options[:values_file]
+    if values_file
       begin
         if values_file =~ /\.yaml$/
           template_values = Puppet::Util::Yaml.safe_load_file(values_file, [Symbol])
@@ -420,7 +421,8 @@ Puppet::Face.define(:epp, '0.0.1') do
       end
     end
 
-    if values = options[:values]
+    values = options[:values]
+    if values
       evaluating_parser = Puppet::Pops::Parser::EvaluatingParser.new
       result = evaluating_parser.evaluate_string(compiler.topscope, values, 'values-hash')
       case result

data/lib/puppet/face/help.rb

@@ -182,8 +182,9 @@ Puppet::Face.define(:help, '0.0.1') do
     # depends on the implementation coincidence of how our pages are
     # formatted.  If we can't match the pattern we expect we return the empty
     # string to ensure we don't blow up in the summary. --daniel 2011-04-11
-    while line = help.shift do
-      if md = /^puppet-#{appname}\([^\)]+\) -- (.*)$/.match(line)
+    while line = help.shift do #rubocop:disable Lint/AssignmentInCondition
+      md = /^puppet-#{appname}\([^\)]+\) -- (.*)$/.match(line)
+      if md
         return md[1]
       end
     end