Skip to content

Commit 85db169

Browse files
committed
fix linitng
1 parent 3c74d73 commit 85db169

7 files changed

Lines changed: 7 additions & 9 deletions

File tree

app/actions/deployment_create.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,12 @@ 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
98+
# -- e.message is a String, not an Array
9999
if space_quota_errors.any? { |substring| e.message.include?(substring) }
100100
error_message += space_error_msg
101101
elsif org_quota_errors.any? { |substring| e.message.include?(substring) }
102102
error_message += org_error_msg
103103
end
104-
# rubocop:enable Style/ArrayIntersect
105-
106104
error = DeploymentCreate::Error.new(error_message)
107105
error.set_backtrace(e.backtrace)
108106
error

app/models/runtime/helpers/organization_role_mixin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def around_save
1717
yield
1818
rescue Sequel::UniqueConstraintViolation => e
1919
unique_indexes = %w[org_users_idx org_auditors_idx org_managers_idx org_billing_managers_idx]
20-
raise e unless unique_indexes.any? { |pattern| e.message.include?(pattern) } # rubocop:disable Style/ArrayIntersect -- e.message is a String, not an Array
20+
raise e unless unique_indexes.any? { |pattern| e.message.include?(pattern) } # -- e.message is a String, not an Array
2121

2222
errors.add(%i[organization_id user_id], :unique)
2323
raise validation_failed_error

app/models/runtime/helpers/space_role_mixin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def around_save
1717
yield
1818
rescue Sequel::UniqueConstraintViolation => e
1919
unique_indexes = %w[space_developers_idx space_auditors_idx space_managers_idx spaces_supporters_user_space_index]
20-
raise e unless unique_indexes.any? { |pattern| e.message.include?(pattern) } # rubocop:disable Style/ArrayIntersect -- e.message is a String, not an Array
20+
raise e unless unique_indexes.any? { |pattern| e.message.include?(pattern) } # -- e.message is a String, not an Array
2121

2222
errors.add(%i[space_id user_id], :unique)
2323
raise validation_failed_error

lib/sequel_plugins/vcap_relations.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def many_to_many(name, opts={})
7373
end
7474
rescue Sequel::UniqueConstraintViolation => e
7575
# ignore the error and rollback the inner transaction
76-
raise Sequel::Rollback if opts[:ignored_unique_constraint_violation_errors]&.any? { |pattern| e.message.include?(pattern) } # rubocop:disable Style/ArrayIntersect -- e.message is a String, not an Array
76+
raise Sequel::Rollback if opts[:ignored_unique_constraint_violation_errors]&.any? { |pattern| e.message.include?(pattern) } # -- e.message is a String, not an Array
7777

7878
raise e
7979
end

middleware/below_min_cli_warning.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def call(env)
1111

1212
included_endpoints = %w[/v3/spaces /v3/organizations /v2/spaces /v2/organizations]
1313

14-
if included_endpoints.any? { |ep| env['REQUEST_PATH'].include?(ep) } && is_below_min_cli_version?(env['HTTP_USER_AGENT']) # rubocop:disable Style/ArrayIntersect -- env['REQUEST_PATH'] is a String, not an Array
14+
if included_endpoints.any? { |ep| env['REQUEST_PATH'].include?(ep) } && is_below_min_cli_version?(env['HTTP_USER_AGENT']) # -- env['REQUEST_PATH'] is a String, not an Array
1515
# Ensure existing warnings are appended by ',' (unicode %2C)
1616
new_warning = env['X-Cf-Warnings'].nil? ? escaped_warning : "#{env['X-Cf-Warnings']}%2C#{escaped_warning}"
1717
headers['X-Cf-Warnings'] = new_warning

middleware/cef_logs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def call(env)
3636
"cs2Label=vcapRequestId cs2=#{escape_extension(env['cf.request_id'])} " \
3737
"cs3Label=result cs3=#{get_result(status)} " \
3838
"cs4Label=httpStatusCode cs4=#{status} " \
39-
"cs5Label=xForwardedFor cs5=#{escape_extension(request.headers['HTTP_X_FORWARDED_FOR'])}" \
39+
"cs5Label=xForwardedFor cs5=#{escape_extension(request.headers['HTTP_X_FORWARDED_FOR'])}"
4040
)
4141

4242
[status, headers, body]

spec/unit/lib/services/service_brokers/v2/schema_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module VCAP::Services::ServiceBrokers::V2
7373
it 'add a schema error message with a wrapped error' do
7474
expect(schema.validate).to be false
7575
expect(schema.errors.full_messages.length).to eq 1
76-
expect(schema.errors.full_messages.first).to eq 'Must conform to JSON Schema Draft 04 (experimental support for later versions): whoops' \
76+
expect(schema.errors.full_messages.first).to eq 'Must conform to JSON Schema Draft 04 (experimental support for later versions): whoops'
7777
end
7878
end
7979

0 commit comments

Comments
 (0)