Merge pull request #344 from datalust/dev

2024.3 Release

Author: KodrAus

.gitignore

@@ -46,7 +46,6 @@ dlldata.c
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
 
 *_i.c
 *_p.c

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2024.2.{build}
+version: 2024.3.{build}
 skip_tags: true
 image:
 - Visual Studio 2022

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.203"
+    "version": "8.0.204"
   }
 }

src/Roastery/Data/Database.cs

@@ -9,7 +9,6 @@
 using Serilog;
 using Serilog.Events;
 using SerilogTracing;
-using SerilogTracing.Instrumentation;
 
 namespace Roastery.Data;
 

src/Roastery/Web/RequestLoggingMiddleware.cs

@@ -5,7 +5,6 @@
 using Serilog.Context;
 using Serilog.Events;
 using SerilogTracing;
-using SerilogTracing.Instrumentation;
 
 namespace Roastery.Web;
 

src/SeqCli/Cli/CommandMetadata.cs

@@ -16,8 +16,8 @@ namespace SeqCli.Cli;
 
 public class CommandMetadata : ICommandMetadata
 {
-    public string Name { get; set; } = null!;
+    public required string Name { get; set; }
     public string? SubCommand { get; set; }
-    public string HelpText { get; set; } = null!;
+    public required string HelpText { get; set; }
     public string? Example { get; set; }
 }

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

@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using SeqCli.Cli.Features;
+using SeqCli.Connection;
+using SeqCli.Util;
+using Serilog;
+
+namespace SeqCli.Cli.Commands.App;
+
+[Command("app", "uninstall", "Uninstall an app package",
+    Example = "seqcli app uninstall --package-id 'Seq.App.JsonArchive'")]
+// ReSharper disable once UnusedType.Global
+class UninstallCommand : Command
+{
+    readonly SeqConnectionFactory _connectionFactory;
+
+    string? _packageId, _id;
+    readonly ConnectionFeature _connection;
+
+    public UninstallCommand(SeqConnectionFactory connectionFactory)
+    {
+        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
+
+        Options.Add(
+            "package-id=",
+            "The package id of the app package to uninstall",
+            packageId => _packageId = ArgumentString.Normalize(packageId));
+        
+        Options.Add(
+            "i=|id=",
+            "The id of a single app package to uninstall",
+            t => _id = ArgumentString.Normalize(t));
+
+        _connection = Enable<ConnectionFeature>();
+    }
+
+    protected override async Task<int> Run()
+    {
+        if (_packageId == null && _id == null)
+        {
+            Log.Error("A `package-id` or `id` must be specified");
+            return 1;
+        }
+
+        var connection = _connectionFactory.Connect(_connection);
+
+        var toRemove = _id != null ? [await connection.Apps.FindAsync(_id)]
+            : (await connection.Apps.ListAsync())
+                .Where(app => _packageId == app.Package.PackageId) 
+                .ToArray();
+
+        if (!toRemove.Any())
+        {
+            Log.Error("No matching API key was found");
+            return 1;
+        }
+
+        foreach (var app in toRemove)
+            await connection.Apps.RemoveAsync(app);
+
+        return 0;
+    }
+}

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

@@ -52,7 +52,7 @@ public CreateCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config
 
         Options.Add(
             "stream:",
-            "Stream incoming events to this app instance as they're ingested; optionally accepts a signal expression limiting which events should be streamed",
+            "Stream incoming events to this app instance as they're ingested; optionally accepts a signal expression limiting which events should be streamed, for example `signal-1,signal-2`",
             s =>
             {
                 _streamIncomingEvents = true;
@@ -116,4 +116,4 @@ bool ValidateSettingName(string settingName)
 
         return 0;
     }
-}
+}

src/SeqCli/Cli/Commands/Bench/QueryBenchCase.cs

@@ -18,8 +18,8 @@ namespace SeqCli.Cli.Commands.Bench;
 
 class QueryBenchCase
 {
-    public string Id { get; set; } = null!;
-    public string Query { get; set; } = null!;
+    public required string Id { get; set; }
+    public required string Query { get; set; }
     public string? SignalExpression { get; set; }
 
     // Not used programmatically at this time.

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

@@ -0,0 +1,70 @@
+// 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System;
+using System.Threading.Tasks;
+using Seq.Api.Model.Signals;
+using SeqCli.Cli.Features;
+using SeqCli.Config;
+using SeqCli.Connection;
+using SeqCli.Signals;
+using SeqCli.Syntax;
+using SeqCli.Util;
+using Serilog;
+
+namespace SeqCli.Cli.Commands.ExpressionIndex;
+
+[Command("expressionindex", "create", "Create an expression index",
+    Example = "seqcli expressionindex create --expression \"ServerName\"")]
+class CreateCommand : Command
+{
+    readonly SeqConnectionFactory _connectionFactory;
+
+    readonly ConnectionFeature _connection;
+    readonly OutputFormatFeature _output;
+
+    string? _expression;
+
+    public CreateCommand(SeqConnectionFactory connectionFactory, SeqCliConfig config)
+    {
+        _connectionFactory = connectionFactory ?? throw new ArgumentNullException(nameof(connectionFactory));
+
+        Options.Add(
+            "e=|expression=",
+            "The expression to index",
+            v => _expression = ArgumentString.Normalize(v));
+
+        _connection = Enable<ConnectionFeature>();
+        _output = Enable(new OutputFormatFeature(config.Output));
+    }
+
+    protected override async Task<int> Run()
+    {
+        var connection = _connectionFactory.Connect(_connection);
+
+        if (string.IsNullOrEmpty(_expression))
+        {
+            Log.Error("An `expression` must be specified");
+            return 1;
+        }
+
+        var index = await connection.ExpressionIndexes.TemplateAsync();
+        index.Expression = _expression;
+        index = await connection.ExpressionIndexes.AddAsync(index);
+
+        _output.WriteEntity(index);
+
+        return 0;
+    }
+}