Merge pull request #9034 from joshcooper/drop_pson

(PUP-9648) Prepare for PSON removal

Author: mhashizume

acceptance/lib/puppet/acceptance/module_utils.rb

@@ -44,7 +44,7 @@ def get_default_modulepath_for_host(host)
       # @param host [String] hostname
       # @return [Array] paths for found modules
       def get_installed_modules_for_host(host)
-        on host, puppet("module list --render-as pson")
+        on host, puppet("module list --render-as json")
         str  = stdout.lines.to_a.last
         pat = /\(([^()]+)\)/
         mods =  str.scan(pat).flatten

acceptance/tests/language/exported_resources.rb

@@ -17,7 +17,7 @@
     step 'stop puppet server' do
       on(master, "service #{master['puppetservice']} stop")
     end
-    step 'remove cached agent pson catalogs from the master' do
+    step 'remove cached agent json catalogs from the master' do
       on(master, "rm -f #{File.join(master.puppet['yamldir'],'catalog','*')}",
          :accept_all_exit_codes => true)
     end
@@ -33,10 +33,10 @@
     end
   end
 
-  storeconfigs_backend_name = 'pson_storeconfigs'
+  storeconfigs_backend_name = 'json_storeconfigs'
   step 'create a yaml storeconfigs terminus in the modulepath' do
     moduledir = File.join(environmentpath,tmp_environment,'modules')
-    terminus_class_name = 'PsonStoreconfigs'
+    terminus_class_name = 'JsonStoreconfigs'
     manifest = <<MANIFEST
 File {
   ensure => directory,
@@ -64,8 +64,8 @@ def save(request)
         # This is quite likely a bad idea, since we are not managing ownership or modes.
         Dir.mkdir(basedir) unless Puppet::FileSystem.exist?(basedir)
         begin
-          # We cannot dump anonymous modules in yaml, so dump to json/pson
-          File.open(file, "w") { |f| f.write request.instance.to_pson }
+          # We cannot dump anonymous modules in yaml, so dump to json
+          File.open(file, "w") { |f| f.write request.instance.to_json }
         rescue TypeError => detail
           Puppet.err "Could not save \#{self.name} \#{request.key}: \#{detail}"
         end
@@ -108,7 +108,7 @@ class Puppet::Resource::#{terminus_class_name} < Puppet::Indirector::Yaml
       def search(request)
         catalog_dir = File.join(Puppet.run_mode.server? ? Puppet[:yamldir] : Puppet[:clientyamldir], "catalog", "*")
         results = Dir.glob(catalog_dir).collect { |file|
-          catalog = Puppet::Resource::Catalog.convert_from(:pson, File.read(file))
+          catalog = Puppet::Resource::Catalog.convert_from(:json, File.read(file))
           if catalog.name == request.options[:host]
             next
           end

acceptance/tests/security/cve-2013-1652_improper_query_params.rb

@@ -26,7 +26,7 @@
 
       cert_path = on(agent, puppet('agent', "--configprint hostcert")).stdout.chomp
       key_path = on(agent, puppet('agent', "--configprint hostprivkey")).stdout.chomp
-      curl_base = "curl --tlsv1 -g --cert \"#{cert_path}\" --key \"#{key_path}\" -k -H 'Accept: pson'"
+      curl_base = "curl --tlsv1 -g --cert \"#{cert_path}\" --key \"#{key_path}\" -k -H 'Accept: application/json'"
 
       curl_call =  "#{curl_base} '#{payload}'"
 

acceptance/tests/security/cve-2013-1652_poison_other_node_cache.rb

@@ -21,7 +21,7 @@
       master, puppet('agent', "--configprint hostprivkey")).stdout.chomp
 
     curl_base = "curl --tlsv1 -g --cert \"#{cert_path}\" " +
-                "--key \"#{key_path}\" -k -H 'Accept: pson'"
+                "--key \"#{key_path}\" -k -H 'Accept: application/json'"
 
     step "Attempt to poison the master's node cache" do
       yamldir = puppet_config(master, 'yamldir', section: 'master')

acceptance/tests/server_returns_pson_when_preferred_serialization_set.rb

@@ -20,10 +20,6 @@
 require_relative 'puppet/util/feature'
 require_relative 'puppet/util/suidmanager'
 require_relative 'puppet/util/run_mode'
-# PSON is deprecated, use JSON instead
-require_relative 'puppet/external/pson/common'
-require_relative 'puppet/external/pson/version'
-require_relative 'puppet/external/pson/pure'
 require_relative 'puppet/gettext/config'
 require_relative 'puppet/defaults'
 

lib/puppet.rb

@@ -1711,6 +1711,11 @@ def self.initialize_default_settings!(settings)
       instances will be serialized using this method, since not all classes
       can be guaranteed to support this format, but it will be used for all
       classes that support it.",
+      :hook => proc { |value|
+        if value == "pson" && !Puppet.features.pson?
+          raise(Puppet::Settings::ValidationError, "The 'puppet-pson' gem must be installed to use the PSON serialization format.")
+        end
+      }
     },
     :agent_catalog_run_lockfile => {
       :default    => "$statedir/agent_catalog_run.lock",

lib/puppet/defaults.rb

@@ -0,0 +1,4 @@
+require_relative '../../puppet/util/feature'
+
+# PSON is deprecated, use JSON instead
+Puppet.features.add(:pson, :libs => ['puppet/external/pson/common','puppet/external/pson/version', 'puppet/external/pson/pure'])

lib/puppet/feature/pson.rb

@@ -54,9 +54,6 @@ def put_report(name, report, environment:)
 
     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

lib/puppet/http/service/report.rb

@@ -20,19 +20,6 @@ def save(request)
     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)