From 799d608939b90effb7cfa7d0054a3985c78db982 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Mon, 22 May 2023 10:07:01 +0100 Subject: [PATCH] (CONT-801) Deprecate uriescape.rb --- lib/puppet/parser/functions/uriescape.rb | 5 +++++ spec/functions/uriescape_spec.rb | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lib/puppet/parser/functions/uriescape.rb b/lib/puppet/parser/functions/uriescape.rb index 01b615788..128558163 100644 --- a/lib/puppet/parser/functions/uriescape.rb +++ b/lib/puppet/parser/functions/uriescape.rb @@ -15,8 +15,13 @@ module Puppet::Parser::Functions @return [String] a string that contains the converted value + > **Note:** **Deprecated:** Starting Puppet 8, our Ruby version has upgraded to 3.2. + Therefore, its no longer possible to call URI.escape as it was deprecated by 2.7 and removed completely by 3+. + This function should be removed once Puppet 7 is no longer supported. DOC ) do |arguments| + raise(Puppet::ParseError, 'Puppet: This function is not available in Puppet 8. URI.escape no longer exists as of Ruby 3+.') if Puppet::Util::Package.versioncmp(Puppet.version, '8').positive? + raise(Puppet::ParseError, "uriescape(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty? value = arguments[0] diff --git a/spec/functions/uriescape_spec.rb b/spec/functions/uriescape_spec.rb index d402697ff..5d7606121 100644 --- a/spec/functions/uriescape_spec.rb +++ b/spec/functions/uriescape_spec.rb @@ -39,5 +39,9 @@ it { is_expected.to run.with_params(['one}', 'two']).and_return(['one%7D', 'two']) } it { is_expected.to run.with_params(['one}', 1, true, {}, 'two']).and_return(['one%7D', 1, true, {}, 'two']) } end + else + describe 'raising errors in Puppet 8' do + it { is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, %r{This function is not available in Puppet 8. URI.escape no longer exists as of Ruby 3+.}) } + end end end