5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

5.1 Maintenance Release#123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nblumhardt merged 10 commits into from
Sep 28, 2019
Merged

5.1 Maintenance Release #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a17c9b
add a docker publish script
KodrAus Aug 27, 2019
2b2546f
Merge pull request #115 from KodrAus/chore/docker-publish
nblumhardt Aug 27, 2019
3ae5f69
Fixes #117 - apply --timeout to HttpClient
nblumhardt Sep 15, 2019
39a3ebe
Merge pull request #119 from nblumhardt/httpclient-timeouts
nblumhardt Sep 15, 2019
d9961d2
Basic seqcli profile support; fixes #25
nblumhardt Sep 16, 2019
dc94292
Delete seqcli.sln.DotSettings.orig
nblumhardt Sep 16, 2019
560f79a
Merge pull request #120 from nblumhardt/profiles
nblumhardt Sep 16, 2019
1b72bd7
Don't crash on empty trailing lines when reading frames; fixes #118
nblumhardt Sep 16, 2019
76438c1
Try working around frame reader trailing line arrival deadline in tests
nblumhardt Sep 16, 2019
a36a223
Merge pull request #121 from nblumhardt/frame-reader
nblumhardt Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions docker-publish.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
param (
[Parameter(Mandatory=$true)]
[string] $version
)

$versionParts = $version.Split('.')

$major = $versionParts[0]
$minor = $versionParts[1]

$baseImage = "datalust/seqcli-ci:$version"
$publishImages = "datalust/seqcli:latest", "datalust/seqcli:$major", "datalust/seqcli:$major.$minor", "datalust/seqcli:$version"

$choices = "&Yes", "&No"
$decision = $Host.UI.PromptForChoice("Publishing ($baseImage) as ($publishImages)", "Does this look right?", $choices, 1)
if ($decision -eq 0) {
foreach ($publishImage in $publishImages) {
Write-Host "Publishing $publishImage"

docker tag $baseImage $publishImage
if ($LASTEXITCODE) { exit 1 }

docker push $publishImage
if ($LASTEXITCODE) { exit 1 }
}
} else {
Write-Host "Cancelled"
}
12 changes: 11 additions & 1 deletion seqcli.sln.DotSettings
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
<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:Boolean x:Key="/Default/UserDictionary/Words/=apikey/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Camelize/@EntryIndexedValue">True</s:Boolean>
<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/=hackily/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=mdash/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=seqcli/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=serilogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=STDIN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=syslogdt/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=trailingindent/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=unawaited/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
63 changes: 45 additions & 18 deletions src/SeqCli/Cli/Commands/ConfigCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Datalust Pty Ltd
// Copyright 2018-2019 Datalust Pty Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All@@ -13,11 +13,13 @@
// limitations under the License.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands
Expand All@@ -37,6 +39,8 @@ public ConfigCommand()

protected override Task<int> Run()
{
var verb = "read";

try
{
var config = SeqCliConfig.Read();
Expand All@@ -45,11 +49,13 @@ protected override Task<int> Run()
{
if (_clear)
{
verb = "clear";
Clear(config, _key);
SeqCliConfig.Write(config);
}
else if (_value != null)
{
verb = "update";
Set(config, _key, _value);
SeqCliConfig.Write(config);
}
Expand All@@ -67,7 +73,7 @@ protected override Task<int> Run()
}
catch (Exception ex)
{
Log.Fatal(ex, "Could not update config: {ErrorMessage}", ex.Message);
Log.Error(ex, "Could not {Verb} config: {ErrorMessage}", verb, Presentation.FormattedMessage(ex));
return Task.FromResult(1);
}
}
Expand All@@ -94,20 +100,25 @@ static void Set(SeqCliConfig config, string key, string value)
throw new ArgumentException("The format of the key is incorrect; run the command without any arguments to view all keys.");

var first = config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[0]);

