diff --git a/dev-tools/smoke_test_xpack_rc.py b/dev-tools/smoke_test_xpack_rc.py index a368e9caa38..eb9918d0312 100644 --- a/dev-tools/smoke_test_xpack_rc.py +++ b/dev-tools/smoke_test_xpack_rc.py @@ -111,7 +111,7 @@ def smoke_test_release(release, files, release_hash): print(' Starting elasticsearch daemon from [%s]' % es_dir) try: - run('%s; %s -Enode.name=smoke_tester -Ecluster.name=prepare_release -Escript.inline=true -Escript.stored=true -Erepositories.url.allowed_urls=http://snapshot.test* %s -Epidfile=%s -Enode.portsfile=true' + run('%s; %s -Enode.name=smoke_tester -Ecluster.name=prepare_release -Erepositories.url.allowed_urls=http://snapshot.test* %s -Epidfile=%s -Enode.portsfile=true' % (java_exe(), es_run_path, '-d', os.path.join(es_dir, 'es-smoke.pid'))) if not wait_for_node_startup(es_dir, headers=headers): print("elasticsearch logs:") diff --git a/docs/build.gradle b/docs/build.gradle index d3a75dea1c7..ef79274b884 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -144,7 +144,6 @@ Closure waitWithAuth = { NodeInfo node, AntBuilder ant -> integTestCluster { plugin ':x-pack-elasticsearch:plugin' - setting 'script.inline', 'true' setupCommand 'setupTestAdmin', 'bin/x-pack/users', 'useradd', 'test_admin', '-p', 'changeme', '-r', 'superuser' waitCondition = waitWithAuth diff --git a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java index e2b018975cb..8dfa0ea76a9 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java @@ -29,7 +29,6 @@ public class MonitoringF { public static void main(String[] args) throws Throwable { Settings.Builder settings = Settings.builder(); - settings.put("script.inline", "true"); settings.put("security.manager.enabled", "false"); settings.put("cluster.name", MonitoringF.class.getSimpleName()); settings.put("xpack.monitoring.collection.interval", "1s"); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/security/SecurityF.java b/plugin/src/test/java/org/elasticsearch/xpack/security/SecurityF.java index 6e45f81aedd..52d0c0cc486 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/security/SecurityF.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/security/SecurityF.java @@ -38,7 +38,6 @@ public class SecurityF { Settings.Builder settings = Settings.builder(); settings.put("http.cors.enabled", "true"); settings.put("http.cors.allow-origin", "*"); - settings.put("script.inline", "true"); settings.put("xpack.security.enabled", "true"); // Disable Monitoring to prevent cluster activity settings.put("xpack.monitoring.enabled", "false"); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java index 23266f81de3..2182e1abbcd 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java @@ -31,7 +31,6 @@ public class WatcherF { Settings.Builder settings = Settings.builder(); settings.put("http.cors.enabled", "true"); settings.put("http.cors.allow-origin", "*"); - settings.put("script.inline", "true"); settings.put("xpack.security.enabled", "false"); settings.put("security.manager.enabled", "false"); settings.put("cluster.name", WatcherF.class.getSimpleName()); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/condition/ScriptConditionTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/condition/ScriptConditionTests.java index ab430dbd149..e99cb79152e 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/condition/ScriptConditionTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/condition/ScriptConditionTests.java @@ -29,7 +29,6 @@ import org.elasticsearch.script.ScriptEngineRegistry; import org.elasticsearch.script.ScriptException; import org.elasticsearch.script.ScriptMetaData; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptSettings; import org.elasticsearch.script.ScriptType; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.test.ESTestCase; @@ -90,10 +89,8 @@ public class ScriptConditionTests extends ESTestCase { ScriptEngineRegistry registry = new ScriptEngineRegistry(singleton(engine)); ScriptContextRegistry contextRegistry = new ScriptContextRegistry(singleton(new ScriptContext.Plugin("xpack", "watch"))); - ScriptSettings scriptSettings = new ScriptSettings(registry, contextRegistry); + scriptService = new ScriptService(Settings.EMPTY, registry, contextRegistry); - - scriptService = new ScriptService(Settings.EMPTY, registry, contextRegistry, scriptSettings); ClusterState.Builder clusterState = new ClusterState.Builder(new ClusterName("_name")); clusterState.metaData(MetaData.builder().putCustom(ScriptMetaData.TYPE, new ScriptMetaData.Builder(null).build())); ClusterState cs = clusterState.build(); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java index db5809ec153..9435f34f50a 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java @@ -146,7 +146,6 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase .put("xpack.watcher.execution.scroll.size", randomIntBetween(1, 100)) .put("xpack.watcher.watch.scroll.size", randomIntBetween(1, 100)) .put(SecuritySettings.settings(securityEnabled)) - .put("script.inline", "true") // Disable native ML autodetect_process as the c++ controller won't be available .put(MachineLearning.AUTODETECT_PROCESS.getKey(), false) .build(); diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java index c084dc25a33..406fc0a6e41 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java @@ -21,7 +21,6 @@ import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptContextRegistry; import org.elasticsearch.script.ScriptEngineRegistry; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptSettings; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.threadpool.ThreadPool; @@ -238,8 +237,6 @@ public final class WatcherTestUtils { public static ScriptService createScriptService(ThreadPool tp) throws Exception { Settings settings = Settings.builder() - .put("script.inline", "true") - .put("script.indexed", "true") .put("path.home", createTempDir()) .build(); ScriptContextRegistry scriptContextRegistry = @@ -247,8 +244,8 @@ public final class WatcherTestUtils { ScriptEngineRegistry scriptEngineRegistry = new ScriptEngineRegistry(Collections.emptyList()); - ScriptSettings scriptSettings = new ScriptSettings(scriptEngineRegistry, scriptContextRegistry); - return new ScriptService(settings, scriptEngineRegistry, scriptContextRegistry, scriptSettings); + + return new ScriptService(settings, scriptEngineRegistry, scriptContextRegistry); } public static SearchType getRandomSupportedSearchType() { diff --git a/plugin/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java b/plugin/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java index 061724e38c8..4fe7fd4d713 100644 --- a/plugin/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java +++ b/plugin/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java @@ -99,8 +99,6 @@ public class TransformIntegrationTests extends AbstractWatcherIntegrationTestCas return Settings.builder() .put(baseSettings) .put(Environment.PATH_CONF_SETTING.getKey(), config) - .put("script.stored", "true") - .put("script.inline", "true") .build(); } diff --git a/qa/ml-single-node-tests/build.gradle b/qa/ml-single-node-tests/build.gradle index 54931c74e2f..c1cc1a1d518 100644 --- a/qa/ml-single-node-tests/build.gradle +++ b/qa/ml-single-node-tests/build.gradle @@ -7,6 +7,5 @@ dependencies { integTestCluster { setting 'xpack.security.enabled', 'false' - setting 'script.inline', 'true' plugin ':x-pack-elasticsearch:plugin' } diff --git a/qa/reindex-tests-with-security/build.gradle b/qa/reindex-tests-with-security/build.gradle index c90bd4f5c48..394cd7249bf 100644 --- a/qa/reindex-tests-with-security/build.gradle +++ b/qa/reindex-tests-with-security/build.gradle @@ -8,7 +8,6 @@ dependencies { } integTestCluster { - setting 'script.inline', 'true' plugin ':x-pack-elasticsearch:plugin' // Whitelist reindexing from the local node so we can test it. setting 'reindex.remote.whitelist', '127.0.0.1:*' diff --git a/qa/security-migrate-tests/build.gradle b/qa/security-migrate-tests/build.gradle index e15a8090c8f..956176ca7ca 100644 --- a/qa/security-migrate-tests/build.gradle +++ b/qa/security-migrate-tests/build.gradle @@ -7,7 +7,6 @@ dependencies { } integTestCluster { - setting 'script.inline', 'true' plugin ':x-pack-elasticsearch:plugin' extraConfigFile 'x-pack/roles.yml', 'roles.yml' [ diff --git a/qa/smoke-test-watcher-with-mustache/build.gradle b/qa/smoke-test-watcher-with-mustache/build.gradle index 1a1cf005c88..8a6f9f04fe8 100644 --- a/qa/smoke-test-watcher-with-mustache/build.gradle +++ b/qa/smoke-test-watcher-with-mustache/build.gradle @@ -10,8 +10,6 @@ integTestCluster { plugin ':x-pack-elasticsearch:plugin' setting 'xpack.security.enabled', 'false' setting 'xpack.monitoring.enabled', 'false' - setting 'script.inline', 'true' - setting 'script.stored', 'true' // Need to allow more compilations per minute because of the integration tests setting 'script.max_compilations_per_minute', '100' } diff --git a/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java b/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java index 9d85b76feb7..090124f0713 100644 --- a/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java +++ b/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java @@ -15,7 +15,6 @@ import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptContextRegistry; import org.elasticsearch.script.ScriptEngineRegistry; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.script.ScriptSettings; import org.elasticsearch.script.mustache.MustacheScriptEngine; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.watcher.ResourceWatcherService; @@ -46,8 +45,7 @@ public class WatcherTemplateIT extends ESTestCase { ScriptEngineRegistry scriptEngineRegistry = new ScriptEngineRegistry( Collections.singleton(new MustacheScriptEngine()) ); - ScriptSettings scriptSettings = new ScriptSettings(scriptEngineRegistry, registry); - ScriptService scriptService = new ScriptService(Settings.EMPTY, scriptEngineRegistry, registry, scriptSettings); + ScriptService scriptService = new ScriptService(Settings.EMPTY, scriptEngineRegistry, registry); engine = new TextTemplateEngine(Settings.EMPTY, scriptService); } diff --git a/qa/smoke-test-watcher-with-painless/build.gradle b/qa/smoke-test-watcher-with-painless/build.gradle index 62e8b7c6cd2..4578bae8c12 100644 --- a/qa/smoke-test-watcher-with-painless/build.gradle +++ b/qa/smoke-test-watcher-with-painless/build.gradle @@ -8,7 +8,6 @@ dependencies { integTestCluster { plugin ':x-pack-elasticsearch:plugin' - setting 'script.inline', 'true' setting 'xpack.security.enabled', 'false' setting 'xpack.monitoring.enabled', 'false' } diff --git a/qa/transport-client-tests/build.gradle b/qa/transport-client-tests/build.gradle index 2c985542fa7..4f1e0bf2473 100644 --- a/qa/transport-client-tests/build.gradle +++ b/qa/transport-client-tests/build.gradle @@ -8,6 +8,5 @@ dependencies { integTestCluster { setting 'xpack.security.enabled', 'false' - setting 'script.inline', 'true' plugin ':x-pack-elasticsearch:plugin' }