puppet 7.24.0-x86-mingw32 → 8.1.0-x86-mingw32

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

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

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

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

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

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

data/lib/puppet/indirector/none.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 
 # A none terminus type, meant to always return nil

data/lib/puppet/indirector/plain.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/indirector/terminus'
 
 # An empty terminus type, meant to just return empty objects.

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

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

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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/code'
 require_relative '../../../puppet/reports'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/rest'
 require 'semantic_puppet'
 
@@ -20,19 +21,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,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/transaction/report'
 require_relative '../../../puppet/indirector/yaml'
 

data/lib/puppet/indirector/request.rb

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/indirector/resource/validator'
 
 class Puppet::Resource::Ral < Puppet::Indirector::Code

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

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

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

@@ -1,3 +1,4 @@
+# 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,4 @@
+# frozen_string_literal: true
 # Access objects via REST
 class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   def find(request)

data/lib/puppet/indirector/store_configs.rb

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

data/lib/puppet/indirector/terminus.rb

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

data/lib/puppet/indirector/yaml.rb

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

data/lib/puppet/indirector.rb

@@ -1,3 +1,4 @@
+# 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

data/lib/puppet/info_service/class_information_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/pops/evaluator/json_strict_literal_evaluator'

data/lib/puppet/info_service/plan_information_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::InfoService::PlanInformationService
   require_relative '../../puppet/module'
 

data/lib/puppet/info_service/task_information_service.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::InfoService::TaskInformationService
   require_relative '../../puppet/module'
 

data/lib/puppet/info_service.rb

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

data/lib/puppet/interface/action.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 require 'prettyprint'
 
 # This represents an action that is attached to a face. Actions should

data/lib/puppet/interface/action_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This class is used to build {Puppet::Interface::Action actions}.
 # When an action is defined with
 # {Puppet::Interface::ActionManager#action} the block is evaluated

data/lib/puppet/interface/action_manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This class is not actually public API, but the method
 # {Puppet::Interface::ActionManager#action action} is public when used
 # as part of the Faces DSL (i.e. from within a

data/lib/puppet/interface/documentation.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Interface
   # @api private
   module DocGen
@@ -76,7 +77,6 @@ class Puppet::Interface
         s.text(" ")
 
         options.each do |option|
-          next if option == :extra
           option = get_option(option)
           wrap = option.required? ? %w{ < > } : %w{ [ ] }
 

data/lib/puppet/interface/face_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Interface::FaceCollection
   @faces = Hash.new { |hash, key| hash[key] = {} }
 

