seqcli forwarder command group

.gitignore

@@ -290,3 +290,5 @@ __pycache__/
 
 # ci.global.json is used in CI; local builds are unconstrained
 global.json
+
+.DS_Store/

build/Build.Windows.ps1

@@ -39,7 +39,7 @@ function Create-ArtifactDir
 
 function Publish-Archives($version)
 {
-    $rids = $([xml](Get-Content .\src\SeqCli\SeqCli.csproj)).Project.PropertyGroup.RuntimeIdentifiers.Split(';')
+    $rids = $([xml](Get-Content .\src\SeqCli\SeqCli.csproj)).Project.PropertyGroup.RuntimeIdentifiers[0].Split(';')
     foreach ($rid in $rids) {
         $tfm = $framework
         if ($rid -eq "win-x64") {

seqcli.sln

@@ -19,7 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3587B633-0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asset", "asset", "{438A0DA5-F3CF-4FCE-B43A-B6DA2981D4AE}"
 	ProjectSection(SolutionItems) = preProject
-		asset\SeqCliLicense.rtf = asset\SeqCliLicense.rtf
 		asset\SeqCli.ico = asset\SeqCli.ico
 		asset\SeqCli.png = asset\SeqCli.png
 	EndProjectSection

seqcli.sln.DotSettings

@@ -1,4 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MS/@EntryIndexedValue">MS</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=appinstance/@EntryIndexedValue">True</s:Boolean>
@@ -9,13 +11,15 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cmds/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=command_0027s/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Datalust/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=decryptor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=delim/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Enricher/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=enrichers/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=formattable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Gravatar/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=hackily/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=nologo/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=n_0027est/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=retentionpolicies/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=retentionpolicy/@EntryIndexedValue">True</s:Boolean>
@@ -32,4 +36,5 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tokenizes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Unclosable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=xmpweb/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/Roastery/Fake/Person.cs

@@ -14,7 +14,7 @@ public Person(string? name, string? address)
     }
 
     static readonly string[] Forenames =
-    {
+    [
         "Akeem",
         "Alice",
         "Alok",
@@ -40,10 +40,10 @@ public Person(string? name, string? address)
         "Yoshi",
         "Zach",
         "Zeynep"
-    };
+    ];
 
     static readonly string[] Surnames =
-    {
+    [
         "Anderson",
         "Alvarez",
         "Brookes",
@@ -60,10 +60,10 @@ public Person(string? name, string? address)
         "Smith",
         "Xia",
         "Zheng"
-    };
+    ];
 
     static readonly string[] Streets =
-    {
+    [
         "Lilac Road",
         "Lilly Street",
         "Carnation Street",
@@ -78,7 +78,7 @@ public Person(string? name, string? address)
         "Trillium Creek Parkway",
         "Grevillea Street",
         "Kurrajong Street"
-    };
+    ];
 
     public static Person Generate()
     {

src/Roastery/Web/FaultInjectionMiddleware.cs

@@ -18,15 +18,15 @@ public FaultInjectionMiddleware(ILogger logger, HttpServer next)
     {
         _logger = logger.ForContext<FaultInjectionMiddleware>();
         _next = next;
-        _faults = new Func<HttpRequest, Task<HttpResponse>>[]
-        {
+        _faults =
+        [
             Unauthorized,
             Unauthorized,
             Unauthorized,
             Timeout,
             Timeout,
             Disposed
-        };
+        ];
     }
 
     Task<HttpResponse> Unauthorized(HttpRequest request)

src/Roastery/Web/Router.cs

@@ -63,7 +63,7 @@ public Router(IEnumerable<Controller> controllers, ILogger logger)
                     {
                         using var _ = LogContext.PushProperty("Controller", controllerName);
                         using var __ = LogContext.PushProperty("Action", actionName);
-                        return (Task<HttpResponse>) method.Invoke(controller, new object[] {r})!;
+                        return (Task<HttpResponse>) method.Invoke(controller, [r])!;
                     });
 
                 _logger.Debug("Binding route HTTP {HttpMethod} {RouteTemplate} to action method {Controller}.{Action}()",

src/SeqCli/Apps/Definitions/AppMetadataReader.cs

@@ -79,21 +79,15 @@ static Dictionary<string, AppSettingDefinition> GetAvailableSettings(Type mainRe
                 });
     }
 
-    static readonly HashSet<Type> IntegerTypes = new()
-    {
+    static readonly HashSet<Type> IntegerTypes =
+    [
         typeof(short), typeof(ushort), typeof(int), typeof(uint),
         typeof(long), typeof(ulong)
-    };
+    ];
 
-    static readonly HashSet<Type> DecimalTypes = new()
-    {
-        typeof(float), typeof(double), typeof(decimal)
-    };
+    static readonly HashSet<Type> DecimalTypes = [typeof(float), typeof(double), typeof(decimal)];
 
-    static readonly HashSet<Type> BooleanTypes = new()
-    {
-        typeof(bool)
-    };
+    static readonly HashSet<Type> BooleanTypes = [typeof(bool)];
 
     internal static AppSettingType GetSettingType(Type type)
     {

src/SeqCli/Apps/Hosting/AppContainer.cs

@@ -1,4 +1,4 @@
-// Copyright Datalust Pty Ltd and Contributors
+// Copyright © Datalust Pty Ltd and Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/SeqCli/Cli/CommandAttribute.cs

@@ -22,8 +22,8 @@ public class CommandAttribute : Attribute, ICommandMetadata
     public string Name { get; }
     public string? SubCommand { get; }
     public string HelpText { get; }
-
     public string? Example { get; set; }
+    public bool IsPreview { get; set; }
 
     public CommandAttribute(string name, string helpText)
     {

src/SeqCli/Cli/CommandLineHost.cs

@@ -39,30 +39,37 @@ public async Task<int> Run(string[] args, LoggingLevelSwitch levelSwitch)
 
         if (args.Length > 0)
         {
+            const string prereleaseArg = "--pre", verboseArg = "--verbose";
+
             var norm = args[0].ToLowerInvariant();
             var subCommandNorm = args.Length > 1 && !args[1].Contains('-') ? args[1].ToLowerInvariant() : null;
-
+
+            var pre = args.Any(a => a == prereleaseArg);
+
             var cmd = _availableCommands.SingleOrDefault(c =>
-                c.Metadata.Name == norm && (c.Metadata.SubCommand == subCommandNorm || c.Metadata.SubCommand == null));
+                (!c.Metadata.IsPreview || pre) &&
+                c.Metadata.Name == norm &&
+                (c.Metadata.SubCommand == subCommandNorm || c.Metadata.SubCommand == null));
 
             if (cmd != null)
             {
                 var amountToSkip = cmd.Metadata.SubCommand == null ? 1 : 2;
-                var commandSpecificArgs = args.Skip(amountToSkip).ToArray();
+                var commandSpecificArgs = args.Skip(amountToSkip).Where(arg => cmd.Metadata.Name == "help" || arg != prereleaseArg).ToArray();
 
-                var verboseArg = commandSpecificArgs.FirstOrDefault(arg => arg == "--verbose");
-                if (verboseArg != null)
+                var verbose = commandSpecificArgs.Any(arg => arg == verboseArg);
+                if (verbose)
                 {
                     levelSwitch.MinimumLevel = LogEventLevel.Information;
                     commandSpecificArgs = commandSpecificArgs.Where(arg => arg != verboseArg).ToArray();
                 }
 
-                return await cmd.Value.Value.Invoke(commandSpecificArgs);
+                var impl = cmd.Value.Value;
+                return await impl.Invoke(commandSpecificArgs);
             }
         }
 
         Console.WriteLine($"Usage: {name} <command> [<args>]");
         Console.WriteLine($"Type `{name} help` for available commands");
-        return -1;
+        return 1;
     }
 }

