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

Commit bc2e7c7

Browse files
authored
Refactor LocalSecretStore (#62)
1 parent 1426db2 commit bc2e7c7

File tree

2 files changed

+130
-170
lines changed

2 files changed

+130
-170
lines changed

Modules/Microsoft.PowerShell.SecretManagement/src/code/SecretManagement.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -401,15 +401,15 @@ private void StoreVaultParameters(
401401

402402
// Store parameters in built-in local secure vault.
403403
int errorCode = 0;
404-
if (!LocalSecretStore.WriteObject(
404+
if (!LocalSecretStore.Instance.WriteObject(
405405
name: parametersName,
406406
parameters,
407407
ref errorCode))
408408
{
409409
var msg = string.Format(
410410
CultureInfo.InvariantCulture,
411411
"Unable to register vault extension because writing script parameters to the built-in local store failed with error: {0}",
412-
LocalSecretStore.GetErrorMessage(errorCode));
412+
LocalSecretStore.Instance.GetErrorMessage(errorCode));
413413

414414
ThrowTerminatingError(
415415
new ErrorRecord(
@@ -541,9 +541,9 @@ private void RemoveParamSecrets(
541541
if (!string.IsNullOrEmpty(parametersName))
542542
{
543543
int errorCode = 0;
544-
if (!LocalSecretStore.DeleteObject(parametersName, ref errorCode))
544+
if (!LocalSecretStore.Instance.DeleteObject(parametersName, ref errorCode))
545545
{
546-
var errorMessage = LocalSecretStore.GetErrorMessage(errorCode);
546+
var errorMessage = LocalSecretStore.Instance.GetErrorMessage(errorCode);
547547
var msg = string.Format(CultureInfo.InvariantCulture,
548548
"Removal of vault info script parameters {0} failed with error {1}", parametersName, errorMessage);
549549
WriteError(
@@ -764,7 +764,7 @@ private void SearchLocalStore(string name)
764764
{
765765
// Search through the built-in local vault.
766766
int errorCode = 0;
767-
if (LocalSecretStore.EnumerateObjectInfo(
767+
if (LocalSecretStore.Instance.EnumerateObjectInfo(
768768
filter: Name,
769769
outSecretInfo: out SecretInformation[] outSecretInfo,
770770
errorCode: ref errorCode))
@@ -955,7 +955,7 @@ private void WriteNotFoundError()
955955
private bool SearchLocalStore(string name)
956956
{
957957
int errorCode = 0;
958-
if (LocalSecretStore.ReadObject(
958+
if (LocalSecretStore.Instance.ReadObject(
959959
name: name,
960960
outObject: out object outObject,
961961
ref errorCode))
@@ -1084,7 +1084,7 @@ protected override void EndProcessing()
10841084
int errorCode = 0;
10851085
if (NoClobber)
10861086
{
1087-
if (LocalSecretStore.ReadObject(
1087+
if (LocalSecretStore.Instance.ReadObject(
10881088
name: Name,
10891089
out object _,
10901090
ref errorCode))
@@ -1101,12 +1101,12 @@ protected override void EndProcessing()
11011101
}
11021102

11031103
errorCode = 0;
1104-
if (!LocalSecretStore.WriteObject(
1104+
if (!LocalSecretStore.Instance.WriteObject(
11051105
name: Name,
11061106
objectToWrite: secretToWrite,
11071107
ref errorCode))
11081108
{
1109-
var errorMessage = LocalSecretStore.GetErrorMessage(errorCode);
1109+
var errorMessage = LocalSecretStore.Instance.GetErrorMessage(errorCode);
11101110
var msg = string.Format(CultureInfo.InvariantCulture,
11111111
"The secret could not be written to the local default vault. Error: {0}", errorMessage);
11121112
ThrowTerminatingError(
@@ -1165,11 +1165,11 @@ protected override void ProcessRecord()
11651165
{
11661166
// Remove from local built-in default vault.
11671167
int errorCode = 0;
1168-
if (!LocalSecretStore.DeleteObject(
1168+
if (!LocalSecretStore.Instance.DeleteObject(
11691169
name: Name,
11701170
ref errorCode))
11711171
{
1172-
var errorMessage = LocalSecretStore.GetErrorMessage(errorCode);
1172+
var errorMessage = LocalSecretStore.Instance.GetErrorMessage(errorCode);
11731173
var msg = string.Format(CultureInfo.InvariantCulture,
11741174
"The secret could not be removed from the local default vault. Error: {0}", errorMessage);
11751175
ThrowTerminatingError(

0 commit comments

Comments
 (0)