Colin Goodheart-Smithe
b008a4de74
fixes package declarations in security tests
...
Original commit: elastic/x-pack-elasticsearch@09ed28aee3
2016-07-04 10:28:13 +01:00
Nik Everett
98f34c1120
Handle core removing addField
...
It is addStoredField now.
Original commit: elastic/x-pack-elasticsearch@c42c18894f
2016-07-04 09:36:36 +02:00
Ryan Ernst
03cbf82101
Remove WatcherSettingsValidation service
...
This looks like it predates settings validation in core, and only had a
single use inside the watcher ExecutionService. This change moves the
settings inside ExecutionService to be validated settings, and removes
the watcher specific validation.
Original commit: elastic/x-pack-elasticsearch@82843ce56c
2016-07-02 15:51:09 -07:00
Shaunak Kashyap
2ab082c0fe
Merge branch 'master' into license-checking/reporting-ux
...
Original commit: elastic/x-pack-elasticsearch@be886ba2a4
2016-07-01 18:00:26 -07:00
Ryan Ernst
d6ff6211eb
Merge pull request elastic/elasticsearch#2685 from rjernst/uninject_htmlsanitizer
...
Uninject HtmlSanitizer
Original commit: elastic/x-pack-elasticsearch@4a6c8cdee6
2016-07-01 16:26:57 -07:00
Ryan Ernst
8bcfbcf0af
Merge pull request elastic/elasticsearch#2689 from rjernst/we_dont_need_generics
...
Removed generics from LifecycleComponent
Original commit: elastic/x-pack-elasticsearch@d14b647bfd
2016-07-01 16:25:39 -07:00
Ryan Ernst
9f52066bdb
Removed generics from LifecycleComponent
...
This is the xplugins side of elastic/elasticsearch#19225
Original commit: elastic/x-pack-elasticsearch@845a945552
2016-07-01 16:23:13 -07:00
Ryan Ernst
09c8418a50
Fix xpack tests with node info ctor changes
...
Original commit: elastic/x-pack-elasticsearch@c741a2d231
2016-07-01 14:15:19 -07:00
Ryan Ernst
36a8c24b6b
Uninject HtmlSanitizer
...
This is just a utility used by the email action and does not need to be
injected.
Original commit: elastic/x-pack-elasticsearch@4555db634c
2016-07-01 13:45:16 -07:00
Joe Fleming
e12b87059a
Merge pull request elastic/elasticsearch#2559 from w33ble/reporting-controls
...
Reporting navmenu controls
Original commit: elastic/x-pack-elasticsearch@60a1d28c83
2016-07-01 11:39:05 -07:00
Tanguy Leroux
561fc86585
Fix checkstyle violations
...
Original commit: elastic/x-pack-elasticsearch@187f1cbd35
2016-07-01 17:13:08 +02:00
Tanguy Leroux
17684f1e76
Fix order of modifiers
...
Original commit: elastic/x-pack-elasticsearch@1f970e78ba
2016-07-01 16:54:53 +02:00
Simon Willnauer
158a6b5588
Cleanup BytesRefrence interface ( elastic/elasticsearch#2670 )
...
This is a followup of elastic/elasticsearchelastic/elasticsearch#19196
Original commit: elastic/x-pack-elasticsearch@1d0398e89a
2016-07-01 16:09:53 +02:00
Alexander Reelsen
6527683e48
Licensing: Return HTTP 403 forbidden instead of 401 in exception ( elastic/elasticsearch#2673 )
...
When a license exception is raised, we returned 401 as HTTP error code
in there. However this seems to have triggered some browsers to actually
ask for login credentials, which wont have any impact here.
Closes elastic/elasticsearch#1863
Original commit: elastic/x-pack-elasticsearch@cc63abdac8
2016-07-01 14:32:42 +02:00
Luca Cavanna
de124baf8d
Merge pull request elastic/elasticsearch#2616 from javanna/test/nuke_response_body_assertion
...
Consolidate docs snippets testing in our REST test infra
Original commit: elastic/x-pack-elasticsearch@983ab207bf
2016-07-01 12:09:05 +02:00
javanna
4eb21f4c01
[TEST] eagerly parse response body at ObjectPath initialization and read content type from response headers
...
We are going to parse the body anyways whenever it's in json format as it is going to be stashed. It is not useful to lazily parse it anymore. Also this allows us to not rely on automatic detection of the xcontent type based on the content of the response, but rather read the content type from the response headers.
Original commit: elastic/x-pack-elasticsearch@11be4684ae
2016-07-01 09:49:47 +02:00
javanna
579baa2bca
[TEST] make JsonPath independent of data format, rename to ObjectPath
...
The internal representation of the object that JsonPath gives access to is a map. That is independent of the initial input format, which is json but could also be yaml etc.
This commit renames JsonPath to ObjectPath and adds a static method to create an ObjectPath from an XContent
Original commit: elastic/x-pack-elasticsearch@bc84c68161
2016-07-01 09:49:47 +02:00
Ryan Ernst
8d6d96d2f8
Merge pull request elastic/elasticsearch#2658 from rjernst/rest_handler_client
...
Change rest handler interface to use NodeClient
Original commit: elastic/x-pack-elasticsearch@82da58cc0c
2016-06-30 11:00:14 -07:00
Tim Sullivan
21020da149
Merge pull request elastic/elasticsearch#2593 from tsullivan/ui-exclude-browsertests
...
ui: exclude browser tests from build
Original commit: elastic/x-pack-elasticsearch@1ddaf4a9d3
2016-06-30 09:29:18 -07:00
Tim Sullivan
6c1d20cf95
Merge pull request elastic/elasticsearch#2586 from tsullivan/monitoring-ui-fix-fielddata-label
...
monitoring ui: label fix: Fielddata terminology
Original commit: elastic/x-pack-elasticsearch@3fa4e8705a
2016-06-30 09:29:00 -07:00
Tim Sullivan
4d93aa5bab
Merge pull request elastic/elasticsearch#2582 from tsullivan/monitoring-ui-check-multicluster-mode
...
monitoring ui: check if current license is basic and multi-cluster monitoring should be restricted
Original commit: elastic/x-pack-elasticsearch@f445fcb621
2016-06-30 09:28:53 -07:00
Tim Sullivan
f0126e3125
Merge pull request elastic/elasticsearch#2547 from tsullivan/monitoring-ui-calculateIndices-handle404
...
Monitoring ui calculate indices handle404
Original commit: elastic/x-pack-elasticsearch@c44c1c3e88
2016-06-30 09:28:39 -07:00
Jay Modi
060120b53d
Merge pull request elastic/elasticsearch#2660 from jaymode/rest_test_teardown
...
test: move teardown logic into the rest tests
Original commit: elastic/x-pack-elasticsearch@81a273a4c7
2016-06-30 12:03:07 -04:00
Boaz Leskes
7c1bc0c8de
adapt randomFrom to not use null as a first param, in preparation for https://github.com/elastic/elasticsearch/pull/19172
...
Original commit: elastic/x-pack-elasticsearch@50296d6cfc
2016-06-30 17:55:17 +02:00
Lee Hinman
8c54887ab8
Merge remote-tracking branch 'dakrone/migrate-tool-master'
...
Original commit: elastic/x-pack-elasticsearch@ce82529d4b
2016-06-30 09:53:52 -06:00
jaymode
4999f3a38c
test: remove unnecessary teardown section in license test
...
Original commit: elastic/x-pack-elasticsearch@b457404452
2016-06-30 11:39:37 -04:00
Lee Hinman
238eed2075
Throw correct exception type, reduce boilerplate in boolean statement
...
Original commit: elastic/x-pack-elasticsearch@1e33c4d8f2
2016-06-30 09:34:08 -06:00
Ryan Ernst
82e4330e87
Merge branch 'master' into rest_handler_client
...
Original commit: elastic/x-pack-elasticsearch@7fcc120767
2016-06-30 08:16:50 -07:00
jaymode
d1b945d1f2
security: remove user/role deletion logic in XPackRestTestCase
...
Original commit: elastic/x-pack-elasticsearch@d6064e520a
2016-06-30 11:15:05 -04:00
Karel Minarik
67706a9a19
[SECURITY] Changed the setup/teardown YAML structure in the integration test for roles
...
Related: 176fd6a
Original commit: elastic/x-pack-elasticsearch@90e210dbc2
2016-06-30 11:15:05 -04:00
Karel Minarik
6d535043f8
[SECURITY] Added a `teardown` section to the integration test for roles
...
Currently, the REST tests for security (and possibly others) don't clean up the environment
after they have run, eg. they don't delete the users and roles they create. This leads to
test failures, because in a subsequent run, a user or role already exists, so eg. a test
like `match: { role: { created: true } }` fails.
This patch adds a `teardown` section to the test, with `do` actions which are to be
executed _after_ the test runs.
This patch assumes that REST tests runners for all languages support the `teardown` directive
in a xUnimt nomenclature -- similarly to the `setup` directive, which they already support.
Original commit: elastic/x-pack-elasticsearch@70d0ff4ee9
2016-06-30 11:15:05 -04:00
Simon Willnauer
30dd9ab09c
Follup PR fore elastic/elasticsearchelastic/elasticsearch#19096 ( elastic/elasticsearch#2656 )
...
This PR is a cleanup / follup for elastic/elasticsearchelastic/elasticsearch#19096
Original commit: elastic/x-pack-elasticsearch@052b9a85a7
2016-06-30 13:42:09 +02:00
Martijn van Groningen
7c988b78e1
test: test that DLS is applied before FLS
...
Original commit: elastic/x-pack-elasticsearch@c7c12cc8d6
2016-06-30 12:32:37 +02:00
Ryan Ernst
b513f2bb6b
Merge branch 'master' into script_service_deps
...
Original commit: elastic/x-pack-elasticsearch@d4269e190d
2016-06-29 23:35:29 -07:00
Shaunak Kashyap
3ae999bf41
Merge branch 'master' into license-checking/reporting-ux
...
Original commit: elastic/x-pack-elasticsearch@b4c892a0c9
2016-06-29 17:57:31 -07:00
Ryan Ernst
0fcb52a794
Merge branch 'master' into rest_handler_client
...
Original commit: elastic/x-pack-elasticsearch@429edeea84
2016-06-29 17:03:27 -07:00
Ryan Ernst
7822f28d7b
Simplify rest handler constructors
...
This is the xplugins side of moving the client dependency for rest
handlers to the handleRequest method
Original commit: elastic/x-pack-elasticsearch@ce66e35e7b
2016-06-29 16:30:55 -07:00
Nik Everett
672d91f2a4
Move rest handler registration to ActionPlugin
...
Original commit: elastic/x-pack-elasticsearch@b3bc7d4a9f
2016-06-29 18:32:58 -04:00
Lee Hinman
92637d2eec
Use client http ssl settings if applicable
...
Original commit: elastic/x-pack-elasticsearch@c74116d40a
2016-06-29 15:00:39 -06:00
Shaunak Kashyap
8910aa0db1
Merge pull request elastic/elasticsearch#2612 from ycombinator/fix-util-function
...
Fix util function
Original commit: elastic/x-pack-elasticsearch@8bc1a2cd63
2016-06-29 13:26:19 -07:00
Shaunak Kashyap
62898d12dd
Merge branch 'master' into license-checking/reporting-ux
...
Original commit: elastic/x-pack-elasticsearch@f2ed9c8792
2016-06-29 10:19:38 -07:00
Shaunak Kashyap
c38a8d81c1
Merge branch 'master' into license-checking/reporting-ux
...
Original commit: elastic/x-pack-elasticsearch@f986fe757b
2016-06-29 10:18:47 -07:00
Lee Hinman
4d7d9ad5b9
get the SSL status from the node settings
...
Original commit: elastic/x-pack-elasticsearch@6fff3e6ce1
2016-06-29 10:07:23 -06:00
Lee Hinman
27fb1e036e
switch to RoleDescriptor jsonification, rename esusersSettings -> fileRealmSettings
...
Original commit: elastic/x-pack-elasticsearch@a7181a329a
2016-06-29 09:56:52 -06:00
jaymode
b06249279e
security: REST spec cleanup and authenticate tests create user
...
This change cleans up the rest API specs and changes the documentation field to a link. Additionally,
the integration tests for xpack now use the elastic user rather than a dummy user from a file realm.
Closes elastic/elasticsearch#2458
Closes elastic/elasticsearch#2437
Original commit: elastic/x-pack-elasticsearch@8059a0d856
2016-06-29 11:42:44 -04:00
Lee Hinman
b4c19734ac
Fail hard if retrieving user/role fails or adding user/role fails
...
Original commit: elastic/x-pack-elasticsearch@d641dab31c
2016-06-29 09:37:59 -06:00
Lee Hinman
24d7472cea
Fix compilation for missing client
...
Original commit: elastic/x-pack-elasticsearch@586c5d0716
2016-06-29 09:37:47 -06:00
Lee Hinman
db39da77c5
Merge remote-tracking branch 'origin/master' into migrate-tool-master
...
Original commit: elastic/x-pack-elasticsearch@eaa4b2923f
2016-06-29 09:30:07 -06:00
Lee Hinman
ca1d92409f
Move setup into a @Before method
...
Original commit: elastic/x-pack-elasticsearch@21b8cb5be3
2016-06-29 09:29:46 -06:00
Lee Hinman
26000c324d
Move comment to be in correct place
...
Original commit: elastic/x-pack-elasticsearch@51fb594e9b
2016-06-29 09:29:38 -06:00