From f43c34061ea84eb87dff4e14be5dd5eb60951504 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 4 Dec 2024 22:58:28 +0000 Subject: [PATCH] Use ruby Net::HTTP in place of unmaintained httpclient --- cookbooks/wordpress/libraries/wordpress.rb | 13 +++---------- cookbooks/wordpress/metadata.rb | 1 - 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cookbooks/wordpress/libraries/wordpress.rb b/cookbooks/wordpress/libraries/wordpress.rb index 031e21ac0..73a0a5467 100644 --- a/cookbooks/wordpress/libraries/wordpress.rb +++ b/cookbooks/wordpress/libraries/wordpress.rb @@ -1,13 +1,8 @@ -require "chef/mixin/shell_out" - -require "addressable" -require "httpclient" require "json" +require "net/http" class Chef module Wordpress - extend Chef::Mixin::ShellOut - @api_responses = {} class << self @@ -22,7 +17,7 @@ class Chef private def core_version_check - api_get("https://api.wordpress.org/core/version-check/1.7") + api_get("https://api.wordpress.org/core/version-check/1.7/") end def plugin_information(name) @@ -30,9 +25,7 @@ class Chef end def api_get(url) - http_client = ::HTTPClient.new - http_client.ssl_config.set_default_paths # https://github.com/nahi/httpclient/issues/445 - @api_responses[url] ||= ::JSON.parse(http_client.get_content(url)) + @api_responses[url] ||= ::JSON.parse(Net::HTTP.get(URI(url))) end end end diff --git a/cookbooks/wordpress/metadata.rb b/cookbooks/wordpress/metadata.rb index 09e29c133..7898910cc 100644 --- a/cookbooks/wordpress/metadata.rb +++ b/cookbooks/wordpress/metadata.rb @@ -14,4 +14,3 @@ depends "git" depends "mysql" depends "php" depends "ssl" -gem "httpclient" -- 2.39.5