From 5c480e118cfaf236e57b6c82d76e5a48010a2290 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 10 Dec 2015 08:47:55 -0500 Subject: [PATCH] fix x-pack compile/tests to work with https://github.com/elastic/elasticsearch/pull/15328 Squashed commit of the following: commit 54de841112778b01e817e465d2f59840970bb4f3 Author: Robert Muir Date: Thu Dec 10 08:47:12 2015 -0500 see exactly how far MessyTestPlugin can go (unit tests depend on both groovy and mustache!) commit 743b5a4e0cc9a05e307339dfcb4569feed31f337 Author: Robert Muir Date: Thu Dec 10 08:35:03 2015 -0500 fix x-pack compile/tests to work with https://github.com/elastic/elasticsearch/pull/15328 Original commit: elastic/x-pack-elasticsearch@4307bb163b6a49a05769c55e825fdc423ee65988 --- .../build.gradle | 2 ++ .../tests/IndexActionIntegrationTests.java | 2 ++ .../tests/TransformIntegrationTests.java | 2 ++ .../build.gradle | 11 +++++++ .../messy/tests}/BasicWatcherTests.java | 18 ++++++++--- .../tests}/EmailActionIntegrationTests.java | 14 +++++++- ...storyTemplateSearchInputMappingsTests.java | 17 +++++++++- .../messy/tests}/SearchInputTests.java | 17 +++++++++- .../messy/tests}/SearchTransformTests.java | 17 +++++++++- .../tests}/ShieldCachePermissionTests.java | 15 ++++++++- .../tests}/TimeThrottleIntegrationTests.java | 15 ++++++++- .../messy/tests/package-info.java | 32 +++++++++++++++++++ elasticsearch/x-pack/build.gradle | 2 ++ .../watcher/array_compare_watch/10_basic.yaml | 5 +++ 14 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 elasticsearch/qa/messy-test-xpack-with-mustache/build.gradle rename elasticsearch/{x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration => qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests}/BasicWatcherTests.java (98%) rename elasticsearch/{x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email => qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests}/EmailActionIntegrationTests.java (91%) rename elasticsearch/{x-pack/watcher/src/test/java/org/elasticsearch/watcher/history => qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests}/HistoryTemplateSearchInputMappingsTests.java (90%) rename elasticsearch/{x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/search => qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests}/SearchInputTests.java (96%) rename elasticsearch/{x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/search => qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests}/SearchTransformTests.java (97%) rename elasticsearch/{x-pack/shield/src/test/java/org/elasticsearch/integration => qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests}/ShieldCachePermissionTests.java (90%) rename elasticsearch/{x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions => qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests}/TimeThrottleIntegrationTests.java (94%) create mode 100644 elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/package-info.java diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle b/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle index 7ceedf70e28..20b32521238 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/build.gradle @@ -9,4 +9,6 @@ apply plugin: 'elasticsearch.messy-test' dependencies { testCompile project(path: ':x-plugins:elasticsearch:x-pack', configuration: 'testArtifacts') testCompile project(path: ':modules:lang-groovy', configuration: 'runtime') + // some tests depend on both groovy and mustache! this is really bad! + testCompile project(path: ':modules:lang-mustache', configuration: 'runtime') } diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIntegrationTests.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIntegrationTests.java index 719ac19ff0e..4eef0727324 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIntegrationTests.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/IndexActionIntegrationTests.java @@ -10,6 +10,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.groovy.GroovyPlugin; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.sort.SortOrder; @@ -48,6 +49,7 @@ public class IndexActionIntegrationTests extends AbstractWatcherIntegrationTestC protected List> pluginTypes() { List> types = super.pluginTypes(); types.add(GroovyPlugin.class); + types.add(MustachePlugin.class); return types; } diff --git a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIntegrationTests.java b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIntegrationTests.java index 018d5c52a4b..06de4491b59 100644 --- a/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIntegrationTests.java +++ b/elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/TransformIntegrationTests.java @@ -12,6 +12,7 @@ import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.groovy.GroovyPlugin; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.watcher.support.Script; import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; import org.elasticsearch.watcher.test.WatcherTestUtils; @@ -51,6 +52,7 @@ public class TransformIntegrationTests extends AbstractWatcherIntegrationTestCas protected List> pluginTypes() { List> types = super.pluginTypes(); types.add(GroovyPlugin.class); + types.add(MustachePlugin.class); return types; } diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/build.gradle b/elasticsearch/qa/messy-test-xpack-with-mustache/build.gradle new file mode 100644 index 00000000000..f2a8648e82e --- /dev/null +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/build.gradle @@ -0,0 +1,11 @@ + +/* + * Messy tests that depend on mustache directly. Fix these! + */ + +apply plugin: 'elasticsearch.messy-test' + +dependencies { + testCompile project(path: ':x-plugins:elasticsearch:x-pack', configuration: 'testArtifacts') + testCompile project(path: ':modules:lang-mustache', configuration: 'runtime') +} diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/BasicWatcherTests.java similarity index 98% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/BasicWatcherTests.java index 63bf65ea621..c8f3517596f 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/BasicWatcherTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.test.integration; +package org.elasticsearch.messy.tests; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.search.SearchRequest; @@ -13,12 +13,11 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.Callback; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.script.ScriptService; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.Template; -import org.elasticsearch.script.mustache.MustacheScriptEngineService; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.watcher.client.WatchSourceBuilder; import org.elasticsearch.watcher.client.WatcherClient; import org.elasticsearch.watcher.condition.compare.CompareCondition; @@ -35,6 +34,9 @@ import org.elasticsearch.watcher.trigger.schedule.support.MonthTimes; import org.elasticsearch.watcher.trigger.schedule.support.WeekTimes; import org.elasticsearch.watcher.watch.WatchStore; +import java.util.ArrayList; +import java.util.List; + import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; @@ -57,6 +59,14 @@ import static org.hamcrest.Matchers.*; */ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { + @Override + protected List> pluginTypes() { + List> types = new ArrayList<>(); + types.addAll(super.pluginTypes()); + types.add(MustachePlugin.class); + return types; + } + public void testIndexWatch() throws Exception { WatcherClient watcherClient = watcherClient(); createIndex("idx"); diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailActionIntegrationTests.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/EmailActionIntegrationTests.java similarity index 91% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailActionIntegrationTests.java rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/EmailActionIntegrationTests.java index 273d153b4cb..9c1a9489f73 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailActionIntegrationTests.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/EmailActionIntegrationTests.java @@ -3,11 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions.email; +package org.elasticsearch.messy.tests; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.watcher.actions.email.service.EmailTemplate; @@ -18,6 +20,8 @@ import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; import org.junit.After; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -47,6 +51,14 @@ public class EmailActionIntegrationTests extends AbstractWatcherIntegrationTestC public void cleanup() throws Exception { server.stop(); } + + @Override + protected List> pluginTypes() { + List> types = new ArrayList<>(); + types.addAll(super.pluginTypes()); + types.add(MustachePlugin.class); + return types; + } @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateSearchInputMappingsTests.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateSearchInputMappingsTests.java similarity index 90% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateSearchInputMappingsTests.java rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateSearchInputMappingsTests.java index 8c7413b446b..976be71675f 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateSearchInputMappingsTests.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateSearchInputMappingsTests.java @@ -3,17 +3,23 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.history; +package org.elasticsearch.messy.tests; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.watcher.execution.ExecutionState; +import org.elasticsearch.watcher.history.HistoryStore; import org.elasticsearch.watcher.test.AbstractWatcherIntegrationTestCase; import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; +import java.util.ArrayList; +import java.util.List; + import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; @@ -31,6 +37,15 @@ import static org.hamcrest.Matchers.notNullValue; * not analyzed so they can be used in aggregations */ public class HistoryTemplateSearchInputMappingsTests extends AbstractWatcherIntegrationTestCase { + + @Override + protected List> pluginTypes() { + List> types = new ArrayList<>(); + types.addAll(super.pluginTypes()); + types.add(MustachePlugin.class); + return types; + } + @Override protected boolean timeWarped() { return true; // just to have better control over the triggers diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputTests.java similarity index 96% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputTests.java index 62ed94689d5..6b6f404f96b 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.input.search; +package org.elasticsearch.messy.tests; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest; import org.elasticsearch.action.search.SearchRequest; @@ -17,7 +17,9 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.indices.query.IndicesQueriesRegistry; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.ScriptService.ScriptType; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.script.Template; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; @@ -27,6 +29,9 @@ import org.elasticsearch.watcher.actions.ExecutableActions; import org.elasticsearch.watcher.condition.always.ExecutableAlwaysCondition; import org.elasticsearch.watcher.execution.TriggeredExecutionContext; import org.elasticsearch.watcher.execution.WatchExecutionContext; +import org.elasticsearch.watcher.input.search.ExecutableSearchInput; +import org.elasticsearch.watcher.input.search.SearchInput; +import org.elasticsearch.watcher.input.search.SearchInputFactory; import org.elasticsearch.watcher.input.simple.ExecutableSimpleInput; import org.elasticsearch.watcher.input.simple.SimpleInput; import org.elasticsearch.watcher.support.init.proxy.ClientProxy; @@ -46,6 +51,7 @@ import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -68,6 +74,15 @@ import static org.joda.time.DateTimeZone.UTC; */ @ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, numDataNodes = 1) public class SearchInputTests extends ESIntegTestCase { + + @Override + protected Collection> nodePlugins() { + Collection> types = new ArrayList<>(); + types.addAll(super.nodePlugins()); + types.add(MustachePlugin.class); + return types; + } + private final static String TEMPLATE_QUERY = "{\"query\":{\"filtered\":{\"query\":{\"match\":{\"event_type\":{\"query\":\"a\"," + "\"type\":\"boolean\"}}},\"filter\":{\"range\":{\"_timestamp\":" + "{\"from\":\"{{ctx.trigger.scheduled_time}}||-{{seconds_param}}\",\"to\":\"{{ctx.trigger.scheduled_time}}\"," + diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformTests.java similarity index 97% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformTests.java index 0f66815ba2e..4a137e0c68c 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.transform.search; +package org.elasticsearch.messy.tests; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest; import org.elasticsearch.action.search.SearchRequest; @@ -23,7 +23,9 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.query.IndicesQueriesRegistry; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.ScriptService.ScriptType; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.script.Template; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; @@ -39,6 +41,9 @@ import org.elasticsearch.watcher.support.init.proxy.ClientProxy; import org.elasticsearch.watcher.support.text.TextTemplate; import org.elasticsearch.watcher.transform.Transform; import org.elasticsearch.watcher.transform.TransformBuilders; +import org.elasticsearch.watcher.transform.search.ExecutableSearchTransform; +import org.elasticsearch.watcher.transform.search.SearchTransform; +import org.elasticsearch.watcher.transform.search.SearchTransformFactory; import org.elasticsearch.watcher.trigger.schedule.IntervalSchedule; import org.elasticsearch.watcher.trigger.schedule.ScheduleTrigger; import org.elasticsearch.watcher.trigger.schedule.ScheduleTriggerEvent; @@ -55,6 +60,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -88,6 +94,15 @@ import static org.joda.time.DateTimeZone.UTC; */ @ClusterScope(scope = SUITE, numClientNodes = 0, transportClientRatio = 0, randomDynamicTemplates = false, numDataNodes = 1) public class SearchTransformTests extends ESIntegTestCase { + + @Override + protected Collection> nodePlugins() { + Collection> types = new ArrayList<>(); + types.addAll(super.nodePlugins()); + types.add(MustachePlugin.class); + return types; + } + @Override public Settings nodeSettings(int nodeOrdinal) { final Path tempDir = createTempDir(); diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/integration/ShieldCachePermissionTests.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/ShieldCachePermissionTests.java similarity index 90% rename from elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/integration/ShieldCachePermissionTests.java rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/ShieldCachePermissionTests.java index 85b636749b7..89ea309c3b9 100644 --- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/integration/ShieldCachePermissionTests.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/ShieldCachePermissionTests.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.integration; +package org.elasticsearch.messy.tests; import org.elasticsearch.Version; import org.elasticsearch.action.index.IndexRequest; @@ -11,8 +11,10 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.cache.query.terms.TermsLookup; +import org.elasticsearch.plugins.Plugin; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.Template; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.script.mustache.MustacheScriptEngineService; import org.elasticsearch.shield.authc.support.SecuredString; import org.elasticsearch.test.ShieldIntegTestCase; @@ -20,14 +22,25 @@ import org.elasticsearch.test.ShieldSettingsSource; import org.junit.Before; import org.junit.BeforeClass; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import static org.elasticsearch.shield.authc.support.UsernamePasswordToken.basicAuthHeaderValue; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; +@ShieldIntegTestCase.AwaitsFix(bugUrl = "clean up test to not use mustache templates, otherwise needs many resources here") public class ShieldCachePermissionTests extends ShieldIntegTestCase { static final String READ_ONE_IDX_USER = "read_user"; + + @Override + protected Collection> nodePlugins() { + Collection> types = new ArrayList<>(); + types.addAll(super.nodePlugins()); + types.add(MustachePlugin.class); + return types; + } @Override public String configUsers() { diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/TimeThrottleIntegrationTests.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/TimeThrottleIntegrationTests.java similarity index 94% rename from elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/TimeThrottleIntegrationTests.java rename to elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/TimeThrottleIntegrationTests.java index 64ba8bc7912..c2e2479ea66 100644 --- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/TimeThrottleIntegrationTests.java +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/TimeThrottleIntegrationTests.java @@ -3,11 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.watcher.actions; +package org.elasticsearch.messy.tests; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.common.unit.TimeValue; +import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.script.mustache.MustachePlugin; import org.elasticsearch.watcher.client.WatcherClient; import org.elasticsearch.watcher.condition.compare.CompareCondition; import org.elasticsearch.watcher.execution.ExecutionState; @@ -18,6 +20,8 @@ import org.elasticsearch.watcher.transport.actions.put.PutWatchResponse; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.TimeUnit; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; @@ -36,6 +40,15 @@ import static org.hamcrest.Matchers.is; /** */ public class TimeThrottleIntegrationTests extends AbstractWatcherIntegrationTestCase { + + @Override + protected List> pluginTypes() { + List> types = new ArrayList<>(); + types.addAll(super.pluginTypes()); + types.add(MustachePlugin.class); + return types; + } + private IndexResponse indexTestDoc() { createIndex("actions", "events"); ensureGreen("actions", "events"); diff --git a/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/package-info.java b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/package-info.java new file mode 100644 index 00000000000..ef824b701fc --- /dev/null +++ b/elasticsearch/qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/package-info.java @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/** + * This package contains tests that use mustache to test what looks + * to be unrelated functionality, or functionality that should be + * tested with a mock instead. Instead of doing an epic battle + * with these tests, they are temporarily moved here to the mustache + * module's tests, but that is likely not where they belong. Please + * help by cleaning them up and we can remove this package! + * + *
    + *
  • If the test is testing templating integration with another core subsystem, + * fix it to use a mock instead, so it can be in the core tests again
    • + *
  • If the test is just being lazy, and does not really need templating to test + * something, clean it up!
    • + *
