puppet 7.26.0-x86-mingw32 → 8.0.1-x86-mingw32

data/lib/puppet/http/client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The HTTP client provides methods for making `GET`, `POST`, etc requests to
 # HTTP(S) servers. It also provides methods for resolving Puppetserver REST
 # service endpoints using SRV records and settings (such as `server_list`,
@@ -367,7 +368,6 @@ class Puppet::HTTP::Client
         apply_auth(request, basic_auth) if redirects.zero?
 
         # don't call return within the `request` block
-        close_and_sleep = nil
         http.request(request) do |nethttp|
           response = Puppet::HTTP::ResponseNetHTTP.new(request.uri, nethttp)
           begin
@@ -381,14 +381,12 @@ class Puppet::HTTP::Client
               interval = @retry_after_handler.retry_after_interval(request, response, retries)
               retries += 1
               if interval
-                close_and_sleep = proc do
-                  if http.started?
-                    Puppet.debug("Closing connection for #{Puppet::HTTP::Site.from_uri(request.uri)}")
-                    http.finish
-                  end
-                  Puppet.warning(_("Sleeping for %{interval} seconds before retrying the request") % { interval: interval })
-                  ::Kernel.sleep(interval)
+                if http.started?
+                  Puppet.debug("Closing connection for #{Puppet::HTTP::Site.from_uri(request.uri)}")
+                  http.finish
                 end
+                Puppet.warning(_("Sleeping for %{interval} seconds before retrying the request") % { interval: interval })
+                ::Kernel.sleep(interval)
                 next
               end
             end
@@ -407,10 +405,6 @@ class Puppet::HTTP::Client
 
           done = true
         end
-      ensure
-        # If a server responded with a retry, make sure the connection is closed and then
-        # sleep the specified time.
-        close_and_sleep.call if close_and_sleep
       end
     end
 

data/lib/puppet/http/dns.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'resolv'
 
 module Puppet::HTTP

data/lib/puppet/http/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::HTTP
   # A base class for puppet http errors
   # @api public

data/lib/puppet/http/external_client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Adapts an external http_client_class to the HTTP client API. The former
 # is typically registered by puppetserver and only implements a subset of
 # the Puppet::Network::HTTP::Connection methods. As a result, only the

data/lib/puppet/http/factory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/ssl/openssl_loader'
 require 'net/http'
 require_relative '../../puppet/http'

data/lib/puppet/http/pool.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A pool for persistent `Net::HTTP` connections. Connections are
 # stored in the pool indexed by their {Site}.
 # Connections are borrowed from the pool, yielded to the caller, and

data/lib/puppet/http/pool_entry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # An entry in the peristent HTTP pool that references the connection and
 # an expiration time for the connection.
 #

data/lib/puppet/http/proxy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'uri'
 require_relative '../../puppet/ssl/openssl_loader'
 

data/lib/puppet/http/redirector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Handle HTTP redirects
 #
 # @api private

data/lib/puppet/http/resolver/server_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Use the server_list setting to resolve a service. This resolver is only used
 # if server_list is set either on the command line or in the configuration file.
 #

data/lib/puppet/http/resolver/settings.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Resolve a service using settings. This is the default resolver if none of the
 # other resolvers find a functional connection.
 #

data/lib/puppet/http/resolver/srv.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Resolve a service using DNS SRV records.
 #
 # @api public

data/lib/puppet/http/resolver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Resolver base class. Each resolver represents a different strategy for
 # resolving a service name into a list of candidate servers and ports.
 #

data/lib/puppet/http/response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Represents the response returned from the server from an HTTP request.
 #
 # @api abstract

data/lib/puppet/http/response_converter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::HTTP::ResponseConverter
   module_function
 

data/lib/puppet/http/response_net_http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Adapts Net::HTTPResponse to Puppet::HTTP::Response
 #
 # @api public

data/lib/puppet/http/retry_after_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'date'
 require 'time'
 

data/lib/puppet/http/service/ca.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The CA service is used to handle certificate related REST requests.
 #
 # @api public
@@ -6,7 +7,7 @@ class Puppet::HTTP::Service::Ca < Puppet::HTTP::Service
   HEADERS = { 'Accept' => 'text/plain' }.freeze
 
   # @return [String] default API for the ca service
-  API = '/puppet-ca/v1'.freeze
+  API = '/puppet-ca/v1'
 
   # Use `Puppet::HTTP::Session.route_to(:ca)` to create or get an instance of this class.
   #

data/lib/puppet/http/service/compiler.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # The Compiler service is used to submit and retrieve data from the
 # puppetserver.
 #
 # @api public
 class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   # @return [String] Default API for the Compiler service
-  API = '/puppet/v3'.freeze
+  API = '/puppet/v3'
 
   # Use `Puppet::HTTP::Session.route_to(:puppet)` to create or get an instance of this class.
   #

data/lib/puppet/http/service/file_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/metadata'
 
 # The FileServer service is used to retrieve file metadata and content.
@@ -6,7 +7,7 @@ require_relative '../../../puppet/file_serving/metadata'
 #
 class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   # @return [String] Default API for the FileServer service
