openvox 7.37.1 → 8.19.0

data/lib/puppet/indirector/report/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/json'
 
@@ -7,7 +9,7 @@ class Puppet::Transaction::Report::Json < Puppet::Indirector::JSON
   desc "Store last report as a flat file, serialized using JSON."
 
   # Force report to be saved there
-  def path(name,ext='.json')
+  def path(name, ext = '.json')
     Puppet[:lastrunreport]
   end
 
@@ -28,7 +30,7 @@ class Puppet::Transaction::Report::Json < Puppet::Indirector::JSON
         fh.print JSON.dump(request.instance)
       end
     rescue TypeError => detail
-      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: self.name, request: request.key, detail: detail }
+      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: name, request: request.key, detail: detail }
     end
   end
 end

data/lib/puppet/indirector/report/msgpack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/msgpack'
 
@@ -5,7 +7,7 @@ class Puppet::Transaction::Report::Msgpack < Puppet::Indirector::Msgpack
   desc "Store last report as a flat file, serialized using MessagePack."
 
   # Force report to be saved there
-  def path(name,ext='.msgpack')
+  def path(name, ext = '.msgpack')
     Puppet[:lastrunreport]
   end
 end

data/lib/puppet/indirector/report/processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/code'
 require_relative '../../../puppet/reports'
@@ -48,6 +50,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
 
   def processors(&blk)
     return [] if Puppet[:reports] == "none"
+
     reports.each do |name|
       mod = Puppet::Reports.report(name)
       if mod

data/lib/puppet/indirector/report/rest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/rest'
 require 'semantic_puppet'
 
@@ -20,19 +22,6 @@ class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST
     raise convert_to_http_error(e.response)
   end
 
-  # This is called by the superclass when not using our httpclient.
-  def handle_response(request, response)
-    if !response.success?
-      server_version = response[Puppet::Network::HEADER_PUPPET_VERSION]
-      if server_version &&
-         SemanticPuppet::Version.parse(server_version).major < Puppet::Indirector::REST::MAJOR_VERSION_JSON_DEFAULT &&
-         Puppet[:preferred_serialization_format] != 'pson'
-        format = Puppet[:preferred_serialization_format]
-        raise Puppet::Error.new(_("Server version %{version} does not accept reports in '%{format}', use `preferred_serialization_format=pson`") % {version: server_version, format: format})
-      end
-    end
-  end
-
   private
 
   def deserialize_save(content_type, body)

data/lib/puppet/indirector/report/yaml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/yaml'
 
@@ -7,7 +9,7 @@ class Puppet::Transaction::Report::Yaml < Puppet::Indirector::Yaml
   desc "Store last report as a flat file, serialized using YAML."
 
   # Force report to be saved there
-  def path(name,ext='.yaml')
+  def path(name, ext = '.yaml')
     Puppet[:lastrunreport]
   end
 
@@ -28,7 +30,7 @@ class Puppet::Transaction::Report::Yaml < Puppet::Indirector::Yaml
         fh.print YAML.dump(request.instance)
       end
     rescue TypeError => detail
-      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: self.name, request: request.key, detail: detail }
+      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: name, request: request.key, detail: detail }
     end
   end
 end

data/lib/puppet/indirector/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cgi'
 require 'uri'
 require_relative '../../puppet/indirector'
@@ -24,7 +26,7 @@ class Puppet::Indirector::Request
   # Is this an authenticated request?
   def authenticated?
     # Double negative, so we just get true or false
-    ! ! authenticated
+    !!authenticated
   end
 
   def environment
@@ -35,11 +37,11 @@ class Puppet::Indirector::Request
 
   def environment=(env)
     @environment =
-    if env.is_a?(Puppet::Node::Environment)
-      env
-    else
-      Puppet.lookup(:environments).get!(env)
-    end
+      if env.is_a?(Puppet::Node::Environment)
+        env
+      else
+        Puppet.lookup(:environments).get!(env)
+      end
   end
 
   # LAK:NOTE This is a messy interface to the cache, and it's only
@@ -66,7 +68,7 @@ class Puppet::Indirector::Request
     self.indirection_name = indirection_name
     self.method = method
 
-    options = options.inject({}) { |hash, ary| hash[ary[0].to_sym] = ary[1]; hash }
+    options = options.each_with_object({}) { |ary, hash| hash[ary[0].to_sym] = ary[1]; }
 
     set_attributes(options)
 
@@ -78,14 +80,14 @@ class Puppet::Indirector::Request
       # info out in the REST class, but it seemed bad design for the REST
       # class to rewrite the key.
 
-      if key.to_s =~ /^\w+:\// and not Puppet::Util.absolute_path?(key.to_s) # it's a URI
+      if key.to_s =~ %r{^\w+:/} and !Puppet::Util.absolute_path?(key.to_s) # it's a URI
         set_uri_key(key)
       else
         @key = key
       end
     end
 
