From: david22swan Date: Wed, 26 Apr 2023 14:09:12 +0000 (+0100) Subject: (CONT-773) Set toapt_key `open` calls to `URI.open` X-Git-Tag: v9.1.0~9^2~8 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bae1dc74229caf0559650421e43ee2fba88496cf;hp=3cff22c493a803b407f7dfd4277d33624877c69f;p=puppet-modules%2Fpuppetlabs-apt.git (CONT-773) Set toapt_key `open` calls to `URI.open` Calls to `open` have previously been left vague, which has caused issues upon implementing Ruby 3 --- diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb index c15d826..8cdf78b 100644 --- a/lib/puppet/provider/apt_key/apt_key.rb +++ b/lib/puppet/provider/apt_key/apt_key.rb @@ -135,14 +135,14 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do # Some webservers (e.g. Amazon S3) return code 400 if empty basic auth is sent if parsed_value.userinfo.nil? key = if parsed_value.scheme == 'https' && resource[:weak_ssl] == true - open(parsed_value, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read + URI.open(parsed_value, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read else parsed_value.read end else user_pass = parsed_value.userinfo.split(':') parsed_value.userinfo = '' - key = open(parsed_value, http_basic_authentication: user_pass).read + key = URI.open(parsed_value, http_basic_authentication: user_pass).read end rescue *exceptions => e raise(_('%{_e} for %{_resource}') % { _e: e.message, _resource: resource[:source] })