-  API = '/puppet/v3'.freeze
+  API = '/puppet/v3'
 
   # @return [RegEx] RegEx used to determine if a path contains a leading slash
   PATH_REGEX = /^\//

data/lib/puppet/http/service/puppetserver.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The puppetserver service.
 #
 # @api public

data/lib/puppet/http/service/report.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # The Report service is used to submit run reports to the report server.
 #
 # @api public
@@ -5,7 +6,7 @@
 class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
 
   # @return [String] Default API for the report service
-  API = '/puppet/v3'.freeze
+  API = '/puppet/v3'
 
   # Use `Puppet::HTTP::Session.route_to(:report)` to create or get an instance of this class.
   #
@@ -54,9 +55,6 @@ class Puppet::HTTP::Service::Report < Puppet::HTTP::Service
 
     if response.success?
       response
-    elsif !@session.supports?(:report, 'json') && Puppet[:preferred_serialization_format] != 'pson'
-      #TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
-      raise Puppet::HTTP::ProtocolError.new(_("To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson") % { server_version: response[Puppet::HTTP::HEADER_PUPPET_VERSION]})
     else
       raise Puppet::HTTP::ResponseError.new(response)
     end

data/lib/puppet/http/service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Represents an abstract Puppet web service.
 #
 # @abstract Subclass and implement methods for the service's REST APIs.

data/lib/puppet/http/session.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 # The session is the mechanism by which services may be connected to and accessed.
 #
 # @api public
 class Puppet::HTTP::Session
   # capabilities for a site
-  CAP_LOCALES = 'locales'.freeze
-  CAP_JSON = 'json'.freeze
+  CAP_LOCALES = 'locales'
+  CAP_JSON = 'json'
 
   # puppet version where locales mount was added
   SUPPORTED_LOCALES_MOUNT_AGENT_VERSION = Gem::Version.new("5.3.4")

data/lib/puppet/http/site.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Represents a site to which HTTP connections are made. It is a value
 # object, and is suitable for use in a hash. If two sites are equal,
 # then a persistent connection made to the first site, can be re-used

data/lib/puppet/http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   # Contains an HTTP client for making network requests to puppet and other
   # HTTP servers.
@@ -7,8 +8,8 @@ module Puppet
   # @see Puppet::HTTP::Response
   # @api public
   module HTTP
-    ACCEPT_ENCODING = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3".freeze
-    HEADER_PUPPET_VERSION = "X-Puppet-Version".freeze
+    ACCEPT_ENCODING = "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
+    HEADER_PUPPET_VERSION = "X-Puppet-Version"
 
     require_relative 'http/errors'
     require_relative 'http/site'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/environments'
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/resource/catalog'
@@ -429,9 +430,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     @server_facts["serverversion"] = Puppet.version.to_s
 
     # And then add the server name and IP
