honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated script settings. (elastic/x-pack-elasticsearch#1469) 

Original commit: elastic/x-pack-elasticsearch@069e5a1087
This commit is contained in:
Jack Conradson 2017-05-18 13:32:57 -07:00 committed by GitHub
parent 667f842f92
commit b92a2f6582
16 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/smoke_test_xpack_rc.py
View File

@ -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:")

1
docs/build.gradle
View File

@ -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

1
plugin/src/test/java/org/elasticsearch/xpack/monitoring/MonitoringF.java
View File

@ -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");

1
plugin/src/test/java/org/elasticsearch/xpack/security/SecurityF.java
View File

@ -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");

1
plugin/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java
View File

@ -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());

5
plugin/src/test/java/org/elasticsearch/xpack/watcher/condition/ScriptConditionTests.java
View File

@ -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();

1
plugin/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
View File

@ -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();

7
plugin/src/test/java/org/elasticsearch/xpack/watcher/test/WatcherTestUtils.java
View File

@ -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() {

2
plugin/src/test/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java
View File

@ -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();
}

1
qa/ml-single-node-tests/build.gradle
View File

@ -7,6 +7,5 @@ dependencies {
integTestCluster {
setting 'xpack.security.enabled', 'false'
setting 'script.inline', 'true'
plugin ':x-pack-elasticsearch:plugin'
}

1
qa/reindex-tests-with-security/build.gradle
View File

@ -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:*'

1
qa/security-migrate-tests/build.gradle
View File

@ -7,7 +7,6 @@ dependencies {
}
integTestCluster {
setting 'script.inline', 'true'
plugin ':x-pack-elasticsearch:plugin'
extraConfigFile 'x-pack/roles.yml', 'roles.yml'
[

2
qa/smoke-test-watcher-with-mustache/build.gradle
View File

@ -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'
}

4
qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateIT.java
View File

@ -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);
}

1
qa/smoke-test-watcher-with-painless/build.gradle
View File

@ -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'
}

1
qa/transport-client-tests/build.gradle
View File

@ -8,6 +8,5 @@ dependencies {
integTestCluster {
setting 'xpack.security.enabled', 'false'
setting 'script.inline', 'true'
plugin ':x-pack-elasticsearch:plugin'
}