Merge branch 'dev' of https://github.com/datalust/seqcli into feature/forwarder

Author: nblumhardt

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

@@ -0,0 +1,51 @@
+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 ConnectionFeature _connection;
+    readonly OutputFormatFeature _output;
+    readonly StoragePathFeature _storage;
+
+    public ShowCommand()
+    {
+        _connection = Enable<ConnectionFeature>();
+        _output = Enable<OutputFormatFeature>();
+        _storage = Enable<StoragePathFeature>();
+    }
+
+    protected override async Task<int> Run()
+    {
+        var config = RuntimeConfigurationLoader.Load(_storage);
+        var output = _output.GetOutputFormat(config);
+
+        var connection = SeqConnectionFactory.Connect(_connection, config);
+        var license = await connection.Licenses.FindCurrentAsync();
+
+        if (output.Json)
+        {
+            output.WriteEntity(license);
+        }
+        else
+        {
+            output.WriteText(license?.LicenseText);
+        }
+
+        return 0;
+    }
+}

src/SeqCli/Cli/Features/OutputFormat.cs

@@ -165,4 +165,12 @@ public void ListEntities(IEnumerable<Entity> list)
             WriteEntity(entity);
         }
     }
-}
+    
+    // ReSharper disable once MemberCanBeMadeStatic.Global
+#pragma warning disable CA1822
+    public void WriteText(string? text)
+#pragma warning restore CA1822
+    {
+        Console.WriteLine(text?.TrimEnd());
+    }
+}

src/SeqCli/Cli/Features/OutputFormatFeature.cs

@@ -39,4 +39,4 @@ public override void Enable(OptionSet options)
             "Force redirected output to have ANSI color (unless `--no-color` is also specified)",
             _ => _forceColor = true);
     }
-}
+}

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());
+    }
+}