-    @key = @instance.name if ! @key and @instance
+    @key = @instance.name if !@key and @instance
   end
 
   # Look up the indirection based on the name provided.
@@ -100,6 +102,7 @@ class Puppet::Indirector::Request
   def model
     ind = indirection
     raise ArgumentError, _("Could not find indirection '%{indirection}'") % { indirection: indirection_name } unless ind
+
     ind.model
   end
 
@@ -137,11 +140,11 @@ class Puppet::Indirector::Request
   end
 
   def description
-    return(uri ? uri : "/#{indirection_name}/#{key}")
+    uri || "/#{indirection_name}/#{key}"
   end
 
   def remote?
-    self.node or self.ip
+    node or ip
   end
 
   private
@@ -189,6 +192,6 @@ class Puppet::Indirector::Request
       @protocol = uri.scheme
     end
 
-    @key = Puppet::Util.uri_unescape(uri.path.sub(/^\//, ''))
+    @key = Puppet::Util.uri_unescape(uri.path.sub(%r{^/}, ''))
   end
 end

data/lib/puppet/indirector/resource/ral.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/resource/validator'
 
 class Puppet::Resource::Ral < Puppet::Indirector::Code
@@ -9,21 +11,19 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     false
   end
 
-  def find( request )
+  def find(request)
     # find by name
     res   = type(request).instances.find { |o| o.name == resource_name(request) }
-    res ||= type(request).new(:name => resource_name(request), :audit => type(request).properties.collect { |s| s.name })
+    res ||= type(request).new(:name => resource_name(request), :audit => type(request).properties.collect(&:name))
 
     res.to_resource
   end
 
-  def search( request )
+  def search(request)
     conditions = request.options.dup
     conditions[:name] = resource_name(request) if resource_name(request)
 
-    type(request).instances.map do |res|
-      res.to_resource
-    end.find_all do |res|
+    type(request).instances.map(&:to_resource).find_all do |res|
       conditions.all? do |property, value|
         # even though `res` is an instance of Puppet::Resource, calling
         # `res[:name]` on it returns nil, and for some reason it is necessary
@@ -33,7 +33,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     end.sort_by(&:title)
   end
 
-  def save( request )
+  def save(request)
     # In RAL-land, to "save" means to actually try to change machine state
     res = request.instance
     ral_res = res.to_ral
@@ -51,16 +51,16 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
   # File["/etc/hosts"]. To handle, assume the type name does
   # _not_ have any slashes in it, and split only on the first.
 
-  def type_name( request )
+  def type_name(request)
     request.key.split('/', 2)[0]
   end
 
-  def resource_name( request )
+  def resource_name(request)
     name = request.key.split('/', 2)[1]
     name unless name == ""
   end
 
-  def type( request )
+  def type(request)
     Puppet::Type.type(type_name(request)) or raise Puppet::Error, _("Could not find type %{request_type}") % { request_type: type_name(request) }
   end
 end

data/lib/puppet/indirector/resource/store_configs.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/indirector/store_configs'
 require_relative '../../../puppet/indirector/resource/validator'
 
 class Puppet::Resource::StoreConfigs < Puppet::Indirector::StoreConfigs
   include Puppet::Resource::Validator
 
-  desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
+  desc 'Part of the "storeconfigs" feature. Should not be directly set by end users.'
 
   def allow_remote_requests?
     false

data/lib/puppet/indirector/resource/validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::Resource::Validator
   def validate_key(request)
     type, title = request.key.split('/', 2)

data/lib/puppet/indirector/rest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def find(request)
@@ -48,7 +50,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   # body, decompressed if necessary
   def parse_response(response)
     if response['content-type']
-      [ response['content-type'].gsub(/\s*;.*$/,''), response.body ]
+      [response['content-type'].gsub(/\s*;.*$/, ''), response.body]
     else
       raise _("No content type in http response; cannot parse")
     end

data/lib/puppet/indirector/store_configs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::Indirector::StoreConfigs < Puppet::Indirector::Terminus
   def initialize
     super

data/lib/puppet/indirector/terminus.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/indirector/errors'
 require_relative '../../puppet/indirector/indirection'
@@ -22,7 +24,7 @@ class Puppet::Indirector::Terminus
 
     # Convert a constant to a short name.
     def const2name(const)
-      const.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
+      const.sub(/^[A-Z]/, &:downcase).gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
     end
 
     # Look up the indirection if we were only provided a name.
@@ -51,10 +53,11 @@ class Puppet::Indirector::Terminus
       if longname =~ /#<Class/
         raise Puppet::DevError, _("Terminus subclasses must have associated constants")
       end
+
       names = longname.split("::")
 
       # Convert everything to a lower-case symbol, converting camelcase to underscore word separation.
-      name = names.pop.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
+      name = names.pop.sub(/^[A-Z]/, &:downcase).gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
 
       subclass.name = name
 
@@ -71,7 +74,8 @@ class Puppet::Indirector::Terminus
 
       # This subclass is specifically associated with an indirection.
       raise("Invalid name #{longname}") unless names.length > 0
-      processed_name = names.pop.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }
+
+      processed_name = names.pop.sub(/^[A-Z]/, &:downcase).gsub(/[A-Z]/) { |i| "_#{i.downcase}" }
 
       if processed_name.empty?
         raise Puppet::DevError, _("Could not discern indirection model from class constant")
@@ -97,7 +101,7 @@ class Puppet::Indirector::Terminus
 
     # Convert a short name to a constant.
     def name2const(name)
-      name.to_s.capitalize.sub(/_(.)/) { |i| $1.upcase }
+      name.to_s.capitalize.sub(/_(.)/) { |_i| ::Regexp.last_match(1).upcase }
     end
 
     # Register a class, probably autoloaded.

data/lib/puppet/indirector/yaml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util/yaml'
 
@@ -9,7 +11,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     return nil unless Puppet::FileSystem.exist?(file)
 
     begin
-      return load_file(file)
+      load_file(file)
     rescue Puppet::Util::Yaml::YamlLoadError => detail
       raise Puppet::Error, _("Could not parse YAML data for %{indirection} %{request}: %{detail}") % { indirection: indirection.name, request: request.key, detail: detail }, detail.backtrace
     end
@@ -17,7 +19,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
 
   # Convert our object to YAML and store it to the disk.
   def save(request)
-    raise ArgumentError.new(_("You can only save objects that respond to :name")) unless request.instance.respond_to?(:name)
+    raise ArgumentError, _("You can only save objects that respond to :name") unless request.instance.respond_to?(:name)
 
     file = path(request.key)
 
@@ -29,12 +31,12 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     begin
       Puppet::Util::Yaml.dump(request.instance, file)
     rescue TypeError => detail
-      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: self.name, request: request.key, detail: detail }
+      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: name, request: request.key, detail: detail }
     end
   end
 
   # Return the path to a given node's file.
