Flesh out the added commands

Author: nblumhardt

src/SeqCli/Cli/Commands/ApiKey/ListCommand.cs

@@ -47,13 +47,9 @@ protected override async Task<int> Run()
         var list = _entityIdentity.Id != null ?
             new[] { await connection.ApiKeys.FindAsync(_entityIdentity.Id) } :
             (await connection.ApiKeys.ListAsync())
-            .Where(ak => _entityIdentity.Title == null || _entityIdentity.Title == ak.Title)
-            .ToArray();
+            .Where(ak => _entityIdentity.Title == null || _entityIdentity.Title == ak.Title);
 
-        foreach (var apiKey in list)
-        {
-            _output.WriteEntity(apiKey);
-        }
+        _output.ListEntities(list);
 
         return 0;
     }

src/SeqCli/Cli/Commands/App/ListCommand.cs

@@ -51,13 +51,9 @@ protected override async Task<int> Run()
         var list = Id != null ?
             new[] { await connection.Apps.FindAsync(Id) } :
             (await connection.Apps.ListAsync())
-            .Where(ak => PackageId == null || PackageId == ak.Name)
-            .ToArray();
+            .Where(ak => PackageId == null || PackageId == ak.Package.PackageId);
 
-        foreach (var app in list)
-        {
-            _output.WriteEntity(app);
-        }
+        _output.ListEntities(list);
 
         return 0;
     }

src/SeqCli/Cli/Commands/AppInstance/CreateCommand.cs

@@ -11,7 +11,7 @@
 
 namespace SeqCli.Cli.Commands.AppInstance;
 
