Skip to content

Commit 90e5230

Browse files
picandocodigojsvd
andcommitted
Fixes tagline check
Co-authored-by: João Duarte <[email protected]>
1 parent 1ef39d7 commit 90e5230

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

elasticsearch/lib/elasticsearch.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ def verify_with_version_or_header(body, version, headers)
7575
elsif Gem::Version.new(version) > Gem::Version.new('6.0.0') &&
7676
Gem::Version.new(version) < Gem::Version.new('7.0.0')
7777
raise Elasticsearch::NotElasticsearchError unless
78-
body.dig('version', 'tagline') == YOU_KNOW_FOR_SEARCH
78+
body['tagline'] == YOU_KNOW_FOR_SEARCH
7979

8080
@verified = true
8181
elsif Gem::Version.new(version) >= Gem::Version.new('7.0.0') &&
8282
Gem::Version.new(version) < Gem::Version.new('7.14-SNAPSHOT')
8383
raise Elasticsearch::NotElasticsearchError unless
84-
body.dig('version', 'tagline') == YOU_KNOW_FOR_SEARCH &&
84+
body['tagline'] == YOU_KNOW_FOR_SEARCH &&
8585
body.dig('version', 'build_flavor') == 'default'
8686

8787
@verified = true

elasticsearch/spec/unit/elasticsearch_product_validation_spec.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@ def valid_requests_and_expectations
228228
let(:body) do
229229
{
230230
'version' => {
231-
'number' => '7.4.0',
232-
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
233-
}
231+
'number' => '7.4.0'
232+
},
233+
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
234234
}.to_json
235235
end
236236

@@ -247,9 +247,9 @@ def valid_requests_and_expectations
247247
{
248248
'version' => {
249249
'number' => '7.4.0',
250-
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH,
251250
'build_flavor' => 'default'
252-
}
251+
},
252+
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
253253
}.to_json
254254
end
255255

@@ -284,9 +284,9 @@ def valid_requests_and_expectations
284284
let(:body) do
285285
{
286286
'version' => {
287-
'number' => '6.8.10',
288-
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
289-
}
287+
'number' => '6.8.10'
288+
},
289+
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
290290
}.to_json
291291
end
292292

@@ -318,9 +318,9 @@ def valid_requests_and_expectations
318318
{
319319
'version' => {
320320
'number' => '7.10.0',
321-
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH,
322321
'build_flavor' => 'default'
323-
}
322+
},
323+
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
324324
}.to_json
325325
end
326326

@@ -354,9 +354,9 @@ def valid_requests_and_expectations
354354
let(:body) do
355355
{
356356
'version' => {
357-
'number' => '7.10.0',
358-
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
359-
}
357+
'number' => '7.10.0'
358+
},
359+
'tagline' => Elasticsearch::YOU_KNOW_FOR_SEARCH
360360
}.to_json
361361
end
362362

0 commit comments

Comments
 (0)