Merge pull request #1438 from PepperDash/set-secrets-formatting

This commit is contained in:
Neil Dorin 2026-07-02 14:08:32 -06:00 committed by GitHub
commit f34d7223e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Crestron.SimplSharp; using Crestron.SimplSharp;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Core.Logging;
using Serilog.Events; using Serilog.Events;
namespace PepperDash.Essentials.Core namespace PepperDash.Essentials.Core
@ -296,19 +297,14 @@ namespace PepperDash.Essentials.Core
{ {
var secretPresent = provider.TestSecret(key); var secretPresent = provider.TestSecret(key);
Debug.LogMessage(LogEventLevel.Verbose, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key); provider.LogVerbose("SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
if (!secretPresent) if (!secretPresent)
return return
String.Format( $"Unable to update secret for {provider.Key}:{key} - Please use the 'SetSecret' command to modify it";
"Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to modify it");
var response = provider.SetSecret(key, secret) var response = provider.SetSecret(key, secret)
? String.Format( ? $"Secret successfully set for {provider.Key}:{key}"
"Secret successfully set for {0}:{1}", : $"Unable to set secret for {provider.Key}:{key}";
provider.Key, key)
: String.Format(
"Unable to set secret for {0}:{1}",
provider.Key, key);
return response; return response;
} }
@ -316,19 +312,14 @@ namespace PepperDash.Essentials.Core
{ {
var secretPresent = provider.TestSecret(key); var secretPresent = provider.TestSecret(key);
Debug.LogMessage(LogEventLevel.Verbose, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key); provider.LogVerbose("SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
if (secretPresent) if (secretPresent)
return return
String.Format( $"Unable to set secret for {provider.Key}:{key} - Please use the 'UpdateSecret' command to modify it";
"Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
var response = provider.SetSecret(key, secret) var response = provider.SetSecret(key, secret)
? String.Format( ? $"Secret successfully set for {provider.Key}:{key}"
"Secret successfully set for {0}:{1}", : $"Unable to set secret for {provider.Key}:{key}";
provider.Key, key)
: String.Format(
"Unable to set secret for {0}:{1}",
provider.Key, key);
return response; return response;
} }
@ -377,15 +368,10 @@ namespace PepperDash.Essentials.Core
var key = args[1]; var key = args[1];
provider.SetSecret(key, ""); provider.SetSecret(key, "");
response = provider.SetSecret(key, "") response = provider.SetSecret(key, "")
? String.Format( ? $"Secret successfully deleted for {provider.Key}:{key}"
"Secret successfully deleted for {0}:{1}", : $"Unable to delete secret for {provider.Key}:{key}";
provider.Key, key)
: String.Format(
"Unable to delete secret for {0}:{1}",
provider.Key, key);
CrestronConsole.ConsoleCommandResponse(response); CrestronConsole.ConsoleCommandResponse(response);
return; return;