Scripting: Remove file scripts #24627
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit removes file scripts, which were deprecated in 5.5. closes elastic#21798
rjernst
added
:Core/Infra/Scripting
jasontedor
requested changes
May 11, 2017
| @@ -225,19 +176,11 @@ public void testDefaultBehaviourFineGrainedSettings() throws IOException { | |||
| deprecate = true; | |||
| } | |||
| buildScriptService(builder.build()); | |||
| createFileScripts("dtest"); | |||
|
|
|||
| for (ScriptContext scriptContext : scriptContexts) { | |||
| // only file scripts are accepted by default | |||
| @@ -306,12 +249,11 @@ public void testFineGrainedSettings() throws IOException { | |||
| } | |||
|
|
|||
| buildScriptService(builder.build()); | |||
| createFileScripts("expression", "mustache", "dtest"); | |||
|
|
|||
| for (ScriptType scriptType : ScriptType.values()) { | |||
| //make sure file scripts have a different name than inline ones. | |||
| //Otherwise they are always considered file ones as they can be found in the static cache. | |||
There was a problem hiding this comment.
These comments about file scripts can go.
|
|
||
| for (ScriptType scriptType : ScriptType.values()) { | ||
| //make sure file scripts have a different name than inline ones. | ||
| //Otherwise they are always considered file ones as they can be found in the static cache. | ||
| String script = scriptType == ScriptType.FILE ? "file_script" : "script"; | ||
| String script = "script"; | ||
| for (ScriptContext scriptContext : this.scriptContexts) { | ||
| //fallback mechanism: 1) engine specific settings 2) op based settings 3) source based settings | ||
| Boolean scriptEnabled = engineSettings.get(dangerousScriptEngine.getType() + "." + scriptType + "." + scriptContext.getKey()); |
There was a problem hiding this comment.
It won't let me review line 278 where there is still an assertion about file scripts.
| @@ -71,7 +70,6 @@ | |||
| private static final Map<ScriptType, Boolean> DEFAULT_SCRIPT_ENABLED = new HashMap<>(); | |||
There was a problem hiding this comment.
There's a field up there scriptsFilePath that I think can go?
| @@ -56,7 +56,6 @@ | |||
| //TODO: this needs to be a base test class, and all scripting engines extend it | |||
| public class ScriptServiceTests extends ESTestCase { | |||
|
|
|||
| private ResourceWatcherService resourceWatcherService; | |||
There was a problem hiding this comment.
There are imports up above that can be removed.
| @@ -225,19 +176,11 @@ public void testDefaultBehaviourFineGrainedSettings() throws IOException { | |||
| deprecate = true; | |||
|
Also, I think there are some packaging tests that set up a file script? |
|
@elasticmachine retest this please |
|
@jasontedor Packaging tests are updated. |
jrodewig
added a commit
that referenced
this pull request
Dec 20, 2019
File scripts were removed in 6.0 with #24627. This removes an outdated file scripts reference from the conditional clauses section of the search templates docs.
jrodewig
added a commit
that referenced
this pull request
Dec 20, 2019
File scripts were removed in 6.0 with #24627. This removes an outdated file scripts reference from the conditional clauses section of the search templates docs.
jrodewig
added a commit
that referenced
this pull request
Dec 20, 2019
File scripts were removed in 6.0 with #24627. This removes an outdated file scripts reference from the conditional clauses section of the search templates docs.
SivagurunathanV
pushed a commit
to SivagurunathanV/elasticsearch
that referenced
this pull request
Jan 23, 2020
File scripts were removed in 6.0 with elastic#24627. This removes an outdated file scripts reference from the conditional clauses section of the search templates docs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit removes file scripts, which were deprecated in 5.5.
closes #21798