if (first == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

var v = first.GetValue(config);
if (v is Dictionary<string, SeqCliConnectionConfig>)
throw new NotSupportedException("Use `seqcli profile create` to configure connection profiles.");

var second = v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic)
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
.SingleOrDefault(p => Camelize(p.Name) == steps[1]);

if (second == null)
throw new ArgumentException("The key could not be found; run the command without any arguments to view all keys.");

if (!second.SetMethod.IsPublic)
throw new ArgumentException("The value is not writeable.");

var targetValue = Convert.ChangeType(value, second.PropertyType);
second.SetValue(v, targetValue);
Expand All@@ -120,37 +131,53 @@ static void Clear(SeqCliConfig config, string key)

static void List(SeqCliConfig config)
{
foreach (var pr in ReadPairs(config))
foreach (var (key, value) in ReadPairs(config))
{
Console.WriteLine($"{pr.Key}:");
Console.WriteLine($" {pr.Value}");
Console.WriteLine($"{key}:");
Console.WriteLine($" {value}");
}
}

static IEnumerable<KeyValuePair<string, object>> ReadPairs(object config)
{
foreach (var first in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && !p.GetMethod.IsStatic)
foreach (var property in config.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.CanRead && p.GetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
{
var step1 = Camelize(first.Name) + ".";
var v = first.GetValue(config);
var propertyName = Camelize(property.Name);
var propertyValue = property.GetValue(config);

foreach (var second in v.GetType().GetTypeInfo().DeclaredProperties
.Where(p => p.GetMethod.IsPublic && p.SetMethod.IsPublic && !p.GetMethod.IsStatic && !p.Name.StartsWith("Encoded"))
.OrderBy(p => p.Name))
if (propertyValue is IDictionary dict)
{
var name = step1 + Camelize(second.Name);
var v2 = second.GetValue(v);
yield return new KeyValuePair<string, object>(name, v2);
foreach (var elementKey in dict.Keys)
{
foreach (var elementPair in ReadPairs(dict[elementKey]))
{
yield return new KeyValuePair<string, object>(
$"{propertyName}[{elementKey}].{elementPair.Key}",
elementPair.Value);
}
}
}
else if (propertyValue?.GetType().Namespace?.StartsWith("SeqCli.Config") ?? false)
{
foreach (var childPair in ReadPairs(propertyValue))
{
var name = propertyName + "." + childPair.Key;
yield return new KeyValuePair<string, object>(name, childPair.Value);
}
}
else
{
yield return new KeyValuePair<string, object>(propertyName, propertyValue);
}
}
}

static string Camelize(string s)
{
if (s.Length < 2)
throw new NotImplementedException("No camel-case support for short names");
throw new NotSupportedException("No camel-case support for short names");
return char.ToLowerInvariant(s[0]) + s.Substring(1);
}
}
Expand Down
13 changes: 7 additions & 6 deletions src/SeqCli/Cli/Commands/HelpCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ public HelpCommand(IEnumerable<Meta<Lazy<Command>, CommandMetadata>> availableCo
protected override Task<int> Run(string[] unrecognised)
{
var ea = Assembly.GetEntryAssembly();
// ReSharper disable once PossibleNullReferenceException
var name = ea.GetName().Name;

if (_markdown)
Expand All@@ -61,8 +62,8 @@ protected override Task<int> Run(string[] unrecognised)
{
var cmd = cmds.Single();
var argHelp = cmd.Value.Value.HasArgs ? " [<args>]" : "";
var subcommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subcommandHelp + argHelp);
var subCommandHelp = subCommand == null ? "" : " " + subCommand;
Console.WriteLine(name + " " + cmd.Metadata.Name + subCommandHelp + argHelp);
Console.WriteLine();
Console.WriteLine(cmd.Metadata.HelpText);
Console.WriteLine();
Expand DownExpand Up@@ -93,7 +94,7 @@ void PrintMarkdownHelp(string executableName)
Console.WriteLine("Available commands:");
Console.WriteLine();

foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name))
foreach (var cmd in _availableCommands.GroupBy(cmd => cmd.Metadata.Name).OrderBy(c => c.Key))
{
if (cmd.Count() == 1)
{
Expand All@@ -102,7 +103,7 @@ void PrintMarkdownHelp(string executableName)
else
{
Console.WriteLine($" - `{cmd.Key}`");
foreach (var sub in cmd)
foreach (var sub in cmd.OrderBy(s => s.Metadata.SubCommand))
{
Console.WriteLine($" - [`{cmd.Key} {sub.Metadata.SubCommand}`](#{cmd.Key}-{sub.Metadata.SubCommand}) &mdash; {sub.Metadata.HelpText}.");
}
Expand DownExpand Up@@ -161,7 +162,7 @@ void PrintHelp(string executableName)
Console.WriteLine("Available commands are:");

var printedGroups = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var avail in _availableCommands)
foreach (var avail in _availableCommands.OrderBy(c => c.Metadata.Name))
{
if (avail.Metadata.SubCommand != null)
{
Expand All@@ -187,7 +188,7 @@ void PrintHelp(string executableName, string topLevelCommand)
Console.WriteLine();
Console.WriteLine("Available sub-commands are:");

foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand))
foreach (var avail in _availableCommands.Where(c => c.Metadata.Name == topLevelCommand).OrderBy(c => c.Metadata.SubCommand))
{
Printing.Define($" {avail.Metadata.SubCommand}", avail.Metadata.HelpText, 13, Console.Out);
}
Expand Down
63 changes: 63 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/CreateCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "create", "Create or replace a connection profile",
Example = "seqcli profile create -n Production -s https://seq.example.com -a th15ISanAPIk3y")]
class CreateCommand : Command
{
string _url, _apiKey, _name;

public CreateCommand()
{
Options.Add("n=|name=",
"The name of the connection profile",
v => _name = ArgumentString.Normalize(v));

Options.Add("s=|server=",
"The URL of the Seq server",
v => _url = ArgumentString.Normalize(v));

Options.Add("a=|apikey=",
"The API key to use when connecting to the server, if required",
v => _apiKey = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

if (_url == null)
{
Log.Error("A server URL is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
config.Profiles[_name] = new SeqCliConnectionConfig { ServerUrl = _url, ApiKey = _apiKey };
SeqCliConfig.Write(config);
return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
24 changes: 24 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/ListCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using SeqCli.Config;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "list", "List connection profiles",
Example = "seqcli profile list")]
class ListCommand : Command
{
protected override Task<int> Run()
{
var config = SeqCliConfig.Read();

foreach (var profile in config.Profiles.OrderBy(p => p.Key))
{
Console.WriteLine($"{profile.Key} ({profile.Value.ServerUrl})");
}

return Task.FromResult(0);
}
}
}
55 changes: 55 additions & 0 deletions src/SeqCli/Cli/Commands/Profile/RemoveCommand.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
using System;
using System.Threading.Tasks;
using SeqCli.Config;
using SeqCli.Util;
using Serilog;

namespace SeqCli.Cli.Commands.Profile
{
[Command("profile", "remove", "Remove a connection profile",
Example = "seqcli profile remove -n Production")]
class RemoveCommand : Command
{
string _name;

public RemoveCommand()
{
Options.Add("n=|name=",
"The name of the connection profile to remove",
v => _name = ArgumentString.Normalize(v));
}

protected override Task<int> Run()
{
return Task.FromResult(RunSync());
}

int RunSync()
{
if (_name == null)
{
Log.Error("A profile name is required");
return 1;
}

try
{
var config = SeqCliConfig.Read();
if (!config.Profiles.Remove(_name))
{
Log.Error("No profile with name {ProfileName} was found", _name);
return 1;
}

SeqCliConfig.Write(config);

return 0;
}
catch (Exception ex)
{
Log.Error("Could not create profile: {ErrorMessage}", Presentation.FormattedMessage(ex));
return 1;
}
}
}
}
Loading