-[Command("appinstance", "create", "Create a signal",
+[Command("appinstance", "create", "Create an instance of an installed app",
     Example = "seqcli appinstance create -t 'Email Ops' --app hostedapp-314159 -p [email protected]")]
 class CreateCommand : Command
 {

src/SeqCli/Cli/Commands/AppInstance/ListCommand.cs

@@ -1,6 +1,42 @@
-namespace SeqCli.Cli.Commands.AppInstance;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using SeqCli.Cli.Features;
+using SeqCli.Config;
+using SeqCli.Connection;
 
-public class ListCommand
+namespace SeqCli.Cli.Commands.AppInstance;
+
+[Command("appinstance", "list", "List instances of installed apps", Example="seqcli appinstance list")]
+class ListCommand : Command
 {
+    readonly SeqConnectionFactory _connectionFactory;
+
+    readonly EntityIdentityFeature _entityIdentity;
+    readonly ConnectionFeature _connection;
+    readonly OutputFormatFeature _output;
+
+    public ListCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
+    {
+        if (config == null) throw new ArgumentNullException(nameof(config));
+        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
+
+        _entityIdentity = Enable(new EntityIdentityFeature("app instance", "list"));
+        _output = Enable(new OutputFormatFeature(config.Output));
+        _connection = Enable<ConnectionFeature>();
+    }
 
+    protected override async Task<int> Run()
+    {
+        var connection = _connectionFactory.Connect(_connection);
+
+        var list = _entityIdentity.Id != null ?
+            new[] { await connection.AppInstances.FindAsync(_entityIdentity.Id) } :
+            (await connection.AppInstances.ListAsync())
+            .Where(d => _entityIdentity.Title == null || _entityIdentity.Title == d.Title);
+
+        _output.ListEntities(list);
+
+        return 0;
+    }
 }

src/SeqCli/Cli/Commands/AppInstance/RemoveCommand.cs

@@ -1,6 +1,54 @@
-namespace SeqCli.Cli.Commands.AppInstance;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using SeqCli.Cli.Features;
+using SeqCli.Connection;
+using Serilog;
 
-public class RemoveCommand
+namespace SeqCli.Cli.Commands.AppInstance;
+[Command("appinstance", "remove", "Remove an app instance from the server",
+    Example="seqcli appinstance remove -t 'Email Ops'")]
+
+class RemoveCommand : Command
 {
-    
+    readonly SeqConnectionFactory _connectionFactory;
+
+    readonly EntityIdentityFeature _entityIdentity;
+    readonly ConnectionFeature _connection;
+
+    public RemoveCommand(SeqConnectionFactory connectionFactory)
+    {
+        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
+
+        _entityIdentity = Enable(new EntityIdentityFeature("app instance", "remove"));
+        _connection = Enable<ConnectionFeature>();
+    }
+
+    protected override async Task<int> Run()
+    {
+        if (_entityIdentity.Title == null && _entityIdentity.Id == null)
+        {
+            Log.Error("A `title` or `id` must be specified");
+            return 1;
+        }
+
+        var connection = _connectionFactory.Connect(_connection);
+
+        var toRemove = _entityIdentity.Id != null ?
+            new[] {await connection.AppInstances.FindAsync(_entityIdentity.Id)} :
+            (await connection.AppInstances.ListAsync())
+            .Where(ak => _entityIdentity.Title == ak.Title) 
+            .ToArray();
+
+        if (!toRemove.Any())
+        {
+            Log.Error("No matching app instance was found");
+            return 1;
+        }
+
+        foreach (var appInstanceEntity in toRemove)
+            await connection.AppInstances.RemoveAsync(appInstanceEntity);
+
+        return 0;
+    }
 }

src/SeqCli/Cli/Commands/Dashboard/ListCommand.cs

@@ -49,13 +49,9 @@ protected override async Task<int> Run()
         var list = _entityIdentity.Id != null ?
             new[] { await connection.Dashboards.FindAsync(_entityIdentity.Id) } :
             (await connection.Dashboards.ListAsync(ownerId: _entityOwner.OwnerId, shared: _entityOwner.IncludeShared))
-            .Where(d => _entityIdentity.Title == null || _entityIdentity.Title == d.Title)
-            .ToArray();
+            .Where(d => _entityIdentity.Title == null || _entityIdentity.Title == d.Title);
 
-        foreach (var dashboardEntity in list)
-        {
-            _output.WriteEntity(dashboardEntity);
-        }
+        _output.ListEntities(list);
 
         return 0;
     }

src/SeqCli/Cli/Commands/Feed/ListCommand.cs

@@ -57,13 +57,9 @@ protected override async Task<int> Run()
         var list = _id != null ?
             new[] { await connection.Feeds.FindAsync(_id) } :
             (await connection.Feeds.ListAsync())
-            .Where(f => _name == null || _name == f.Name)
-            .ToArray();
+            .Where(f => _name == null || _name == f.Name);
 
-        foreach (var feed in list)
-        {
-            _output.WriteEntity(feed);
-        }
+        _output.ListEntities(list);
 
         return 0;
     }

src/SeqCli/Cli/Commands/Node/ListCommand.cs

@@ -59,13 +59,9 @@ protected override async Task<int> Run()
         var list = _id != null ?
             new[] { await connection.ClusterNodes.FindAsync(_id) } :
             (await connection.ClusterNodes.ListAsync())
-            .Where(n => _name == null || _name == n.Name)
-            .ToArray();
+            .Where(n => _name == null || _name == n.Name);
 
-        foreach (var clusterNode in list)
-        {
-            _output.WriteEntity(clusterNode);
-        }
+        _output.ListEntities(list);
 
         return 0;
     }

src/SeqCli/Cli/Commands/RetentionPolicy/ListCommand.cs

@@ -54,13 +54,7 @@ protected override async Task<int> Run()
             (await connection.RetentionPolicies.ListAsync())
             .ToArray();
 
-        foreach (var policy in list)
-        {
-            if (_output.Json)
-                _output.WriteEntity(policy);
-            else
-                Console.WriteLine(policy.Id);
-        }
+        _output.ListEntities(list);
 
         return 0;
     }

src/SeqCli/Cli/Commands/Signal/ListCommand.cs

@@ -49,13 +49,9 @@ protected override async Task<int> Run()
         var list = _entityIdentity.Id != null ?
             new[] { await connection.Signals.FindAsync(_entityIdentity.Id) } :
             (await connection.Signals.ListAsync(ownerId: _entityOwner.OwnerId, shared: _entityOwner.IncludeShared))
-            .Where(signal => _entityIdentity.Title == null || _entityIdentity.Title == signal.Title)
-            .ToArray();
+            .Where(signal => _entityIdentity.Title == null || _entityIdentity.Title == signal.Title);
 
-        foreach (var signal in list)
-        {
-            _output.WriteEntity(signal);
-        }
+        _output.ListEntities(list);
 
         return 0;
     }