Merge pull request #42 from raphink/pdb4

acidprime · web-flow · commit 3b081d997a3c · 2016-07-21T11:33:48.000-07:00
Fix PuppetDB 4 support
diff --git a/lib/puppet/catalog-diff/searchfacts.rb b/lib/puppet/catalog-diff/searchfacts.rb
@@ -98,7 +98,7 @@ def find_nodes_puppetdb(env)
           )
         end
         json_query = URI.escape(query.to_json)
-        unless filtered = PSON.load(connection.request_get("/pdb/query/v4/nodes/?query=#{json_query}", {"Accept" => 'application/json'}).body)
+        unless filtered = PSON.load(connection.request_get("/pdb/query/v4/nodes?query=#{json_query}", {"Accept" => 'application/json'}).body)
           raise "Error parsing json output of puppet search"
         end
         names = filtered.map { |node| node['certname'] }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ def find_nodes_puppetdb(env)`
`98`	`98`	`)`
`99`	`99`	`end`
`100`	`100`	`json_query = URI.escape(query.to_json)`
`101`		`- unless filtered = PSON.load(connection.request_get("/pdb/query/v4/nodes/?query=#{json_query}", {"Accept" => 'application/json'}).body)`
	`101`	`+ unless filtered = PSON.load(connection.request_get("/pdb/query/v4/nodes?query=#{json_query}", {"Accept" => 'application/json'}).body)`
`102`	`102`	`raise "Error parsing json output of puppet search"`
`103`	`103`	`end`
`104`	`104`	`names = filtered.map { \|node\| node['certname'] }`