-
Notifications
You must be signed in to change notification settings - Fork 8.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Configurable headers for all elasticsearch requests #7996
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
src/core_plugins/elasticsearch/lib/__tests__/set_headers.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
import expect from 'expect.js'; | ||
import sinon from 'sinon'; | ||
import setHeaders from '../set_headers'; | ||
|
||
describe('plugins/elasticsearch', function () { | ||
describe('lib/set_headers', function () { | ||
it('throws if not given an object as the first argument', function () { | ||
const fn = () => setHeaders(null, {}); | ||
expect(fn).to.throwError(); | ||
}); | ||
|
||
it('throws if not given an object as the second argument', function () { | ||
const fn = () => setHeaders({}, null); | ||
expect(fn).to.throwError(); | ||
}); | ||
|
||
it('returns a new object', function () { | ||
const originalHeaders = {}; | ||
const newHeaders = {}; | ||
const returnedHeaders = setHeaders(originalHeaders, newHeaders); | ||
expect(returnedHeaders).not.to.be(originalHeaders); | ||
expect(returnedHeaders).not.to.be(newHeaders); | ||
}); | ||
|
||
it('returns object with newHeaders merged with originalHeaders', function () { | ||
const originalHeaders = { foo: 'bar' }; | ||
const newHeaders = { one: 'two' }; | ||
const returnedHeaders = setHeaders(originalHeaders, newHeaders); | ||
expect(returnedHeaders).to.eql({ foo: 'bar', one: 'two' }); | ||
}); | ||
|
||
it('returns object where newHeaders takes precedence for any matching keys', function () { | ||
const originalHeaders = { foo: 'bar' }; | ||
const newHeaders = { one: 'two', foo: 'notbar' }; | ||
const returnedHeaders = setHeaders(originalHeaders, newHeaders); | ||
expect(returnedHeaders).to.eql({ foo: 'notbar', one: 'two' }); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import { isPlainObject } from 'lodash'; | ||
|
||
export default function setHeaders(originalHeaders, newHeaders) { | ||
if (!isPlainObject(originalHeaders)) { | ||
throw new Error(`Expected originalHeaders to be an object, but ${typeof originalHeaders} given`); | ||
} | ||
if (!isPlainObject(newHeaders)) { | ||
throw new Error(`Expected newHeaders to be an object, but ${typeof newHeaders} given`); | ||
} | ||
|
||
return { | ||
...originalHeaders, | ||
...newHeaders | ||
}; | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly curious: what was your rationale behind creating
setHeaders
as opposed to using something like_.merge
here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the object checks and such, it seemed like a bit too much logic to dump directly into map_uri, which is already juggling a couple of responsibilities.