From 3592fa8030455d2faeed1e8c46e2c7a2fa2c25e5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 24 Nov 2022 12:05:56 +0900 Subject: [PATCH] Revert "Add old ruby support to inet6_prefix" This reverts commit efffd27a414000eea0a85dae3162ed65b636cb3b. Reason for revert: The logic was added to support ruby 1.x.x which does not contain [1], but recent operating systems no longer ship such an old version. CentOS 9: Ruby 3.0 CentOS 8: Ruby 2.5 Ubuntu 20.04: Ruby 2.7 [1] https://github.com/ruby/ruby/commit/e03d266c1dbf82c25fd63a2a4a1a9665dbc1bab4 Change-Id: I7c633f8d12e4678910872b7782273b2ca2c76d65 --- lib/puppet/functions/inet6_prefix.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/puppet/functions/inet6_prefix.rb b/lib/puppet/functions/inet6_prefix.rb index 6ab25c4b..6af2ceeb 100644 --- a/lib/puppet/functions/inet6_prefix.rb +++ b/lib/puppet/functions/inet6_prefix.rb @@ -8,15 +8,6 @@ Puppet::Functions.create_function(:inet6_prefix) do def inet6_prefix(*args) require 'ipaddr' - # NOTE(tobias-urdin): Add support for older version of the ipaddr - # lib where ArgumentError hasn't been replaced yet. - if IPAddr.const_defined?('InvalidAddressError') - exp = [IPAddr::AddressFamilyError, IPAddr::Error, IPAddr::InvalidAddressError, - IPAddr::InvalidPrefixError, ArgumentError, NoMethodError] - else - exp = [ArgumentError, NoMethodError] - end - result = [] args = args[0] if args[0].kind_of?(Array) args = [args] unless args.kind_of?(Array) @@ -29,7 +20,7 @@ Puppet::Functions.create_function(:inet6_prefix) do ip = "inet6:[#{ip_parts.shift}]#{ip_parts.join}" end end - rescue *exp + rescue IPAddr::AddressFamilyError, IPAddr::Error, IPAddr::InvalidAddressError, IPAddr::InvalidPrefixError, ArgumentError, NoMethodError => e # ignore it end result << ip