From 335b2e52713c2a26c1078ec31bb9811b5694b39d Mon Sep 17 00:00:00 2001 From: Louis Charreau Date: Fri, 15 Nov 2024 11:29:12 +0100 Subject: [PATCH 1/2] Get rid of deprecated URI.escape function (removed as of Ruby 3) --- lib/puppetdb/connection.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppetdb/connection.rb b/lib/puppetdb/connection.rb index 426b265..637fbc7 100644 --- a/lib/puppetdb/connection.rb +++ b/lib/puppetdb/connection.rb @@ -60,7 +60,7 @@ def query(endpoint, query = nil, options = {}, version = :v4) end uri = "/pdb/query/#{version}/#{endpoint}" - uri += URI.escape "?query=#{query.to_json}" unless query.nil? || query.empty? + uri += URI.encode_www_form_component "?query=#{query.to_json}" unless query.nil? || query.empty? debug("PuppetDB query: #{query.to_json}") From 0b90f63f43be584170b992541c40f002412001c3 Mon Sep 17 00:00:00 2001 From: Louis Charreau Date: Fri, 15 Nov 2024 19:22:33 +0100 Subject: [PATCH 2/2] Do not encore '?' character using URI.encode_www_form_component function --- lib/puppetdb/connection.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppetdb/connection.rb b/lib/puppetdb/connection.rb index 637fbc7..70f0c9b 100644 --- a/lib/puppetdb/connection.rb +++ b/lib/puppetdb/connection.rb @@ -60,7 +60,7 @@ def query(endpoint, query = nil, options = {}, version = :v4) end uri = "/pdb/query/#{version}/#{endpoint}" - uri += URI.encode_www_form_component "?query=#{query.to_json}" unless query.nil? || query.empty? + uri += "?query=#{URI.encode_www_form_component(query.to_json)}" unless query.nil? || query.empty? debug("PuppetDB query: #{query.to_json}")