Skip to content

Commit aeec4ec

Browse files
committed
fix linting
1 parent 5ddff76 commit aeec4ec

15 files changed

Lines changed: 21 additions & 22 deletions

app/actions/deployment_create.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,13 @@ def enhanced_deployment_create_error(e, app)
9595
org_error_msg = org_error_msg_1 + org_error_msg_2
9696
error_message = e.message
9797

98+
# rubocop:disable Style/ArrayIntersect -- e.message is a String, not an Array
9899
if space_quota_errors.any? { |substring| e.message.include?(substring) }
99100
error_message += space_error_msg
100101
elsif org_quota_errors.any? { |substring| e.message.include?(substring) }
101102
error_message += org_error_msg
102103
end
104+
# rubocop:enable Style/ArrayIntersect
103105

104106
error = DeploymentCreate::Error.new(error_message)
105107
error.set_backtrace(e.backtrace)

app/actions/domain_create.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ def create(message:, shared_organizations: [])
4242
private
4343

4444
def validation_error!(message, error)
45-
error!("The domain name \"#{message.name}\" is already in use") if error.errors.on(:name)&.any? { |e| [:unique].include?(e) }
45+
error!("The domain name \"#{message.name}\" is already in use") if error.errors.on(:name)&.intersect?([:unique])
4646

47-
error!("The \"#{message.name}\" domain is reserved and cannot be used for org-scoped domains.") if error.errors.on(:name)&.any? { |e| [:reserved].include?(e) }
47+
error!("The \"#{message.name}\" domain is reserved and cannot be used for org-scoped domains.") if error.errors.on(:name)&.intersect?([:reserved])
4848

49-
if error.errors.on(:organization)&.any? { |e| [:total_private_domains_exceeded].include?(e) }
49+
if error.errors.on(:organization)&.intersect?([:total_private_domains_exceeded])
5050
org = Organization.find(guid: message.organization_guid).name
5151
error!("The number of private domains exceeds the quota for organization \"#{org}\"")
5252
end

app/actions/role_create.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,14 @@ def create_organization_billing_manager(user, organization, role_type)
9898
end
9999

100100
def space_validation_error!(type, error, user, space)
101-
error!("User '#{user.presentation_name}' already has '#{type}' role in space '#{space.name}'.") if error.errors.on(%i[space_id user_id])&.any? { |e| [:unique].include?(e) }
101+
error!("User '#{user.presentation_name}' already has '#{type}' role in space '#{space.name}'.") if error.errors.on(%i[space_id user_id])&.intersect?([:unique])
102102

103103
error!(error.message)
104104
end
105105

106106
def organization_validation_error!(type, error, user, organization)
107-
error!("User '#{user.presentation_name}' already has '#{type}' role in organization '#{organization.name}'.") if error.errors.on(%i[organization_id user_id])&.any? do |e|
108-
[:unique].include?(e)
109-
end
107+
error!("User '#{user.presentation_name}' already has '#{type}' role in organization '#{organization.name}'.") if error.errors.on(%i[organization_id
108+
user_id])&.intersect?([:unique])
110109

111110
error!(error.message)
112111
end

app/actions/user_create.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ def create(message:)
2626
private
2727

2828
def validation_error!(message, error)
29-
error!("User with guid '#{message.guid}' already exists.") if message.guid && error.errors.on(:guid)&.any? { |e| [:unique].include?(e) }
29+
error!("User with guid '#{message.guid}' already exists.") if message.guid && error.errors.on(:guid)&.intersect?([:unique])
3030

31-
if !message.guid && error.errors.on(:guid)&.any? { |e| [:unique].include?(e) }
32-
error!("User with username '#{message.username}' and origin '#{message.origin}' already exists.")
33-
end
31+
error!("User with username '#{message.username}' and origin '#{message.origin}' already exists.") if !message.guid && error.errors.on(:guid)&.intersect?([:unique])
3432

3533
error!(error.message)
3634
end

app/decorators/include_binding_app_decorator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module VCAP::CloudController
22
class IncludeBindingAppDecorator
33
class << self
44
def match?(include)
5-
include&.any? { |i| %w[app].include?(i) }
5+
include&.intersect?(%w[app])
66
end
77

88
def decorate(hash, bindings)

app/decorators/include_binding_service_instance_decorator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module VCAP::CloudController
44
class IncludeBindingServiceInstanceDecorator
55
class << self
66
def match?(include)
7-
include&.any? { |i| %w[service_instance].include?(i) }
7+
include&.intersect?(%w[service_instance])
88
end
99

1010
def decorate(hash, bindings)

app/decorators/include_organization_decorator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module VCAP::CloudController
22
class IncludeOrganizationDecorator
33
class << self
44
def match?(include)
5-
include&.any? { |i| %w[org space.organization].include?(i) }
5+
include&.intersect?(%w[org space.organization])
66
end
77

88
def decorate(hash, resources)

app/decorators/include_route_domain_decorator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module VCAP::CloudController
22
class IncludeRouteDomainDecorator
33
class << self
44
def match?(include)
5-
include&.any? { |i| %w[domain].include?(i) }
5+
include&.intersect?(%w[domain])
66
end
77

88
def decorate(hash, routes)

app/decorators/include_space_decorator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module VCAP::CloudController
22
class IncludeSpaceDecorator
33
class << self
44
def match?(include)
5-
include&.any? { |i| %w[space space.organization].include?(i) }
5+
include&.intersect?(%w[space space.organization])
66
end
77

88
def decorate(hash, resources)

app/decorators/include_space_organization_decorator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module VCAP::CloudController
22
class IncludeSpaceOrganizationDecorator
33
class << self
44
def match?(include)
5-
include&.any? { |i| %w[org organization].include?(i) }
5+
include&.intersect?(%w[org organization])
66
end
77

88
def decorate(hash, spaces)

0 commit comments

Comments
 (0)