Skip to content

Commit 1c2e882

Browse files
committed
Fix RuboCop offenses in domain_create_message and route_policies_list_message_spec
1 parent 3dad6e1 commit 1c2e882

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

app/messages/domain_create_message.rb

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,29 @@ def alpha_numeric
8888
end
8989

9090
def mutually_exclusive_fields
91-
errors.add(:base, 'Cannot associate an internal domain with an organization') if requested?(:internal) && internal == true && requested?(:relationships)
92-
errors.add(:base, 'Internal domains cannot be associated to a router group.') if requested?(:internal) && internal == true && requested?(:router_group)
93-
errors.add(:base, 'Internal domains cannot have route policy enforcement. Internal routes bypass GoRouter.') if requested?(:internal) && internal == true &&
94-
requested?(:enforce_route_policies) && enforce_route_policies == true
95-
errors.add(:base, 'Domains with a router group cannot have route policy enforcement. TCP routes do not support mTLS policy enforcement.') if requested?(:router_group) &&
96-
requested?(:enforce_route_policies) && enforce_route_policies == true
91+
validate_internal_domain_exclusions
92+
validate_router_group_exclusions
9793
return unless requested?(:relationships) && requested?(:router_group)
9894

9995
errors.add(:base, 'Domains scoped to an organization cannot be associated to a router group.')
10096
end
10197

98+
def validate_internal_domain_exclusions
99+
return unless requested?(:internal) && internal == true
100+
101+
errors.add(:base, 'Cannot associate an internal domain with an organization') if requested?(:relationships)
102+
errors.add(:base, 'Internal domains cannot be associated to a router group.') if requested?(:router_group)
103+
return unless requested?(:enforce_route_policies) && enforce_route_policies == true
104+
105+
errors.add(:base, 'Internal domains cannot have route policy enforcement. Internal routes bypass GoRouter.')
106+
end
107+
108+
def validate_router_group_exclusions
109+
return unless requested?(:router_group) && requested?(:enforce_route_policies) && enforce_route_policies == true
110+
111+
errors.add(:base, 'Domains with a router group cannot have route policy enforcement. TCP routes do not support mTLS policy enforcement.')
112+
end
113+
102114
def router_group_validation
103115
return if router_group.nil?
104116
return errors.add(:router_group, 'must be an object') unless router_group.is_a?(Hash)

spec/unit/messages/route_policies_list_message_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ module VCAP::CloudController
5959
page: 1,
6060
per_page: 5,
6161
order_by: 'created_at',
62-
include: %w[source route]
62+
include: %w[source route]
6363
}
6464
end
6565

@@ -81,7 +81,7 @@ module VCAP::CloudController
8181
page: 1,
8282
per_page: 5,
8383
order_by: 'created_at',
84-
include: %w[source route]
84+
include: %w[source route]
8585
})
8686
end.not_to raise_error
8787
end

0 commit comments

Comments
 (0)