Skip to content

Commit

Permalink
Revert "(CONT-801) Deprecate uriescape.rb"
Browse files Browse the repository at this point in the history
This reverts commit 799d608.

While uriescape was deprecated for Puppet 8 in puppetlabs#1307
it was already fixed earlier for Puppet 8 and ruby 3 in puppetlabs#1195

It is unclear to me why this function was deprecated.

* Fixes puppetlabs#1401
  • Loading branch information
traylenator committed Oct 17, 2023
1 parent 4846f84 commit 6da5a2f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
5 changes: 0 additions & 5 deletions lib/puppet/parser/functions/uriescape.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,8 @@ 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]
Expand Down
4 changes: 0 additions & 4 deletions spec/functions/uriescape_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,5 @@
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

0 comments on commit 6da5a2f

Please sign in to comment.