@@ -27,9 +27,7 @@ public class ElasticsearchNode : IDisposable
2727 //{ "cloud-azure", _ => "cloud-azure" },
2828 { "mapper-attachments" , _ => "mapper-attachments" } ,
2929 { "mapper-murmur3" , _ => "mapper-murmur3" } ,
30- { "license" , _ => "license" } ,
31- { "graph" , _ => "graph" } ,
32- { "shield" , _ => "shield" } ,
30+ { "x-pack" , _ => "x-pack" } ,
3331 } ;
3432 private string [ ] DefaultNodeSettings { get ; }
3533
@@ -131,8 +129,8 @@ bool shieldEnabled
131129 $ "es.cluster.name={ this . ClusterName } ",
132130 $ "es.node.name={ this . NodeName } ",
133131 $ "es.path.repo={ this . RepositoryPath } ",
134- $ "es.script.inline=on ",
135- $ "es.script.indexed=on ",
132+ $ "es.script.inline=true ",
133+ $ "es.script.indexed=true ",
136134 $ "es.node.{ attr } testingcluster=true",
137135 $ "es.shield.enabled=" + ( shieldEnabled ? "true" : "false" )
138136 } ;
@@ -421,7 +419,10 @@ private void EnsureShieldAdmin()
421419 {
422420 if ( ! this . _shieldEnabled ) return ;
423421
424- var pluginBat = Path . Combine ( this . RoamingClusterFolder , "bin" , "shield" , "esusers" ) + ".bat" ;
422+ var folder = this . VersionInfo . ParsedVersion . Major >= 5 ? "x-pack" : "shield" ;
423+ var plugin = this . VersionInfo . ParsedVersion . Major >= 5 ? "users" : "esusers" ;
424+
425+ var pluginBat = Path . Combine ( this . RoamingClusterFolder , "bin" , folder , plugin ) + ".bat" ;
425426 foreach ( var cred in ShieldInformation . AllUsers )
426427 {
427428 var processInfo = new ProcessStartInfo
0 commit comments