src/SeqCli/Cli/CommandMetadata.cs

@@ -20,4 +20,5 @@ public class CommandMetadata : ICommandMetadata
     public string? SubCommand { get; set; }
     public required string HelpText { get; set; }
     public string? Example { get; set; }
-}
+    public bool IsPreview { get; set; }
+}

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

@@ -32,20 +32,17 @@ namespace SeqCli.Cli.Commands.ApiKey;
     Example = "seqcli apikey create -t 'Test API Key' -p Environment=Test")]
 class CreateCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     readonly ConnectionFeature _connection;
     readonly PropertiesFeature _properties;
     readonly OutputFormatFeature _output;
+    readonly StoragePathFeature _storagePath;
 
     string? _title, _token, _filter, _level, _connectUsername, _connectPassword;
     string[]? _permissions;
     bool _useServerTimestamps, _connectPasswordStdin;
 
-    public CreateCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
+    public CreateCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         Options.Add(
             "t=|title=",
             "A title for the API key",
@@ -94,12 +91,15 @@ public CreateCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config
             _ => _connectPasswordStdin = true);
 
         _connection = Enable<ConnectionFeature>();
-        _output = Enable(new OutputFormatFeature(config.Output));
+        _output = Enable<OutputFormatFeature>();
+        _storagePath = Enable<StoragePathFeature>();
     }
 
     protected override async Task<int> Run()
     {
-        var connection = await TryConnectAsync();
+        var config = RuntimeConfigurationLoader.Load(_storagePath);
+
+        var connection = await TryConnectAsync(config);
         if (connection == null)
             return 1;
 
@@ -149,19 +149,21 @@ protected override async Task<int> Run()
 
         apiKey = await connection.ApiKeys.AddAsync(apiKey);
 
-        if (_token == null && !_output.Json)
+        var output = _output.GetOutputFormat(config);
+
+        if (_token == null && !output.Json)
         {
             Console.WriteLine(apiKey.Token);
         }
         else
         {
-            _output.WriteEntity(apiKey);
+            output.WriteEntity(apiKey);
         }
 
         return 0;
     }
 
