Merge pull request #127 from lcharreau/fix/pson-to-json

Replace PSON with JSON for compatibility with Puppet 8

Author: bastelfreak

lib/puppet/catalog-diff/compilecatalog.rb

@@ -22,9 +22,9 @@ def initialize(node_name, save_directory, server, certless, catalog_from_puppetd
                   clean_nested_sensitive_parameters!(catalog)
                   catalog
                 end
-      catalog = render_pson(catalog)
+      catalog = render_json(catalog)
       begin
-        save_catalog_to_disk(save_directory, node_name, catalog, 'pson')
+        save_catalog_to_disk(save_directory, node_name, catalog, 'json')
       rescue Exception => e
         Puppet.err("Server returned invalid catalog for #{node_name}")
         save_catalog_to_disk(save_directory, node_name, catalog, 'error')
@@ -60,8 +60,8 @@ def get_catalog_from_puppetdb(node_name, server, puppetdb, puppetdb_tls_cert, pu
       raise "HTTP request to PuppetDB failed with: HTTP #{ret.code} - #{ret.reason}" unless ret.success?
 
       begin
-        catalog = PSON.parse(ret.body)
-      rescue PSON::ParserError => e
+        catalog = JSON.parse(ret.body)
+      rescue JSON::ParserError => e
         raise "Error parsing json output of puppetdb catalog query for #{node_name}: #{e.message}\ncontent: #{ret.body}"
       end
 
@@ -75,7 +75,7 @@ def compile_catalog(node_name, server, certless, tls_cert, tls_key, tls_ca, deri
       server, port = server.split(':')
       port ||= '8140'
       headers = {
-        'Accept' => 'pson',
+        'Accept' => 'application/json',
       }
 
       if certless
@@ -122,8 +122,8 @@ def compile_catalog(node_name, server, certless, tls_cert, tls_key, tls_ca, deri
       end
 
       begin
-        catalog = PSON.parse(ret.body)
-      rescue PSON::ParserError => e
+        catalog = JSON.parse(ret.body)
+      rescue JSON::ParserError => e
         raise "Error parsing json output of puppet catalog query for #{node_name}: #{e.message}. Content: #{ret.body}"
       end
       raise catalog['message'] if catalog.key?('issue_kind')
@@ -132,11 +132,11 @@ def compile_catalog(node_name, server, certless, tls_cert, tls_key, tls_ca, deri
       catalog
     end
 
-    def render_pson(catalog)
-      pson = PSON.pretty_generate(catalog, allow_nan: true, max_nesting: false)
-      raise "Could not render catalog as pson, #{catalog}" unless pson
+    def render_json(catalog)
+      json = JSON.pretty_generate(catalog, allow_nan: true, max_nesting: false)
+      raise "Could not render catalog as json, #{catalog}" unless json
 
-      pson
+      json
     end
 
     def clean_sensitive_parameters!(catalog)

lib/puppet/catalog-diff/searchfacts.rb

@@ -77,8 +77,8 @@ def find_nodes_puppetdb(env, puppetdb, puppetdb_tls_cert, puppetdb_tls_key, pupp
           json_query = URI.encode_www_form_component(query.to_json)
           result = Puppet.runtime[:http].get(URI("#{puppetdb}/pdb/query/v4/nodes?query=#{json_query}"), headers: headers)
         end
-        filtered = PSON.parse(result.body)
-      rescue PSON::ParserError => e
+        filtered = JSON.parse(result.body)
+      rescue JSON::ParserError => e
         raise "Error parsing json output of puppet search: #{e.message}"
       end
       filtered.map { |node| node['certname'] }