-    {"servername" => "fqdn",
-      "serverip"  => "ipaddress",
-      "serverip6" => "ipaddress6"
+    {"servername" => "networking.fqdn",
+      "serverip"  => "networking.ip",
+      "serverip6" => "networking.ip6"
     }.each do |var, fact|
       value = Puppet.runtime[:facter].value(fact)
       if !value.nil?
@@ -440,10 +441,10 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     end
 
     if @server_facts["servername"].nil?
-      host = Puppet.runtime[:facter].value(:hostname)
+      host = Puppet.runtime[:facter].value('networking.hostname')
       if host.nil?
         Puppet.warning _("Could not retrieve fact servername")
-      elsif domain = Puppet.runtime[:facter].value(:domain) #rubocop:disable Lint/AssignmentInCondition
+      elsif domain = Puppet.runtime[:facter].value('networking.domain') #rubocop:disable Lint/AssignmentInCondition 
         @server_facts["servername"] = [host, domain].join(".")
       else
         @server_facts["servername"] = host

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/json'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/msgpack'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/rest'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/store_configs'
 require_relative '../../../puppet/resource/catalog'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/resource/catalog'
 require_relative '../../../puppet/indirector/yaml'
 

data/lib/puppet/indirector/code.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 
 # Do nothing, requiring that the back-end terminus do all

data/lib/puppet/indirector/data_binding/hiera.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/hiera'
 require 'hiera/scope'
 

data/lib/puppet/indirector/data_binding/none.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/none'
 
 class Puppet::DataBinding::None < Puppet::Indirector::None

data/lib/puppet/indirector/direct_file_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/file_serving/terminus_helper'
 require_relative '../../puppet/indirector/terminus'
 

data/lib/puppet/indirector/envelope.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector'
 
 # Provide any attributes or functionality needed for indirected

data/lib/puppet/indirector/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/error'
 
 module Puppet::Indirector

data/lib/puppet/indirector/exec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 

data/lib/puppet/indirector/face.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/face'
 
 class Puppet::Indirector::Face < Puppet::Face
@@ -54,20 +55,10 @@ class Puppet::Indirector::Face < Puppet::Face
     return result
   end
 
-  option "--extra " + _("HASH") do
-    summary _("Extra arguments to pass to the indirection request")
-    description <<-EOT
-      A terminus can take additional arguments to refine the operation, which
-      are passed as an arbitrary hash to the back-end.  Anything passed as
-      the extra value is just send direct to the back-end.
-    EOT
-    default_to do Hash.new end
-  end
-
   action :destroy do
     summary _("Delete an object.")
     arguments _("<key>")
-    when_invoked {|key, options| call_indirection_method :destroy, key, options[:extra] }
+    when_invoked {|key, options| call_indirection_method :destroy, key, {} }
   end
 
   action :find do
@@ -77,11 +68,10 @@ class Puppet::Indirector::Face < Puppet::Face
       # Default the key to Puppet[:certname] if none is supplied
       if args.length == 1
         key = Puppet[:certname]
-        options = args.last
       else
-        key, options = *args
+        key = args.first
       end
-      call_indirection_method :find, key, options[:extra]
+      call_indirection_method :find, key, {}
     end
   end
 
@@ -93,13 +83,13 @@ class Puppet::Indirector::Face < Puppet::Face
       currently accept data from STDIN, save actions cannot currently be invoked
       from the command line.
     EOT
-    when_invoked {|key, options| call_indirection_method :save, key, options[:extra] }
+    when_invoked {|key, options| call_indirection_method :save, key, {} }
   end
 
   action :search do
     summary _("Search for an object or retrieve multiple objects.")
     arguments _("<query>")
-    when_invoked {|key, options| call_indirection_method :search, key, options[:extra] }
+    when_invoked {|key, options| call_indirection_method :search, key, {} }
   end
 
   # Print the configuration for the current terminus class

data/lib/puppet/indirector/fact_search.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # module containing common methods used by json and yaml facts indirection terminus
 module Puppet::Indirector::FactSearch
   def node_matches?(facts, options)

data/lib/puppet/indirector/facts/facter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/code'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/json'
 require_relative '../../../puppet/indirector/fact_search'

data/lib/puppet/indirector/facts/memory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/memory'
 

data/lib/puppet/indirector/facts/network_device.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/code'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/rest'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/store_configs'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node/facts'
 require_relative '../../../puppet/indirector/yaml'
 require_relative '../../../puppet/indirector/fact_search'

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/code'
 require_relative '../../../puppet/file_bucket/file'
 require_relative '../../../puppet/util/checksums'
@@ -57,7 +58,7 @@ module Puppet::FileBucketFile
       end
       # Setting hash's default value to [], needed by the following loop
       bucket = Hash.new {[]}
-      msg = ""
+      msg = String.new
       # Get all files with mtime between 'from' and 'to'
       Pathname.new(request.options[:bucket_path]).find { |item|
         if item.file? and item.basename.to_s == "paths"

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/rest'
 require_relative '../../../puppet/file_bucket/file'
 

data/lib/puppet/indirector/file_bucket_file/selector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/code'
 
 module Puppet::FileBucketFile

data/lib/puppet/indirector/file_content/file.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/direct_file_server'

data/lib/puppet/indirector/file_content/file_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/file_server'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/rest'

data/lib/puppet/indirector/file_content/selector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/content'
 require_relative '../../../puppet/indirector/file_content'
 require_relative '../../../puppet/indirector/code'

data/lib/puppet/indirector/file_content.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A stub class, so our constants work.
 class Puppet::Indirector::FileContent # :nodoc:
 end

data/lib/puppet/indirector/file_metadata/file.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/direct_file_server'

data/lib/puppet/indirector/file_metadata/file_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/file_server'

data/lib/puppet/indirector/file_metadata/http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/http_metadata'
 require_relative '../../../puppet/indirector/generic_http'
 require_relative '../../../puppet/indirector/file_metadata'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/rest'

data/lib/puppet/indirector/file_metadata/selector.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/file_serving/metadata'
 require_relative '../../../puppet/indirector/file_metadata'
 require_relative '../../../puppet/indirector/code'

data/lib/puppet/indirector/file_metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # A stub class, so our constants work.
 class Puppet::Indirector::FileMetadata # :nodoc:
 end

data/lib/puppet/indirector/file_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/file_serving/configuration'
 require_relative '../../puppet/file_serving/fileset'
 require_relative '../../puppet/file_serving/terminus_helper'

data/lib/puppet/indirector/generic_http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/file_serving/terminus_helper'
 
 class Puppet::Indirector::GenericHttp < Puppet::Indirector::Terminus

data/lib/puppet/indirector/hiera.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 require 'hiera/scope'
 

data/lib/puppet/indirector/indirection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/util/docs'
 require_relative '../../puppet/util/profiler'
 require_relative '../../puppet/indirector/envelope'
@@ -80,7 +81,7 @@ class Puppet::Indirector::Indirection
 
   # Generate the full doc string.
   def doc
-    text = ""
+    text = String.new
 
     text << scrub(@doc) << "\n\n" if @doc
 

data/lib/puppet/indirector/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 

data/lib/puppet/indirector/memory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 
 # Manage a memory-cached list of instances.

data/lib/puppet/indirector/msgpack.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util'
 

data/lib/puppet/indirector/node/exec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/node'
 require_relative '../../../puppet/indirector/exec'