+ */ + +// renames that took place: +// renamed: x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/BasicWatcherTests.java -> qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/BasicWatcherTests.java +// renamed: x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/email/EmailActionIntegrationTests.java -> qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/EmailActionIntegrationTests.java +// renamed: x-pack/watcher/src/test/java/org/elasticsearch/watcher/history/HistoryTemplateSearchInputMappingsTests.java -> qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/HistoryTemplateSearchInputMappingsTests.java +// renamed: x-pack/watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java -> qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchInputTests.java +// renamed: x-pack/watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java -> qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/SearchTransformTests.java +// renamed: x-pack/shield/src/test/java/org/elasticsearch/integration/ShieldCachePermissionTests.java -> qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/ShieldCachePermissionTests.java +// renamed: x-pack/watcher/src/test/java/org/elasticsearch/watcher/actions/TimeThrottleIntegrationTests.java -> qa/messy-test-xpack-with-mustache/src/test/java/org/elasticsearch/messy/tests/TimeThrottleIntegrationTests.java + +package org.elasticsearch.messy.tests; diff --git a/elasticsearch/x-pack/build.gradle b/elasticsearch/x-pack/build.gradle index f3dbd004d1b..1f2e7a11f6e 100644 --- a/elasticsearch/x-pack/build.gradle +++ b/elasticsearch/x-pack/build.gradle @@ -33,6 +33,8 @@ dependencies { compile 'com.google.guava:guava:16.0.1' // needed by watcher and shield tests for jimfs compile 'com.google.code.findbugs:jsr305:3.0.1' // TODO: remove this compile 'com.sun.mail:javax.mail:1.5.3' + // fork of mustache: https://github.com/elastic/x-plugins/issues/1116 + compile 'com.github.spullara.mustache.java:compiler:0.9.1' // TODO: remove this testCompile 'org.subethamail:subethasmtp:3.1.7' // common test deps diff --git a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml index 528a55abc33..5a2b6734c52 100644 --- a/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml +++ b/elasticsearch/x-pack/watcher/src/test/resources/rest-api-spec/test/watcher/array_compare_watch/10_basic.yaml @@ -1,5 +1,10 @@ --- "Basic array_compare watch": + + - skip: + version: " - " + reason: Remove direct dependency on mustache (or at least it should be using xmustache!!!!) + - do: cluster.health: wait_for_status: yellow