File tree 2 files changed +7
-13
lines changed
2 files changed +7
-13
lines changed Original file line number Diff line number Diff line change @@ -86,11 +86,12 @@ def verify_elasticsearch
86
86
begin
87
87
response = elasticsearch_validation_request
88
88
rescue Elastic ::Transport ::Transport ::Errors ::Unauthorized ,
89
- Elastic ::Transport ::Transport ::Errors ::Forbidden
89
+ Elastic ::Transport ::Transport ::Errors ::Forbidden ,
90
+ Elastic ::Transport ::Transport ::Errors ::RequestEntityTooLarge
90
91
@verified = true
91
92
warn ( SECURITY_PRIVILEGES_VALIDATION_WARNING )
92
93
return
93
- rescue Elastic ::Transport ::Transport ::Error => e
94
+ rescue Elastic ::Transport ::Transport ::Error
94
95
warn ( VALIDATION_WARNING )
95
96
return
96
97
end
Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ def valid_requests_and_expectations
98
98
let ( :status ) { 413 }
99
99
let ( :body ) { { } . to_json }
100
100
101
- it 'Does not verify the request and shows a warning' do
101
+ it 'Verifies the request and shows a warning' do
102
102
stderr = $stderr
103
103
fake_stderr = StringIO . new
104
104
$stderr = fake_stderr
@@ -107,18 +107,11 @@ def valid_requests_and_expectations
107
107
assert_not_requested :get , host
108
108
verify_request_stub
109
109
expect { client . info } . to raise_error Elastic ::Transport ::Transport ::Errors ::RequestEntityTooLarge
110
- assert_not_requested :post , "#{ host } /_count"
111
- expect ( client . instance_variable_get ( '@verified' ) ) . to be false
110
+ expect ( client . instance_variable_get ( '@verified' ) ) . to be true
112
111
113
112
fake_stderr . rewind
114
- expect ( fake_stderr . string )
115
- . to eq (
116
- <<~MSG
117
- The client is unable to verify that the server is \
118
- Elasticsearch. Some functionality may not be compatible \
119
- if the server is running an unsupported product.
120
- MSG
121
- )
113
+ expect ( fake_stderr . string . delete ( "\n " ) )
114
+ . to eq ( Elasticsearch ::SECURITY_PRIVILEGES_VALIDATION_WARNING )
122
115
ensure
123
116
$stderr = stderr
124
117
end
You can’t perform that action at this time.
0 commit comments