Ticket #112 : Fix issues to enable/disable plugins

Author: habarthierry-hue

src/EventMesh/FaasNet.EventMesh.Client/Messages/DisablePluginRequest.cs

@@ -2,7 +2,7 @@
 
 namespace FaasNet.EventMesh.Client.Messages
 {
-    internal class DisablePluginRequest : Package
+    public class DisablePluginRequest : Package
     {
         public string PluginName { get; set; }
 

src/EventMesh/FaasNet.EventMesh.Client/Messages/GetAllPluginsResponse.cs

@@ -24,7 +24,7 @@ public void Extract(ReadBufferContext context)
         {
             var plugins = new List<PluginResponse>();
             var nb = context.NextInt();
-            for (int i = 0; i < nb; i++) PluginResponse.Extract(context);
+            for (int i = 0; i < nb; i++) plugins.Add(PluginResponse.Extract(context));
             Plugins = plugins;
         }
     }

src/EventMesh/FaasNet.EventMesh.Client/Messages/PackageRequestBuilder.cs

@@ -157,7 +157,7 @@ public static Package EnablePlugin(string pluginName)
 
         public static Package DisablePlugin(string pluginName)
         {
-            return new EnablePluginRequest
+            return new DisablePluginRequest
             {
                 Header = new Header(Commands.DISABLE_PLUGIN_REQUEST, HeaderStatus.SUCCESS, GenerateRandomSeq()),
                 PluginName = pluginName

src/EventMesh/FaasNet.EventMesh.Runtime/Handlers/DisablePluginMessageHandler.cs

@@ -24,7 +24,7 @@ public DisablePluginMessageHandler(IOptions<EventMeshNodeOptions> options, IPlug
 
         public Task<EventMeshPackageResult> Run(Package package, IEnumerable<IPeerHost> peers, CancellationToken cancellationToken)
         {
-            var disablePluginRequest = package as EnablePluginRequest;
+            var disablePluginRequest = package as DisablePluginRequest;
             var allPlugins = GetAllPluginsMessageHandler.ExtractPluginInfos(_options.ProtocolsPluginSubPath);
             allPlugins.AddRange(GetAllPluginsMessageHandler.ExtractPluginInfos(_options.SinksPluginSubPath));
             var selectedPlugin = allPlugins.FirstOrDefault(p => p.Name == disablePluginRequest.PluginName);

src/EventMesh/FaasNet.EventMesh.Runtime/Handlers/GetAllPluginsMessageHandler.cs

@@ -39,15 +39,10 @@ private List<PluginResponse> ExtractPlugins(string subPath)
             return pluginInfos;
         }
 
-        private static string CombineAndSanitize(string path, string relativePath)
-        {
-            return $"{path.TrimEnd('/')}/{relativePath}";
-        }
-
         public static List<PluginResponse> ExtractPluginInfos(string subPath)
         {
             var result = new List<PluginResponse>();
-            var rootPluginPath = CombineAndSanitize(AppDomain.CurrentDomain.BaseDirectory, subPath);
+            var rootPluginPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, subPath);
             var allPluginPath = Directory.EnumerateDirectories(rootPluginPath);
             foreach (var pluginPath in allPluginPath)
             {

src/EventMesh/FaasNet.EventMesh.Runtime/Stores/PluginStore.cs

@@ -56,7 +56,7 @@ private void Update(string pluginName, bool isEnabled)
             else record.IsActive = isEnabled;
             lock(_lock)
             {
-                File.WriteAllText(GetPluginFilePath(), JsonSerializer.Serialize(record, new JsonSerializerOptions
+                File.WriteAllText(GetPluginFilePath(), JsonSerializer.Serialize(records, new JsonSerializerOptions
                 {
                     PropertyNameCaseInsensitive = true
                 }));
@@ -69,7 +69,8 @@ private ICollection<PluginRecord> Read()
             {
                 var path = GetPluginFilePath();
                 if (!File.Exists(path)) return new List<PluginRecord>();
-                return JsonSerializer.Deserialize<ICollection<PluginRecord>>(File.ReadAllText(path), new JsonSerializerOptions
+                var json = File.ReadAllText(path);
+                return JsonSerializer.Deserialize<List<PluginRecord>>(json, new JsonSerializerOptions
                 {
                     PropertyNameCaseInsensitive = true
                 });

src/EventMesh/FaasNet.EventMeshCTL.CLI/Program.cs

@@ -147,7 +147,13 @@ private static void AddGetPluginsCommand(CommandLineApplication app)
                     var configuration = EventMeshCTLConfigurationManager.Get();
                     var evtMeshClient = new EventMeshClient(configuration.Url, configuration.Port);
                     var plugins = await evtMeshClient.GetAllPlugins(token);
-                    foreach(var plugin in plugins) Console.WriteLine($"{plugin.Name}, {plugin.Description}, {plugin.IsActive}");
+                    foreach (var plugin in plugins)
+                    {
+                        Console.WriteLine($"Name = {plugin.Name}");
+                        Console.WriteLine($"Description = {plugin.Description}");
+                        Console.WriteLine($"Is active = {plugin.IsActive}");
+                        Console.WriteLine();
+                    }
                 });
             });
         }
@@ -164,6 +170,7 @@ private static void AddEnablePluginCommand(CommandLineApplication app)
                     var configuration = EventMeshCTLConfigurationManager.Get();
                     var evtMeshClient = new EventMeshClient(configuration.Url, configuration.Port);
                     await evtMeshClient.EnablePlugin(nameOption.ParsedValue, token);
+                    DisplaySuccess("Plugin is enabled");
                 });
             });
         }
@@ -179,7 +186,8 @@ private static void AddDisablePluginCommand(CommandLineApplication app)
                 {
                     var configuration = EventMeshCTLConfigurationManager.Get();
                     var evtMeshClient = new EventMeshClient(configuration.Url, configuration.Port);
-                    await evtMeshClient.EnablePlugin(nameOption.ParsedValue, token);
+                    await evtMeshClient.DisablePlugin(nameOption.ParsedValue, token);
+                    DisplaySuccess("Plugin is disabled");
                 });
             });
         }
@@ -190,5 +198,12 @@ private static void DisplayError(RuntimeClientResponseException ex)
             Console.WriteLine($"Error code = {ex.Error.Code}");
             Console.ResetColor();
         }
+
+        private static void DisplaySuccess(string msg)
+        {
+            Console.ForegroundColor = ConsoleColor.Green;
+            Console.WriteLine(msg);
+            Console.ResetColor();
+        }
     }
 }