Make connection factory static

Author: nblumhardt

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

@@ -32,8 +32,6 @@ 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;
@@ -43,10 +41,8 @@ class CreateCommand : Command
     string[]? _permissions;
     bool _useServerTimestamps, _connectPasswordStdin;
 
-    public CreateCommand(SeqConnectionFactory connectionFactory)
+    public CreateCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         Options.Add(
             "t=|title=",
             "A title for the API key",
@@ -189,13 +185,13 @@ protected override async Task<int> Run()
                 _connectPassword = await Console.In.ReadLineAsync();
             }
 
-            var (url, _) = _connectionFactory.GetConnectionDetails(_connection, config);
+            var (url, _) = SeqConnectionFactory.GetConnectionDetails(_connection, config);
             connection = new SeqConnection(url);
             await connection.Users.LoginAsync(_connectUsername, _connectPassword ?? "");
         }
         else
         {
-            connection = _connectionFactory.Connect(_connection, config);
+            connection = SeqConnectionFactory.Connect(_connection, config);
         }
 
         return connection;

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

@@ -24,17 +24,13 @@ 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)
+    public ListCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         _entityIdentity = Enable(new EntityIdentityFeature("API key", "list"));
         _output = Enable<OutputFormatFeature>();
         _storagePath = Enable<StoragePathFeature>();
@@ -44,7 +40,7 @@ public ListCommand(SeqConnectionFactory connectionFactory)
     protected override async Task<int> Run()
     {
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         var list = _entityIdentity.Id != null ?
             new[] { await connection.ApiKeys.FindAsync(_entityIdentity.Id) } :

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

@@ -26,16 +26,12 @@ 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>();
@@ -50,7 +46,7 @@ protected override async Task<int> Run()
         }
 
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         var toRemove = _entityIdentity.Id != null ? [await connection.ApiKeys.FindAsync(_entityIdentity.Id)]
             :

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");
 

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

@@ -29,18 +29,14 @@ namespace SeqCli.Cli.Commands.App;
 // ReSharper disable once UnusedType.Global
 class InstallCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     readonly ConnectionFeature _connection;
     readonly OutputFormatFeature _output;
     readonly StoragePathFeature _storagePath;
 
     string? _packageId, _version, _feedId;
 
-    public InstallCommand(SeqConnectionFactory connectionFactory)
+    public InstallCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         Options.Add(
             "package-id=",
             "The package id of the app to install",
@@ -70,7 +66,7 @@ protected override async Task<int> Run()
         }
 
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         var feedId = _feedId;
         if (feedId == null)

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

@@ -10,8 +10,6 @@ namespace SeqCli.Cli.Commands.App;
 [Command("app", "list", "List installed app packages", Example="seqcli app list")]
 class ListCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     string? _title, _id;
     readonly ConnectionFeature _connection;
     readonly OutputFormatFeature _output;
@@ -20,10 +18,8 @@ class ListCommand : Command
     string? PackageId => string.IsNullOrWhiteSpace(_title) ? null : _title.Trim();
     string? Id => string.IsNullOrWhiteSpace(_id) ? null : _id.Trim();
 
-    public ListCommand(SeqConnectionFactory connectionFactory)
+    public ListCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         Options.Add(
             "package-id=",
             "The package id of the app(s) to list",
@@ -48,7 +44,7 @@ protected override async Task<int> Run()
         }
 
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         var list = Id != null ? [await connection.Apps.FindAsync(Id)]
             :

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

@@ -14,16 +14,12 @@ namespace SeqCli.Cli.Commands.App;
 // ReSharper disable once UnusedType.Global
 class UninstallCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     string? _packageId, _id;
     readonly ConnectionFeature _connection;
     readonly StoragePathFeature _storagePath;
 
-    public UninstallCommand(SeqConnectionFactory connectionFactory)
+    public UninstallCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         Options.Add(
             "package-id=",
             "The package id of the app package to uninstall",
@@ -47,7 +43,7 @@ protected override async Task<int> Run()
         }
 
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         var toRemove = _id != null ? [await connection.Apps.FindAsync(_id)]
             : (await connection.Apps.ListAsync())

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

@@ -28,19 +28,15 @@ namespace SeqCli.Cli.Commands.App;
 // ReSharper disable once UnusedType.Global
 class UpdateCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     readonly ConnectionFeature _connection;
     readonly OutputFormatFeature _output;
     readonly StoragePathFeature _storagePath;
 
     string? _id, _name, _version;
     bool _all, _force;
 
-    public UpdateCommand(SeqConnectionFactory connectionFactory)
+    public UpdateCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         Options.Add(
             "i=|id=",
             "The id of a single installed app to update",
@@ -94,7 +90,7 @@ protected override async Task<int> Run()
         }
 
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
         var output = _output.GetOutputFormat(config);
 
         var apps = await connection.Apps.ListAsync();

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

@@ -16,8 +16,6 @@ namespace SeqCli.Cli.Commands.AppInstance;
     Example = "seqcli appinstance create -t 'Email Ops' --app hostedapp-314159 -p To=ops@example.com")]
 class CreateCommand : Command
 {
-    readonly SeqConnectionFactory _connectionFactory;
-
     readonly ConnectionFeature _connection;
     readonly OutputFormatFeature _output;
     readonly StoragePathFeature _storagePath;
@@ -27,10 +25,8 @@ class CreateCommand : Command
     readonly List<string> _overridable = new();
     bool _streamIncomingEvents;
 
-    public CreateCommand(SeqConnectionFactory connectionFactory)
+    public CreateCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         Options.Add(
             "t=|title=",
             "A title for the app instance",
@@ -78,7 +74,7 @@ public CreateCommand(SeqConnectionFactory connectionFactory)
     protected override async Task<int> Run()
     {
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         AppInstanceEntity instance = await connection.AppInstances.TemplateAsync(_appId)!;
 

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

@@ -10,17 +10,13 @@ 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;
     readonly StoragePathFeature _storagePath;
 
-    public ListCommand(SeqConnectionFactory connectionFactory)
+    public ListCommand()
     {
-        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
-
         _entityIdentity = Enable(new EntityIdentityFeature("app instance", "list"));
         _output = Enable<OutputFormatFeature>();
         _storagePath = Enable<StoragePathFeature>();
@@ -30,7 +26,7 @@ public ListCommand(SeqConnectionFactory connectionFactory)
     protected override async Task<int> Run()
     {
         var config = RuntimeConfigurationLoader.Load(_storagePath);
-        var connection = _connectionFactory.Connect(_connection, config);
+        var connection = SeqConnectionFactory.Connect(_connection, config);
 
         var list = _entityIdentity.Id != null ? [await connection.AppInstances.FindAsync(_entityIdentity.Id)]
             :