Skip to content

Commit 8a52df1

Browse files
committed
Fix Rubocop findings
1 parent 51c8022 commit 8a52df1

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

app/messages/validators/security_group_rule_validator.rb

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ def validate(record)
2929

3030
add_rule_error("protocol must be 'tcp', 'udp', 'icmp', 'icmpv6' or 'all'", record, index) unless valid_protocol(rule[:protocol])
3131

32-
if rule[:protocol] == 'icmp'
33-
allowed_ip_version = NetAddr::IPv4Net
34-
elsif rule[:protocol] == 'icmpv6'
35-
allowed_ip_version = NetAddr::IPv6Net
36-
else
37-
allowed_ip_version = nil
38-
end
32+
allowed_ip_version = if rule[:protocol] == 'icmp'
33+
NetAddr::IPv4Net
34+
elsif rule[:protocol] == 'icmpv6'
35+
NetAddr::IPv6Net
36+
else
37+
nil
38+
end
3939

4040
if valid_destination_type(rule[:destination], record, index)
4141
destinations = rule[:destination].split(',', -1)
@@ -55,7 +55,7 @@ def validate(record)
5555
when 'icmp'
5656
validate_icmp_protocol(rule, record, index)
5757
when 'icmpv6'
58-
add_rule_error("icmpv6 cannot be used if enable_ipv6 is false", record, index) unless CloudController::RuleValidator.ipv6_enabled?
58+
add_rule_error('icmpv6 cannot be used if enable_ipv6 is false', record, index) unless CloudController::RuleValidator.ipv6_enabled?
5959
validate_icmp_protocol(rule, record, index)
6060
when 'all'
6161
add_rule_error('ports are not allowed for protocols of type all', record, index) if rule[:ports]
@@ -152,7 +152,8 @@ def validate_destination(destination, protocol, allowed_ip_version, record, inde
152152
if address_list.length == 1
153153
parsed_ip = CloudController::RuleValidator.parse_ip(address_list.first)
154154
add_rule_error(error_message, record, index) unless parsed_ip
155-
add_rule_error("for protocol \"#{protocol}\" you cannot use IPv#{parsed_ip.version} addresses", record, index) unless parsed_ip.nil? || allowed_ip_version.nil? || parsed_ip.is_a?(allowed_ip_version)
155+
add_rule_error("for protocol \"#{protocol}\" you cannot use IPv#{parsed_ip.version} addresses", record, index)\
156+
unless parsed_ip.nil? || allowed_ip_version.nil? || parsed_ip.is_a?(allowed_ip_version)
156157
elsif address_list.length == 2
157158
ips = CloudController::RuleValidator.parse_ip(address_list)
158159
return add_rule_error('destination IP address range is invalid', record, index) unless ips
@@ -165,7 +166,8 @@ def validate_destination(destination, protocol, allowed_ip_version, record, inde
165166

166167
reversed_range_error = 'beginning of IP address range is numerically greater than the end of its range (range endpoints are inverted)'
167168
add_rule_error(reversed_range_error, record, index) unless ips.first == sorted_ips.first
168-
add_rule_error("for protocol \"#{protocol}\" you cannot use IPv#{ips.first.version} addresses", record, index) unless ips.first.nil? || allowed_ip_version.nil? || ips.first.is_a?(allowed_ip_version)
169+
add_rule_error("for protocol \"#{protocol}\" you cannot use IPv#{ips.first.version} addresses", record, index)\
170+
unless ips.first.nil? || allowed_ip_version.nil? || ips.first.is_a?(allowed_ip_version)
169171

170172
else
171173
add_rule_error(error_message, record, index)

0 commit comments

Comments
 (0)