From 6262a7eaf56b2934e34e25d9e894d5d6b78f2991 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 2 Dec 2015 18:08:34 -0800 Subject: [PATCH] Reacting to verbose rename --- .../CommandOutputLogger.cs | 2 +- .../Program.cs | 16 ++++++++-------- .../SecretManagerTests.cs | 2 +- .../TestLogger.cs | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.Extensions.SecretManager/CommandOutputLogger.cs b/src/Microsoft.Extensions.SecretManager/CommandOutputLogger.cs index 03e77f3..7760bc7 100644 --- a/src/Microsoft.Extensions.SecretManager/CommandOutputLogger.cs +++ b/src/Microsoft.Extensions.SecretManager/CommandOutputLogger.cs @@ -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"; diff --git a/src/Microsoft.Extensions.SecretManager/Program.cs b/src/Microsoft.Extensions.SecretManager/Program.cs index 41dc940..df772a0 100644 --- a/src/Microsoft.Extensions.SecretManager/Program.cs +++ b/src/Microsoft.Extensions.SecretManager/Program.cs @@ -80,7 +80,7 @@ public int Main(string[] args) if (optVerbose.HasValue()) { - CommandOutputProvider.LogLevel = LogLevel.Verbose; + CommandOutputProvider.LogLevel = LogLevel.Debug; } ProcessSecretFile(projectPath, secrets => @@ -107,7 +107,7 @@ public int Main(string[] args) if (optVerbose.HasValue()) { - CommandOutputProvider.LogLevel = LogLevel.Verbose; + CommandOutputProvider.LogLevel = LogLevel.Debug; } ProcessSecretFile(projectPath, secrets => @@ -139,7 +139,7 @@ public int Main(string[] args) if (optVerbose.HasValue()) { - CommandOutputProvider.LogLevel = LogLevel.Verbose; + CommandOutputProvider.LogLevel = LogLevel.Debug; } ProcessSecretFile(projectPath, secrets => @@ -164,7 +164,7 @@ public int Main(string[] args) if (optVerbose.HasValue()) { - CommandOutputProvider.LogLevel = LogLevel.Verbose; + CommandOutputProvider.LogLevel = LogLevel.Debug; } ClearSecretFile(projectPath); @@ -218,9 +218,9 @@ private void PrintAll(JObject secrets) private void ProcessSecretFile(string projectPath, Action 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(); @@ -235,9 +235,9 @@ private void ProcessSecretFile(string projectPath, Action 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()); } diff --git a/test/Microsoft.Extensions.SecretManager.Tests/SecretManagerTests.cs b/test/Microsoft.Extensions.SecretManager.Tests/SecretManagerTests.cs index b1fcc8d..85c5559 100644 --- a/test/Microsoft.Extensions.SecretManager.Tests/SecretManagerTests.cs +++ b/test/Microsoft.Extensions.SecretManager.Tests/SecretManagerTests.cs @@ -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 }); diff --git a/test/Microsoft.Extensions.SecretManager.Tests/TestLogger.cs b/test/Microsoft.Extensions.SecretManager.Tests/TestLogger.cs index 07542a7..2e071c6 100644 --- a/test/Microsoft.Extensions.SecretManager.Tests/TestLogger.cs +++ b/test/Microsoft.Extensions.SecretManager.Tests/TestLogger.cs @@ -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("");