-  def path(name,ext='.yaml')
+  def path(name, ext = '.yaml')
     if name =~ Puppet::Indirector::BadNameRegexp then
       Puppet.crit(_("directory traversal detected in %{indirection}: %{name}") % { indirection: self.class, name: name.inspect })
       raise ArgumentError, _("invalid key")
@@ -50,7 +52,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
   end
 
   def search(request)
-    Dir.glob(path(request.key,'')).collect do |file|
+    Dir.glob(path(request.key, '')).collect do |file|
       load_file(file)
     end
   end

data/lib/puppet/indirector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Manage indirections to termini.  They are organized in terms of indirections -
 # - e.g., configuration, node, file, certificate -- and each indirection has one
 # or more terminus types defined.  The indirection is configured via the
@@ -36,6 +38,7 @@ module Puppet::Indirector
   # to override it.
   def indirects(indirection, options = {})
     raise(ArgumentError, _("Already handling indirection for %{current}; cannot also handle %{next}") % { current: @indirection.name, next: indirection }) if @indirection
+
     # populate this class with the various new methods
     extend ClassMethods
     include Puppet::Indirector::Envelope

data/lib/puppet/info_service/class_information_service.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/pops/evaluator/json_strict_literal_evaluator'
 
 class Puppet::InfoService::ClassInformationService
-
   def initialize
     @file_to_result = {}
     @parser = Puppet::Pops::Parser::EvaluatingParser.new()
@@ -44,7 +45,7 @@ class Puppet::InfoService::ClassInformationService
   end
 
   def result_of(f)
-    entry =  @file_to_result[f]
+    entry = @file_to_result[f]
     if entry.nil?
       @file_to_result[f] = entry = parse_file(f)
     end
@@ -52,28 +53,27 @@ class Puppet::InfoService::ClassInformationService
   end
 
   def parse_file(f)
-    return {:error => _("The file %{f} does not exist") % { f: f }} unless Puppet::FileSystem.exist?(f)
+    return { :error => _("The file %{f} does not exist") % { f: f } } unless Puppet::FileSystem.exist?(f)
 
     begin
       parse_result = @parser.parse_file(f)
-      {:classes =>
-        parse_result.definitions.select {|d| d.is_a?(Puppet::Pops::Model::HostClassDefinition)}.map do |d|
-          {:name   => d.name,
-           :params => d.parameters.map {|p| extract_param(p) }
-          }
-        end
-      }
+      { :classes =>
+        parse_result.definitions.select { |d| d.is_a?(Puppet::Pops::Model::HostClassDefinition) }.map do |d|
+          { :name => d.name,
+            :params => d.parameters.map { |p| extract_param(p) } }
+        end }
     rescue StandardError => e
