Merge branch 'dev' of github.com:datalust/seqcli into opt-in-to-apikey-forwarding

# Conflicts:
#	src/SeqCli/Forwarder/Web/Api/IngestionEndpoints.cs

Author: liammclennan

README.md

@@ -19,7 +19,7 @@ seqcli config -k connection.serverUrl -v https://your-seq-server
 seqcli config -k connection.apiKey -v your-api-key
 ```
 
-The API key will be stored in your `SeqCli.json` configuration file; on Windows, this is encrypted using DPAPI; on Mac/Linux the key is currently stored in plain text. As an alternative to storing the API key in configuration, it can be passed to each command via the `--apikey=` argument.
+The API key will be stored in your `SeqCli.json` configuration file; on Windows, this is encrypted using DPAPI; on Mac/Linux the key is stored in plain text unless an encryptor is defined in `encryption.encryptor`. As an alternative to storing the API key in configuration, it can be passed to each command via the `--apikey=` argument.
 
 `seqcli` is also available as a Docker container under [`datalust/seqcli`](https://store.docker.com/community/images/datalust/seqcli):
 

build/Build.Windows.ps1

@@ -28,7 +28,7 @@ function Restore-Packages
 
 function Execute-Tests($version)
 {
-    & dotnet test ./test/SeqCli.Tests/SeqCli.Tests.csproj -c Release /p:Configuration=Release /p:Platform=x64 /p:VersionPrefix=$version
+    & dotnet test ./test/SeqCli.Tests/SeqCli.Tests.csproj -c Release --framework "$framework$windowsTfmSuffix" /p:Configuration=Release /p:Platform=x64 /p:VersionPrefix=$version
     if($LASTEXITCODE -ne 0) { throw "Build failed" }
 }
 

seqcli.sln.DotSettings

@@ -18,6 +18,7 @@
 	<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/=ingestionlog/@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>

…eqCli/Connection/SeqConnectionFactory.cs src/SeqCli/Api/SeqConnectionFactory.cssrc/SeqCli/Connection/SeqConnectionFactory.cs renamed to src/SeqCli/Api/SeqConnectionFactory.cs src/SeqCli/Connection/SeqConnectionFactory.cs renamed to src/SeqCli/Api/SeqConnectionFactory.cs

@@ -16,9 +16,8 @@
 using Seq.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Encryptor;
 
-namespace SeqCli.Connection;
+namespace SeqCli.Api;
 
 static class SeqConnectionFactory
 {

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

@@ -19,9 +19,9 @@
 using Seq.Api.Model.LogEvents;
 using Seq.Api.Model.Security;
 using Seq.Api.Model.Shared;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Levels;
 using SeqCli.Util;
 using Serilog;

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

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.ApiKey;
 

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

@@ -15,9 +15,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using Serilog;
 
 namespace SeqCli.Cli.Commands.ApiKey;

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

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using Seq.Api;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.ApiKey;
 

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

@@ -16,9 +16,9 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 using SeqCli.Util;
 using Serilog;
 

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

@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using SeqCli.Api;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
-using SeqCli.Connection;
 
 namespace SeqCli.Cli.Commands.App;