Commit Graph

1721 Commits

Author SHA1 Message Date
Martijn van Groningen 125a5256c9 test: if minimum performed actions count validation fails, then print out the last checked search response
Original commit: elastic/x-pack-elasticsearch@5723adc774
2015-07-09 12:50:16 +02:00
Robert Muir f7046efd48 use java.io.tmpdir for the GET hack
Original commit: elastic/x-pack-elasticsearch@ed63b5add8
2015-07-09 02:56:41 -04:00
Robert Muir bdb36263b3 get ES server started and stopped with shield... but many problems
Original commit: elastic/x-pack-elasticsearch@c6b6bc4c10
2015-07-09 02:48:45 -04:00
Robert Muir 7afd454663 adapt to bin/plugin changes for es plugins
Original commit: elastic/x-pack-elasticsearch@1a43ef87e0
2015-07-09 01:18:31 -04:00
Robert Muir f0e02fd020 Add integration test phase to watcher build.
Integration tests unzip elasticsearch.zip, install the license and watcher plugins with bin/plugin,
starts up es with bin/elasticsearch, runs rest tests, then shuts down es.

They are run during `mvn verify` phase.

Original commit: elastic/x-pack-elasticsearch@f75a036fe5
2015-07-09 00:40:11 -04:00
Robert Muir cd11520326 Merge pull request elastic/elasticsearch#62 from rmuir/plugin-zip
make .zip a maven artifact / remove custom assembly logic

Original commit: elastic/x-pack-elasticsearch@baba4d82b2
2015-07-08 23:57:06 -04:00
Robert Muir f070e19fb0 remove custom assembly logic
Original commit: elastic/x-pack-elasticsearch@4dc9f44994
2015-07-08 23:45:53 -04:00
Brian Murphy 7b386daf38 [TEST] Fix store tests to use new ShardRouting APIs
This change bring watcher back in line with ES master and the ShardRouting changes.

Original commit: elastic/x-pack-elasticsearch@211196eb04
2015-07-08 11:00:10 -04:00
Martijn van Groningen 6d80d1b0ad test: enabled the slf4j logging for subethamail smtp server to see what is failing here
Original commit: elastic/x-pack-elasticsearch@6c4b1096f9
2015-07-08 11:04:29 +02:00
Robert Muir 1d0d30538d Disable integ test until we fix it to install license-plugin
Original commit: elastic/x-pack-elasticsearch@25f5d96b71
2015-07-08 03:23:49 -04:00
Areek Zillur ebd9bf1d2c fold core-shaded module into core
Original commit: elastic/x-pack-elasticsearch@90af059f72
2015-07-07 23:41:16 -04:00
Areek Zillur bd416b7a73 Add basic license integ test
Original commit: elastic/x-pack-elasticsearch@248f2a745d
2015-07-07 19:32:14 -04:00
Martijn van Groningen 74d178cfbe wait for put index template call to return when executed during startup, otherwise don't wait.
Original commit: elastic/x-pack-elasticsearch@689d071b4a
2015-07-08 00:20:03 +02:00
Areek Zillur d54cf876cb skip integ tests for non-plugin modules
Original commit: elastic/x-pack-elasticsearch@99c59300f1
2015-07-07 18:02:30 -04:00
Areek Zillur 9dce8b3411 ensure distribution has all jars
Original commit: elastic/x-pack-elasticsearch@74180cd386
2015-07-07 17:53:41 -04:00
Martijn van Groningen 7f13e2ff06 test: improve index template check
Original commit: elastic/x-pack-elasticsearch@7dbf41b8b5
2015-07-07 23:21:22 +02:00
jaymode 7d61e0f098 fix jar hell by removing shading and packaging jars into zip
Original commit: elastic/x-pack-elasticsearch@9e0f541a83
2015-07-07 13:55:02 -04:00
jaymode 84846cce1d fix building of shaded jar and zip
Original commit: elastic/x-pack-elasticsearch@4fc1f08d07
2015-07-07 11:07:59 -04:00
Robert Muir 47ab3cc244 enable integration tests and fix groupids
Original commit: elastic/x-pack-elasticsearch@34530b48fd
2015-07-07 10:17:02 -04:00
Robert Muir e09806e21e Merge pull request elastic/elasticsearch#962 from rmuir/integ_testing
Get basic integ test working... fixes broken groupids etc.

