Skip to content

Commit fbfc6d8

Browse files
authored
Add missing script contexts and types allowed settings. (#26703)
1 parent ff43813 commit fbfc6d8

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

core/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.elasticsearch.common.settings;
2020

2121
import org.elasticsearch.action.admin.indices.close.TransportCloseIndexAction;
22+
import org.elasticsearch.script.ScriptModes;
2223
import org.elasticsearch.transport.RemoteClusterService;
2324
import org.elasticsearch.transport.RemoteClusterAware;
2425
import org.elasticsearch.action.search.TransportSearchAction;
@@ -316,6 +317,8 @@ public void apply(Settings value, Settings current, Settings previous) {
316317
IndexSettings.QUERY_STRING_ANALYZE_WILDCARD,
317318
IndexSettings.QUERY_STRING_ALLOW_LEADING_WILDCARD,
318319
PrimaryShardAllocator.NODE_INITIAL_SHARDS_SETTING,
320+
ScriptModes.TYPES_ALLOWED_SETTING,
321+
ScriptModes.CONTEXTS_ALLOWED_SETTING,
319322
ScriptService.SCRIPT_CACHE_SIZE_SETTING,
320323
ScriptService.SCRIPT_CACHE_EXPIRE_SETTING,
321324
ScriptService.SCRIPT_AUTO_RELOAD_ENABLED_SETTING,

core/src/main/java/org/elasticsearch/script/ScriptModes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public class ScriptModes {
4444

4545
private static final String NONE = "none";
4646

47-
private static final Setting<List<String>> TYPES_ALLOWED_SETTING =
47+
public static final Setting<List<String>> TYPES_ALLOWED_SETTING =
4848
Setting.listSetting("script.allowed_types", Collections.emptyList(), Function.identity(), Setting.Property.NodeScope);
49-
private static final Setting<List<String>> CONTEXTS_ALLOWED_SETTING =
49+
public static final Setting<List<String>> CONTEXTS_ALLOWED_SETTING =
5050
Setting.listSetting("script.allowed_contexts", Collections.emptyList(), Function.identity(), Setting.Property.NodeScope);
5151

5252
private final Set<String> typesAllowed;

0 commit comments

Comments
 (0)