data/lib/puppet/interface/option.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This represents an option on an action or face (to be globally applied
 # to its actions). Options should be constructed by calling
 # {Puppet::Interface::OptionManager#option}, which is available on

data/lib/puppet/interface/option_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # @api public
 class Puppet::Interface::OptionBuilder
   # The option under construction

data/lib/puppet/interface/option_manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This class is not actually public API, but the method
 # {Puppet::Interface::OptionManager#option option} is public when used
 # as part of the Faces DSL (i.e. from within a

data/lib/puppet/interface.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet'
 require_relative '../puppet/util/autoload'
 require 'prettyprint'

data/lib/puppet/loaders.rb

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

data/lib/puppet/metatype/manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet'
 require_relative '../../puppet/util/classgen'
 require_relative '../../puppet/node/environment'

data/lib/puppet/module/plan.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/util/logging'
 
 class Puppet::Module

data/lib/puppet/module/task.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/util/logging'
 
 class Puppet::Module
@@ -232,8 +233,6 @@ class Puppet::Module
     end
 
     def self.read_metadata(file)
-      # MultiJSON has a bug that improperly errors when loading an empty string
-      # so we handle it here for now. See: PUP-11629
       if file
         content = Puppet::FileSystem.read(file, :encoding => 'utf-8')
         content.empty? ? {} : Puppet::Util::Json.load(content)

data/lib/puppet/module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../puppet/util/logging'
 require_relative 'module/task'
 require_relative 'module/plan'
@@ -214,7 +215,9 @@ class Puppet::Module
 
   def read_metadata
     md_file = metadata_file
-    md_file.nil? ? {} : Puppet::Util::Json.load(File.read(md_file, :encoding => 'utf-8'))
+    return {} if md_file.nil?
+    content = File.read(md_file, :encoding => 'utf-8')
+    content.empty? ? {} : Puppet::Util::Json.load(content)
   rescue Errno::ENOENT
     {}
   rescue Puppet::Util::Json::ParseError => e

data/lib/puppet/module_tool/applications/application.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'net/http'
 require_relative '../../../puppet/util/json'
 require_relative '../../../puppet/util/colors'

data/lib/puppet/module_tool/applications/checksummer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/json'
 require_relative '../../../puppet/module_tool/checksums'
 

data/lib/puppet/module_tool/applications/installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'open-uri'
 require 'pathname'
 require 'fileutils'

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool
   module Applications
     class Uninstaller < Application

data/lib/puppet/module_tool/applications/unpacker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'tmpdir'
 require_relative '../../../puppet/util/json'

data/lib/puppet/module_tool/applications/upgrader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 
 require_relative '../../../puppet/forge'

data/lib/puppet/module_tool/applications.rb

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

data/lib/puppet/module_tool/checksums.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'digest/md5'
 require_relative '../../puppet/network/format_support'
 

data/lib/puppet/module_tool/contents_description.rb

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

data/lib/puppet/module_tool/dependency.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/network/format_support'
 

data/lib/puppet/module_tool/errors/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
   class ModuleToolError < Puppet::Error
     def v(version)

data/lib/puppet/module_tool/errors/installer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class InstallError < ModuleToolError; end

data/lib/puppet/module_tool/errors/shared.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class NoVersionsSatisfyError < ModuleToolError

data/lib/puppet/module_tool/errors/uninstaller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class UninstallError < ModuleToolError; end

data/lib/puppet/module_tool/errors/upgrader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Errors
 
   class UpgradeError < ModuleToolError

data/lib/puppet/module_tool/errors.rb

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

data/lib/puppet/module_tool/install_directory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/module_tool/errors'
 

data/lib/puppet/module_tool/installed_modules.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 
 require_relative '../../puppet/forge'

data/lib/puppet/module_tool/local_tarball.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'tmpdir'
 

data/lib/puppet/module_tool/metadata.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/module_tool'
 require_relative '../../puppet/network/format_support'
 require 'uri'

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::ModuleTool::Shared
 
   include Puppet::ModuleTool::Errors

data/lib/puppet/module_tool/tar/gnu.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'shellwords'
 
 class Puppet::ModuleTool::Tar::Gnu

data/lib/puppet/module_tool/tar/mini.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|

data/lib/puppet/module_tool/tar.rb

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

data/lib/puppet/module_tool.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 # Load standard libraries
 require 'pathname'
 require 'fileutils'
@@ -69,7 +70,7 @@ module Puppet
     # Builds a formatted tree from a list of node hashes containing +:text+
     # and +:dependencies+ keys.
     def self.format_tree(nodes, level = 0)
-      str = ''
+      str = String.new
       nodes.each_with_index do |node, i|
         last_node = nodes.length - 1 == i
         deps = node[:dependencies] || []

data/lib/puppet/network/authconfig.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet
   class Network::AuthConfig
     def self.authprovider_class=(_)

data/lib/puppet/network/authorization.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network
   module Authorization
     class << self

data/lib/puppet/network/client_request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network # :nodoc:
   # A struct-like class for passing around a client request.  It's mostly
   # just used for validation and authorization.

data/lib/puppet/network/format.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/confiner'
 
 # A simple class for modeling encoding formats for moving

data/lib/puppet/network/format_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'yaml'
 require_relative '../../puppet/network'
 require_relative '../../puppet/network/format'
@@ -5,7 +6,7 @@ require_relative '../../puppet/network/format'
 module Puppet::Network::FormatHandler
   class FormatError < Puppet::Error; end
 
-  ALL_MEDIA_TYPES = '*/*'.freeze
+  ALL_MEDIA_TYPES = '*/*'
 
   @formats = {}
 

data/lib/puppet/network/format_support.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/network/format_handler'
 
 # Provides network serialization support when included

data/lib/puppet/network/formats.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/network/format_handler'
 require_relative '../../puppet/util/json'
 
@@ -87,6 +88,8 @@ end
 
 # PSON is deprecated
 Puppet::Network::FormatHandler.create_serialized_formats(:pson, :weight => 10, :required_methods => [:render_method, :intern_method], :intern_method => :from_data_hash) do
+  confine :feature => :pson
+
   def intern(klass, text)
     data_to_instance(klass, PSON.parse(text))
   end
@@ -153,7 +156,7 @@ Puppet::Network::FormatHandler.create(:console,
 
     # Simple hash to table
     if datum.is_a?(Hash) && datum.keys.all? { |x| x.is_a?(String) || x.is_a?(Numeric) }
-      output = ''
+      output = String.new
       column_a = datum.empty? ? 2 : datum.map{ |k,v| k.to_s.length }.max + 2
       datum.sort_by { |k,v| k.to_s } .each do |key, value|
         output << key.to_s.ljust(column_a)
@@ -166,7 +169,7 @@ Puppet::Network::FormatHandler.create(:console,
 
     # Print one item per line for arrays
     if datum.is_a? Array
-      output = ''
+      output = String.new
       datum.each do |item|
         output << item.to_s
         output << "\n"
@@ -224,7 +227,7 @@ Puppet::Network::FormatHandler.create(:flat,
   end
 
   def construct_output(data)
-    output = ''
+    output = String.new
     data.each do |key, value|
       output << "#{key}=#{value}"
       output << "\n"

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../puppet/network/http/api/indirection_type'
 
 class Puppet::Network::HTTP::API::IndirectedRoutes
@@ -192,8 +193,13 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
         yield format
         true
       rescue Puppet::Network::FormatHandler::FormatError => err
-        Puppet.warning(_("Failed to serialize %{model} for '%{key}': %{detail}") %
-          {model: model, key: key, detail: err})
+        msg = _("Failed to serialize %{model} for '%{key}': %{detail}") %
+        {model: model, key: key, detail: err}
+        if Puppet[:allow_pson_serialization]
+          Puppet.warning(msg)
+        else
+          raise Puppet::Network::FormatHandler::FormatError.new(msg)
+        end
         false
       end
     end

data/lib/puppet/network/http/api/indirection_type.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Network::HTTP::API::IndirectionType
 
   INDIRECTION_TYPE_MAP = {

data/lib/puppet/network/http/api/master/v3/environments.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../../../puppet/network/http/api/master'
 require_relative '../../../../../../puppet/network/http/api/server/v3/environments'
 

data/lib/puppet/network/http/api/master/v3.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../../puppet/network/http/api/master'
 require_relative '../../../../../puppet/network/http/api/server/v3'
 

data/lib/puppet/network/http/api/master.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../../puppet/network/http/api/server'
 
 Puppet::Network::HTTP::API::Master = Puppet::Network::HTTP::API::Server

data/lib/puppet/network/http/api/server/v3/environments.rb

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

data/lib/puppet/network/http/api/server/v3.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'v3/environments'
 require_relative '../../../../../puppet/network/http/api/indirected_routes'
 

data/lib/puppet/network/http/api/server.rb

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

data/lib/puppet/network/http/api.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Puppet::Network::HTTP::API
   require_relative '../../../puppet/version'
 

data/lib/puppet/network/http/connection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/http'
 
 # This will be raised if too many redirects happen for a given HTTP request

data/lib/puppet/network/http/error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../../puppet/util/json'
 
 module Puppet::Network::HTTP::Error

data/lib/puppet/network/http/handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network::HTTP
 end
 

data/lib/puppet/network/http/issues.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Puppet::Network::HTTP::Issues
   NO_INDIRECTION_REMOTE_REQUESTS = :NO_INDIRECTION_REMOTE_REQUESTS
   HANDLER_NOT_FOUND = :HANDLER_NOT_FOUND