-    async Task<SeqConnection?> TryConnectAsync()
+    async Task<SeqConnection?> TryConnectAsync(SeqCliConfig config)
     {
         SeqConnection connection;
         if (_connectUsername != null)
@@ -183,13 +185,13 @@ protected override async Task<int> Run()
                 _connectPassword = await Console.In.ReadLineAsync();
             }
 
-            var (url, _) = _connectionFactory.GetConnectionDetails(_connection);
+            var (url, _) = SeqConnectionFactory.GetConnectionDetails(_connection, config);
             connection = new SeqConnection(url);
             await connection.Users.LoginAsync(_connectUsername, _connectPassword ?? "");
         }
         else
         {
-            connection = _connectionFactory.Connect(_connection);
+            connection = SeqConnectionFactory.Connect(_connection, config);
         }
 
         return connection;

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

@@ -24,32 +24,30 @@ namespace SeqCli.Cli.Commands.ApiKey;
 [Command("apikey", "list", "List available API keys", Example="seqcli apikey list")]
 class ListCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     readonly EntityIdentityFeature _entityIdentity;
     readonly ConnectionFeature _connection;
     readonly OutputFormatFeature _output;
+    readonly StoragePathFeature _storagePath;
 
-    public ListCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
+    public ListCommand()
     {
-        if (config == null) throw new ArgumentNullException(nameof(config));
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         _entityIdentity = Enable(new EntityIdentityFeature("API key", "list"));
-        _output = Enable(new OutputFormatFeature(config.Output));
+        _output = Enable<OutputFormatFeature>();
+        _storagePath = Enable<StoragePathFeature>();
         _connection = Enable<ConnectionFeature>();
     }
 
     protected override async Task<int> Run()
     {
-        var connection = _connectionFactory.Connect(_connection);
+        var config = RuntimeConfigurationLoader.Load(_storagePath);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         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);
 
-        _output.ListEntities(list);
+        _output.GetOutputFormat(config).ListEntities(list);
 
         return 0;
     }

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

@@ -16,6 +16,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using SeqCli.Cli.Features;
+using SeqCli.Config;
 using SeqCli.Connection;
 using Serilog;
 
@@ -25,17 +26,15 @@ namespace SeqCli.Cli.Commands.ApiKey;
     Example="seqcli apikey remove -t 'Test API Key'")]
 class RemoveCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     readonly EntityIdentityFeature _entityIdentity;
     readonly ConnectionFeature _connection;
+    readonly StoragePathFeature _storagePath;
 
-    public RemoveCommand(SeqConnectionFactory connectionFactory)
+    public RemoveCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         _entityIdentity = Enable(new EntityIdentityFeature("API key", "remove"));
         _connection = Enable<ConnectionFeature>();
+        _storagePath = Enable<StoragePathFeature>();
     }
 
     protected override async Task<int> Run()
@@ -46,10 +45,11 @@ protected override async Task<int> Run()
             return 1;
         }
 
-        var connection = _connectionFactory.Connect(_connection);
+        var config = RuntimeConfigurationLoader.Load(_storagePath);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
-        var toRemove = _entityIdentity.Id != null ?
-            new[] {await connection.ApiKeys.FindAsync(_entityIdentity.Id)} :
+        var toRemove = _entityIdentity.Id != null ? [await connection.ApiKeys.FindAsync(_entityIdentity.Id)]
+            :
             (await connection.ApiKeys.ListAsync())
             .Where(ak => _entityIdentity.Title == ak.Title) 
             .ToArray();

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

@@ -20,6 +20,6 @@ namespace SeqCli.Cli.Commands.ApiKey;
 [Command("apikey", "update",
     "Update an existing API key",
     Example="seqcli apikey update --json '{...}'")]
-class UpdateCommand(SeqConnectionFactory connectionFactory):
-    Shared.UpdateCommand(connectionFactory, "apikey", nameof(SeqConnection.ApiKeys), "API key");
+class UpdateCommand():
+    Shared.UpdateCommand("apikey", nameof(SeqConnection.ApiKeys), "API key");