Merge branch 'gprossliner-dev' into dev

Author: nblumhardt

src/SeqCli/Cli/Commands/License/ShowCommand.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Seq.Api.Model;
+using Seq.Api.Model.License;
+using SeqCli.Cli.Features;
+using SeqCli.Config;
+using SeqCli.Connection;
+using SeqCli.Util;
+using Serilog;
+
+// ReSharper disable once UnusedType.Global
+
+namespace SeqCli.Cli.Commands.License;
+
+[Command("license", "show", "Shows license applied to the Seq server",
+    Example = "seqcli license show")]
+class ShowCommand : Command
+{
+    readonly SeqConnectionFactory _connectionFactory;
+    readonly ConnectionFeature _connection;
+    readonly OutputFormatFeature _output;
+
+    public ShowCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
+    {
+        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
+        _connection = Enable<ConnectionFeature>();
+        _output = Enable(new OutputFormatFeature(config.Output));
+    }
+
+    protected override async Task<int> Run()
+    {
+        var connection = _connectionFactory.Connect(_connection);
+        var license = await connection.Licenses.FindCurrentAsync();
+
+        if (_output.Json)
+        {
+            _output.WriteEntity(license);
+        }
+        else
+        {
+            _output.WriteText(license?.LicenseText);
+        }
+
+        return 0;
+    }
+}

src/SeqCli/Cli/Features/OutputFormatFeature.cs

@@ -185,4 +185,10 @@ public void ListEntities(IEnumerable<Entity> list)
             WriteEntity(entity);
         }
     }
-}
+
+    // ReSharper disable once MemberCanBeMadeStatic.Global
+    public void WriteText(string? text)
+    {
+        Console.WriteLine(text?.TrimEnd());
+    }
+}

test/SeqCli.EndToEnd/License/LicenceShowTestCase.cs

@@ -0,0 +1,26 @@
+using System.Threading.Tasks;
+using Seq.Api;
+using SeqCli.EndToEnd.Support;
+using Serilog;
+using Xunit;
+
+namespace SeqCli.EndToEnd.License;
+
+public class LicenseShowTestCase : ICliTestCase
+{
+    public async Task ExecuteAsync(SeqConnection connection, ILogger logger, CliCommandRunner runner)
+    {
+        var license = await connection.Licenses.FindCurrentAsync();
+        Assert.True(license.IsSingleUser);
+        
+        runner.Exec("license show");
+        Assert.Equal(
+            "",
+            runner.LastRunProcess!.Output.Trim());
+
+        runner.Exec("license show --json");
+        Assert.Contains(
+            "You're using the free Individual license.",
+            runner.LastRunProcess!.Output.Trim());
+    }
+}