-      {:error => e.message }
+      { :error => e.message }
     end
   end
 
   def extract_param(p)
-    extract_default(extract_type({:name => p.name}, p), p)
+    extract_default(extract_type({ :name => p.name }, p), p)
   end
 
   def extract_type(structure, p)
     return structure if p.type_expr.nil?
+
     structure[:type] = typeexpr_to_string(p.name, p.type_expr)
     structure
   end
@@ -81,6 +81,7 @@ class Puppet::InfoService::ClassInformationService
   def extract_default(structure, p)
     value_expr = p.value
     return structure if value_expr.nil?
+
     default_value = value_as_literal(value_expr)
     structure[:default_literal] = default_value unless default_value.nil?
     structure[:default_source] = extract_value_source(value_expr)
@@ -88,11 +89,9 @@ class Puppet::InfoService::ClassInformationService
   end
 
   def typeexpr_to_string(name, type_expr)
-    begin
-      type_parser.interpret_any(type_expr, nil).to_s
-    rescue Puppet::ParseError => e
-      raise Puppet::Error, "The parameter '$#{name}' is invalid: #{e.message}", e.backtrace
-    end
+    type_parser.interpret_any(type_expr, nil).to_s
+  rescue Puppet::ParseError => e
+    raise Puppet::Error, "The parameter '$#{name}' is invalid: #{e.message}", e.backtrace
   end
 
   def value_as_literal(value_expr)

data/lib/puppet/info_service/plan_information_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::InfoService::PlanInformationService
   require_relative '../../puppet/module'
 
@@ -6,7 +8,7 @@ class Puppet::InfoService::PlanInformationService
     env = Puppet.lookup(:environments).get!(environment_name)
     env.modules.map do |mod|
       mod.plans.map do |plan|
-        {:module => {:name => plan.module.name}, :name => plan.name}
+        { :module => { :name => plan.module.name }, :name => plan.name }
       end
     end.flatten
   end
@@ -18,7 +20,7 @@ class Puppet::InfoService::PlanInformationService
     pup_module = Puppet::Module.find(module_name, environment_name)
     if pup_module.nil?
       raise Puppet::Module::MissingModule, _("Module %{module_name} not found in environment %{environment_name}.") %
-                                            {module_name: module_name, environment_name: environment_name}
+                                           { module_name: module_name, environment_name: environment_name }
     end
 
     plan = pup_module.plans.find { |t| t.name == plan_name }
@@ -28,7 +30,7 @@ class Puppet::InfoService::PlanInformationService
 
     begin
       plan.validate
-      {:metadata => plan.metadata, :files => plan.files}
+      { :metadata => plan.metadata, :files => plan.files }
     rescue Puppet::Module::Plan::Error => err
       { :metadata => nil, :files => [], :error => err.to_h }
     end

data/lib/puppet/info_service/task_information_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::InfoService::TaskInformationService
   require_relative '../../puppet/module'
 
@@ -8,13 +10,12 @@ class Puppet::InfoService::TaskInformationService
     env.modules.map do |mod|
       mod.tasks.map do |task|
         # If any task is malformed continue to list other tasks in module
-        begin
-          task.validate
-          {:module => {:name => task.module.name}, :name => task.name, :metadata => task.metadata}
-        rescue Puppet::Module::Task::Error => err
-          Puppet.log_exception(err, 'Failed to validate task')
-          nil
-        end
+
+        task.validate
+        { :module => { :name => task.module.name }, :name => task.name, :metadata => task.metadata }
+      rescue Puppet::Module::Task::Error => err
+        Puppet.log_exception(err)
+        nil
       end
     end.flatten.compact
   end
@@ -26,7 +27,7 @@ class Puppet::InfoService::TaskInformationService
     pup_module = Puppet::Module.find(module_name, environment_name)
     if pup_module.nil?
       raise Puppet::Module::MissingModule, _("Module %{module_name} not found in environment %{environment_name}.") %
-                                            {module_name: module_name, environment_name: environment_name}
+                                           { module_name: module_name, environment_name: environment_name }
     end
 
     task = pup_module.tasks.find { |t| t.name == task_name }
@@ -36,7 +37,7 @@ class Puppet::InfoService::TaskInformationService
 
     begin
       task.validate
-      {:metadata => task.metadata, :files => task.files}
+      { :metadata => task.metadata, :files => task.files }
     rescue Puppet::Module::Task::Error => err
       { :metadata => nil, :files => [], :error => err.to_h }
     end

data/lib/puppet/info_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Puppet::InfoService
   require_relative 'info_service/class_information_service'