Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Reacting to verbose rename #52

Merged
merged 1 commit into from
Dec 8, 2015
Merged

Reacting to verbose rename #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Microsoft.Extensions.SecretManager/CommandOutputLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ private string Caption(LogLevel logLevel)
{
switch (logLevel)
{
case LogLevel.Trace: return "\x1b[35mtrace\x1b[39m";
case LogLevel.Debug: return "\x1b[35mdebug\x1b[39m";
case LogLevel.Verbose: return "\x1b[35mverbose\x1b[39m";
case LogLevel.Information: return "\x1b[32minfo\x1b[39m";
case LogLevel.Warning: return "\x1b[33mwarn\x1b[39m";
case LogLevel.Error: return "\x1b[31mfail\x1b[39m";
Expand Down
16 changes: 8 additions & 8 deletions src/Microsoft.Extensions.SecretManager/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public int Main(string[] args)

if (optVerbose.HasValue())
{
CommandOutputProvider.LogLevel = LogLevel.Verbose;
CommandOutputProvider.LogLevel = LogLevel.Debug;
}

ProcessSecretFile(projectPath, secrets =>
Expand All @@ -107,7 +107,7 @@ public int Main(string[] args)

if (optVerbose.HasValue())
{
CommandOutputProvider.LogLevel = LogLevel.Verbose;
CommandOutputProvider.LogLevel = LogLevel.Debug;
}

ProcessSecretFile(projectPath, secrets =>
Expand Down Expand Up @@ -139,7 +139,7 @@ public int Main(string[] args)

if (optVerbose.HasValue())
{
CommandOutputProvider.LogLevel = LogLevel.Verbose;
CommandOutputProvider.LogLevel = LogLevel.Debug;
}

ProcessSecretFile(projectPath, secrets =>
Expand All @@ -164,7 +164,7 @@ public int Main(string[] args)

if (optVerbose.HasValue())
{
CommandOutputProvider.LogLevel = LogLevel.Verbose;
CommandOutputProvider.LogLevel = LogLevel.Debug;
}

ClearSecretFile(projectPath);
Expand Down Expand Up @@ -218,9 +218,9 @@ private void PrintAll(JObject secrets)

private void ProcessSecretFile(string projectPath, Action<JObject> observer, bool persist = true)
{
Logger.LogVerbose(Resources.Message_Project_File_Path, projectPath);
Logger.LogDebug(Resources.Message_Project_File_Path, projectPath);
var secretsFilePath = PathHelper.GetSecretsPath(projectPath);
Logger.LogVerbose(Resources.Message_Secret_File_Path, secretsFilePath);
Logger.LogDebug(Resources.Message_Secret_File_Path, secretsFilePath);
var secretObj = File.Exists(secretsFilePath) ?
JObject.Parse(File.ReadAllText(secretsFilePath)) :
new JObject();
Expand All @@ -235,9 +235,9 @@ private void ProcessSecretFile(string projectPath, Action<JObject> observer, boo

private void ClearSecretFile(string projectPath)
{
Logger.LogVerbose(Resources.Message_Project_File_Path, projectPath);
Logger.LogDebug(Resources.Message_Project_File_Path, projectPath);
var secretsFilePath = PathHelper.GetSecretsPath(projectPath);
Logger.LogVerbose(Resources.Message_Secret_File_Path, secretsFilePath);
Logger.LogDebug(Resources.Message_Secret_File_Path, secretsFilePath);

WriteSecretsFile(secretsFilePath, new JObject());
}
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.Extensions.SecretManager.Tests/SecretManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public void SetSecret_Update_Existing_Secret()
public void SetSecret_With_Verbose_Flag()
{
var projectPath = UserSecretHelper.GetTempSecretProject();
var logger = new TestLogger(_runtimeEnv, verbose: true);
var logger = new TestLogger(_runtimeEnv, debug: true);
var secretManager = new Program(_runtimeEnv) { Logger = logger };

secretManager.Main(new string[] { "-v", "set", "secret1", "value1", "-p", projectPath });
Expand Down
6 changes: 3 additions & 3 deletions test/Microsoft.Extensions.SecretManager.Tests/TestLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public class TestLogger : ILogger
{
private readonly CommandOutputLogger _commandOutputLogger;

public TestLogger(IRuntimeEnvironment runtimeEnv, bool verbose = false)
public TestLogger(IRuntimeEnvironment runtimeEnv, bool debug = false)
{
var commandOutputProvider = new CommandOutputProvider(runtimeEnv);
if (verbose)
if (debug)
{
commandOutputProvider.LogLevel = LogLevel.Verbose;
commandOutputProvider.LogLevel = LogLevel.Debug;
}

_commandOutputLogger = (CommandOutputLogger)commandOutputProvider.CreateLogger("");
Expand Down