From ee4e55441874cb08d9c060e61298da6983411bf6 Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Fri, 15 May 2020 15:43:13 +1000
Subject: [PATCH] Update to the latest 2020.1 API version

---
 src/SeqCli/Cli/Commands/ApiKey/CreateCommand.cs | 10 +++++-----
 src/SeqCli/Cli/Commands/Signal/CreateCommand.cs |  3 ++-
 src/SeqCli/Cli/Commands/User/CreateCommand.cs   |  3 ++-
 src/SeqCli/SeqCli.csproj                        |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/SeqCli/Cli/Commands/ApiKey/CreateCommand.cs b/src/SeqCli/Cli/Commands/ApiKey/CreateCommand.cs
index 238e5c4e..039cd9cd 100644
--- a/src/SeqCli/Cli/Commands/ApiKey/CreateCommand.cs
+++ b/src/SeqCli/Cli/Commands/ApiKey/CreateCommand.cs
@@ -17,7 +17,7 @@
 using System.Threading.Tasks;
 using Seq.Api.Model.Inputs;
 using Seq.Api.Model.LogEvents;
-using Seq.Api.Model.Signals;
+using Seq.Api.Model.Shared;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
 using SeqCli.Connection;
@@ -82,17 +82,17 @@ protected override async Task<int> Run()
             var apiKey = await connection.ApiKeys.TemplateAsync();
 
             apiKey.Title = _title;
-            apiKey.AppliedProperties = _properties.Properties
+            apiKey.InputSettings.AppliedProperties = _properties.Properties
                 .Select(kvp => new InputAppliedPropertyPart {Name = kvp.Key, Value = kvp.Value})
                 .ToList();
-            apiKey.UseServerTimestamps = _useServerTimestamps;
+            apiKey.InputSettings.UseServerTimestamps = _useServerTimestamps;
 
             // If _token is null, a value will be returned when the key is created
             apiKey.Token = _token;
 
             if (_filter != null)
             {
-                apiKey.InputFilter = new SignalFilterPart
+                apiKey.InputSettings.Filter = new DescriptiveFilterPart
                 {
                     Filter = (await connection.Expressions.ToStrictAsync(_filter)).StrictExpression,
                     FilterNonStrict = _filter
@@ -101,7 +101,7 @@ protected override async Task<int> Run()
 
             if (_level != null)
             {
-                apiKey.MinimumLevel = Enum.Parse<LogEventLevel>(LevelMapping.ToFullLevelName(_level));
+                apiKey.InputSettings.MinimumLevel = Enum.Parse<LogEventLevel>(LevelMapping.ToFullLevelName(_level));
             }
 
             apiKey = await connection.ApiKeys.AddAsync(apiKey);
diff --git a/src/SeqCli/Cli/Commands/Signal/CreateCommand.cs b/src/SeqCli/Cli/Commands/Signal/CreateCommand.cs
index 43a55440..5fcf1c15 100644
--- a/src/SeqCli/Cli/Commands/Signal/CreateCommand.cs
+++ b/src/SeqCli/Cli/Commands/Signal/CreateCommand.cs
@@ -15,6 +15,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Seq.Api.Model.Shared;
 using Seq.Api.Model.Signals;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
@@ -101,7 +102,7 @@ protected override async Task<int> Run()
             {
                 signal.Filters = new[]
                 {
-                    new SignalFilterPart
+                    new DescriptiveFilterPart
                     {
                         Filter = (await connection.Expressions.ToStrictAsync(_filter)).StrictExpression,
                         FilterNonStrict = _filter
diff --git a/src/SeqCli/Cli/Commands/User/CreateCommand.cs b/src/SeqCli/Cli/Commands/User/CreateCommand.cs
index 75d4f3ee..0a405fc6 100644
--- a/src/SeqCli/Cli/Commands/User/CreateCommand.cs
+++ b/src/SeqCli/Cli/Commands/User/CreateCommand.cs
@@ -15,6 +15,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Seq.Api.Model.Shared;
 using Seq.Api.Model.Signals;
 using SeqCli.Cli.Features;
 using SeqCli.Config;
@@ -128,7 +129,7 @@ protected override async Task<int> Run()
 
             if (_filter != null)
             {
-                user.ViewFilter = new SignalFilterPart
+                user.ViewFilter = new DescriptiveFilterPart
                 {
                     Filter = (await connection.Expressions.ToStrictAsync(_filter)).StrictExpression,
                     FilterNonStrict = _filter
diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj
index a3dcaf80..2475bf76 100644
--- a/src/SeqCli/SeqCli.csproj
+++ b/src/SeqCli/SeqCli.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Superpower" Version="2.3.0" />
     <PackageReference Include="System.Reactive" Version="4.3.1" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
-    <PackageReference Include="Seq.Api" Version="2020.1.0-*" />
+    <PackageReference Include="Seq.Api" Version="2020.1.0-dev-00132" />
     <PackageReference Include="Seq.Apps" Version="5.1.0" />
   </ItemGroup>
 </Project>