Original commit: elastic/x-pack-elasticsearch@7d0262c29a
2015-07-07 09:50:30 -04:00
Robert Muir 23190e4aff Get basic integ test working... fixes broken groupids etc.
Note currently this just installs the plugin. we need to add some
more logic to really get some kind of integ test working with rest tests.
e.g. we need to install the license plugin. I will look into this as a followup.

Original commit: elastic/x-pack-elasticsearch@ebc507a1fb
2015-07-07 09:42:12 -04:00
jaymode af377e6608 re-enable rest tests
Original commit: elastic/x-pack-elasticsearch@145d449099
2015-07-07 09:34:51 -04:00
Martijn van Groningen 28e384d104 When Watcher starts verify that all index templates have been added, otherwise add the index templates
There maybe a small window of time just after Watcher has started that the index templates don't exist.

Original commit: elastic/x-pack-elasticsearch@9af3018be4
2015-07-07 14:09:03 +02:00
Martijn van Groningen 01fd8496c6 test: store triggered watch events belonging to multipel watches, so that during startup the triggered watch executions can be paralyzed.
Also increased the maximum time to wait

Original commit: elastic/x-pack-elasticsearch@142ed0a810
2015-07-07 12:54:13 +02:00
Brian Murphy 12de46e2d4 [TEST] Add logging to determine if ticker thread is being stopped correctly.
Added some trace logging and set the WatcherStatsTest to trace watcher to try and figure out why the ticker isn't stopping.

Original commit: elastic/x-pack-elasticsearch@75dc936165
2015-07-03 23:26:47 +02:00
Brian Murphy 3051cca896 Change manual stop semantics.
This change sets the manually stopped flag even if manual stop is requested but the watcher is not started.
Also clears the manually stopped flag if a manual start is initiated.

Original commit: elastic/x-pack-elasticsearch@6d5fd897ba
2015-07-03 23:21:15 +02:00
uboness 287a612179 Cleanup exceptions
Remove all watcher specific/custom exceptions. We're now reusing the standard exceptions used in core.

Original commit: elastic/x-pack-elasticsearch@26090ff6ef
2015-07-03 21:12:33 +02:00
uboness bca8f140c2 disabling rest tests
first focusing on getting a successful build without them

Original commit: elastic/x-pack-elasticsearch@cfc1e97c43
2015-07-03 20:38:19 +02:00
uboness 7350301792 Continued removing custom exceptions
- Removed `AuthorizationException` and `AuthenticationException`, both were replaced by the std `ElasticsearchSecurityException`.
- Added utility class `Exceptions` to help create authorization/authentication exceptions.
- Added a utility class `ShieldTestsUtils` that provides methods for asserting authentication/authorization exceptions

Original commit: elastic/x-pack-elasticsearch@b59360ebc7
2015-07-03 20:02:39 +02:00
jaymode a3a04a7d1d cleanup the exceptions used by Shield to only the ones in core
Original commit: elastic/x-pack-elasticsearch@5424fe68fa
2015-07-03 20:01:41 +02:00
uboness eec962f7f8 Changed the license expiration exception to ElasticsearchSecurityException
We'd like to have an UNAUTHORIZED behaviour when the license is expired

Original commit: elastic/x-pack-elasticsearch@f46a92b6f8
2015-07-03 16:01:08 +02:00
uboness 792359103d Removed LicenseExpiredException
This exception was removed from the license plugin. We use `ElasticsearchException` instead with `es.license.expired.feature` header to hold the expired feature. We use `LicenseUtils.newExpirationException` to create and throw the proper exception.

