Update output for empty licenses

Author: nblumhardt

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

@@ -34,25 +34,15 @@ protected override async Task<int> Run()
         var connection = _connectionFactory.Connect(_connection);
         var license = await connection.Licenses.FindCurrentAsync();
 
-        if (license == null)
+        if (_output.Json)
         {
-            Log.Warning("No license is currently applied to the server.");
-            return 2;
+            _output.WriteEntity(license);
         }
-
-        _output.WriteEntity(_output.Json ? license : new OutputWrapperLicenseEntity(license));
-
-        return 0;
-    }
-
-    /// <summary>
-    /// Wraps the license entity for none json output.
-    /// </summary>
-    class OutputWrapperLicenseEntity : Entity
-    {
-        public OutputWrapperLicenseEntity(LicenseEntity license)
+        else
         {
-            this.Id = license.LicenseText;
+            _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

@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Seq.Api;
 using SeqCli.EndToEnd.Support;
 using Serilog;
@@ -10,27 +8,19 @@ namespace SeqCli.EndToEnd.License;
 
 public class LicenseShowTestCase : ICliTestCase
 {
-    readonly TestDataFolder _testDataFolder;
-
-    public LicenseShowTestCase(TestDataFolder testDataFolder)
+    public async Task ExecuteAsync(SeqConnection connection, ILogger logger, CliCommandRunner runner)
     {
-        _testDataFolder = testDataFolder;
-    }
-
-    public Task ExecuteAsync(SeqConnection connection, ILogger logger, CliCommandRunner runner)
-    {
-
-        // test empty text output if no license is applied
+        var license = await connection.Licenses.FindCurrentAsync();
+        Assert.True(license.IsSingleUser);
+        
         runner.Exec("license show");
         Assert.Equal(
             "",
-            runner.LastRunProcess.Output.Trim());
+            runner.LastRunProcess!.Output.Trim());
 
-        // test json output if no license is applied
         runner.Exec("license show --json");
         Assert.Contains(
             "You're using the free Individual license.",
-            runner.LastRunProcess.Output.Trim());
-        return Task.CompletedTask;
+            runner.LastRunProcess!.Output.Trim());
     }
 }