@@ -124,6 +124,7 @@ public class ElasticsearchNode implements TestClusterConfiguration {
124124 private final LazyPropertyMap <String , CharSequence > settings = new LazyPropertyMap <>("Settings" , this );
125125 private final LazyPropertyMap <String , CharSequence > keystoreSettings = new LazyPropertyMap <>("Keystore" , this );
126126 private final LazyPropertyMap <String , File > keystoreFiles = new LazyPropertyMap <>("Keystore files" , this , FileEntry ::new );
127+ private final LazyPropertyList <CliEntry > cliSetup = new LazyPropertyList <>("CLI setup commands" , this );
127128 private final LazyPropertyMap <String , CharSequence > systemProperties = new LazyPropertyMap <>("System properties" , this );
128129 private final LazyPropertyMap <String , CharSequence > environment = new LazyPropertyMap <>("Environment" , this );
129130 private final LazyPropertyList <CharSequence > jvmArgs = new LazyPropertyList <>("JVM arguments" , this );
@@ -301,6 +302,11 @@ public void keystore(String key, FileSupplier valueSupplier) {
301302 keystoreFiles .put (key , valueSupplier );
302303 }
303304
305+ @ Override
306+ public void cliSetup (String binTool , CharSequence ... args ) {
307+ cliSetup .add (new CliEntry (binTool , args ));
308+ }
309+
304310 @ Override
305311 public void setting (String key , String value ) {
306312 settings .put (key , value );
@@ -475,6 +481,14 @@ public synchronized void start() {
475481 ));
476482 }
477483
484+ if (cliSetup .isEmpty () == false ) {
485+ logToProcessStdout ("Running " + cliSetup .size () + " setup commands" );
486+
487+ for (CliEntry entry : cliSetup ) {
488+ runElasticsearchBinScript (entry .executable , entry .args );
489+ }
490+ }
491+
478492 logToProcessStdout ("Starting Elasticsearch process" );
479493 startElasticsearchProcess ();
480494 }
@@ -623,7 +637,7 @@ public void user(Map<String, String> userSpec) {
623637 credentials .add (cred );
624638 }
625639
626- private void runElasticsearchBinScriptWithInput (String input , String tool , String ... args ) {
640+ private void runElasticsearchBinScriptWithInput (String input , String tool , CharSequence ... args ) {
627641 if (
628642 Files .exists (getDistroDir ().resolve ("bin" ).resolve (tool )) == false &&
629643 Files .exists (getDistroDir ().resolve ("bin" ).resolve (tool + ".bat" )) == false
@@ -642,12 +656,12 @@ private void runElasticsearchBinScriptWithInput(String input, String tool, Strin
642656 .supply ()
643657 );
644658 spec .args (
645- OS .<List <String >>conditional ()
659+ OS .<List <CharSequence >>conditional ()
646660 .onWindows (() -> {
647- ArrayList <String > result = new ArrayList <>();
661+ ArrayList <CharSequence > result = new ArrayList <>();
648662 result .add ("/c" );
649663 result .add ("bin\\ " + tool + ".bat" );
650- for (String arg : args ) {
664+ for (CharSequence arg : args ) {
651665 result .add (arg );
652666 }
653667 return result ;
@@ -663,7 +677,7 @@ private void runElasticsearchBinScriptWithInput(String input, String tool, Strin
663677 }
664678 }
665679
666- private void runElasticsearchBinScript (String tool , String ... args ) {
680+ private void runElasticsearchBinScript (String tool , CharSequence ... args ) {
667681 runElasticsearchBinScriptWithInput ("" , tool , args );
668682 }
669683
@@ -1205,6 +1219,11 @@ public List<?> getKeystoreFiles() {
12051219 return keystoreFiles .getNormalizedCollection ();
12061220 }
12071221
1222+ @ Nested
1223+ public List <?> getCliSetup () {
1224+ return cliSetup .getNormalizedCollection ();
1225+ }
1226+
12081227 @ Nested
12091228 public List <?> getSettings () {
12101229 return settings .getNormalizedCollection ();
@@ -1376,4 +1395,24 @@ public File getFile() {
13761395 return file ;
13771396 }
13781397 }
1398+
1399+ private static class CliEntry {
1400+ private String executable ;
1401+ private CharSequence [] args ;
1402+
1403+ CliEntry (String executable , CharSequence [] args ) {
1404+ this .executable = executable ;
1405+ this .args = args ;
1406+ }
1407+
1408+ @ Input
1409+ public String getExecutable () {
1410+ return executable ;
1411+ }
1412+
1413+ @ Input
1414+ public CharSequence [] getArgs () {
1415+ return args ;
1416+ }
1417+ }
13791418}
0 commit comments