@@ -22,9 +22,9 @@ def initialize(node_name, save_directory, server, certless, catalog_from_puppetd
22
22
clean_nested_sensitive_parameters! ( catalog )
23
23
catalog
24
24
end
25
- catalog = render_pson ( catalog )
25
+ catalog = render_json ( catalog )
26
26
begin
27
- save_catalog_to_disk ( save_directory , node_name , catalog , 'pson ' )
27
+ save_catalog_to_disk ( save_directory , node_name , catalog , 'json ' )
28
28
rescue Exception => e
29
29
Puppet . err ( "Server returned invalid catalog for #{ node_name } " )
30
30
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
60
60
raise "HTTP request to PuppetDB failed with: HTTP #{ ret . code } - #{ ret . reason } " unless ret . success?
61
61
62
62
begin
63
- catalog = PSON . parse ( ret . body )
64
- rescue PSON ::ParserError => e
63
+ catalog = JSON . parse ( ret . body )
64
+ rescue JSON ::ParserError => e
65
65
raise "Error parsing json output of puppetdb catalog query for #{ node_name } : #{ e . message } \n content: #{ ret . body } "
66
66
end
67
67
@@ -75,7 +75,7 @@ def compile_catalog(node_name, server, certless, tls_cert, tls_key, tls_ca, deri
75
75
server , port = server . split ( ':' )
76
76
port ||= '8140'
77
77
headers = {
78
- 'Accept' => 'pson ' ,
78
+ 'Accept' => 'application/json ' ,
79
79
}
80
80
81
81
if certless
@@ -122,8 +122,8 @@ def compile_catalog(node_name, server, certless, tls_cert, tls_key, tls_ca, deri
122
122
end
123
123
124
124
begin
125
- catalog = PSON . parse ( ret . body )
126
- rescue PSON ::ParserError => e
125
+ catalog = JSON . parse ( ret . body )
126
+ rescue JSON ::ParserError => e
127
127
raise "Error parsing json output of puppet catalog query for #{ node_name } : #{ e . message } . Content: #{ ret . body } "
128
128
end
129
129
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
132
132
catalog
133
133
end
134
134
135
- def render_pson ( catalog )
136
- pson = PSON . pretty_generate ( catalog , allow_nan : true , max_nesting : false )
137
- raise "Could not render catalog as pson , #{ catalog } " unless pson
135
+ def render_json ( catalog )
136
+ json = JSON . pretty_generate ( catalog , allow_nan : true , max_nesting : false )
137
+ raise "Could not render catalog as json , #{ catalog } " unless json
138
138
139
- pson
139
+ json
140
140
end
141
141
142
142
def clean_sensitive_parameters! ( catalog )
0 commit comments