Original commit: elastic/x-pack-elasticsearch@5e722be1cc
2015-07-03 02:54:54 +02:00
Areek Zillur e0e4f07348 Replace LicenseExpiredException with ElasticsearchException.WithRestHeadersException
Original commit: elastic/x-pack-elasticsearch@36aaccc0b9
2015-07-02 18:25:13 -04:00
Martijn van Groningen f620907939 Fix compile errors due to the ParseFieldMatcher change in core (PR elastic/elasticsearch#11859)
Original commit: elastic/x-pack-elasticsearch@cccc6dcee2
2015-07-03 00:07:08 +02:00
Martijn van Groningen f58af85631 Fix WatcherF to work due to the recent upstream changes.
Original commit: elastic/x-pack-elasticsearch@cb91fd9e9f
2015-07-03 00:07:08 +02:00
Martijn van Groningen 122be138d7 build: remove Groovy dependency because it is already provided in the parent pom
Original commit: elastic/x-pack-elasticsearch@80e9ffb9fa
2015-07-03 00:07:08 +02:00
Konrad Beiske 31e2516fd6 Changed to depend only on license-plugin-api in main scope
Original commit: elastic/x-pack-elasticsearch@e508b73033
2015-07-02 11:04:29 -04:00
Konrad Beiske c9aba06721 Merge pull request elastic/elasticsearch#945 from elastic/beiske-attach-zip-assembly
Attach zip assembly as artifact to build when deploying internally

Original commit: elastic/x-pack-elasticsearch@851687bc88
2015-07-02 16:26:49 +02:00
jaymode e5cd37a9af move the core artifact to provided scope
The license core artifact is currently marked as a compile dependency but it also
shaded into the plugin jar file. This causes issues because we have the same class
in multiple jars. To workaround this, the core artifact is marked as provided so that
it is not included in the published pom file.

Closes elastic/elasticsearch#54

Original commit: elastic/x-pack-elasticsearch@0d786cb965
2015-07-02 10:25:13 -04:00
Konrad Beiske 44909bdcd6 Attach zip assembly as artifact to build when deploying internally
Attaching the zip assembly as an artifact to the build will include it when deploying to maven repositories. This will in turn facilitate testing Elasticsearch snapshot versions in a Found environment. We need to to that in order to cut down the delay from a release is made until it is available on Found.

Original commit: elastic/x-pack-elasticsearch@27516c7243
2015-07-02 16:18:03 +02:00
Konrad Beiske ba9202a5de Merge pull request elastic/elasticsearch#51 from elastic/plugin-api
Refactored api for plugins into it's own module

Original commit: elastic/x-pack-elasticsearch@8136be7e53
2015-07-02 15:19:15 +02:00
Konrad Beiske 7975e56f1e Merge branch 'master' into plugin-api
Includes porting changes made to LicenseVersion in master

Original commit: elastic/x-pack-elasticsearch@2d9919487e
2015-07-02 14:43:01 +02:00
Brian Murphy a3c5292b24 [TEST] Clean up watch created by stats test.
This may have resulted in a watch being run during shutdown.

Original commit: elastic/x-pack-elasticsearch@2631690f1a
2015-07-01 13:51:09 -04:00
jaymode b7133a516a awaits fix for another test failing due to exception serialization changes
Original commit: elastic/x-pack-elasticsearch@9585a3647b
2015-07-01 09:37:47 -04:00
jaymode b3cd671d45 add awaits fix for exception serialization issue
Original commit: elastic/x-pack-elasticsearch@6c9e993a62
2015-06-30 18:55:39 -04:00
jaymode 2d71019df9 mute tests that rely on ShieldException serialization
See elastic/elasticsearch#947

Original commit: elastic/x-pack-elasticsearch@28a69c3193
2015-06-30 18:26:45 -04:00
jaymode aef47ecc47 mute the render_search_template rest tests for now
These tests trip a Shield assertion. Need to look into how to proceed in detail.

See elastic/elasticsearch#946

Original commit: elastic/x-pack-elasticsearch@b5027ce105
2015-06-30 18:25:42 -04:00
jaymode ed0aea1311 add new action and handlers from core
Original commit: elastic/x-pack-elasticsearch@457055e5d2
2015-06-30 17:57:07 -04:00
Martijn van Groningen 1fffcc9666 fix compile error due to a rename in core
Original commit: elastic/x-pack-elasticsearch@03c9032c8b
2015-06-30 18:12:25 +02:00
Konrad Beiske f3befde555 Removed unnecessary comment blocks
Original commit: elastic/x-pack-elasticsearch@fc38cc1c30
2015-06-30 14:52:51 +02:00