Skip to content

Commit ecae5bb

Browse files
authored
Fixed a bug for Get-AzKeyVaultSecret -AsPlainText (#14661)
Co-authored-by: Beisi Zhou <[email protected]>
1 parent 1c7c155 commit ecae5bb

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/KeyVault/KeyVault.Test/PesterTests/Secret.Tests.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ Describe "Get secret" {
1515
$versions = Get-AzKeyVaultSecret -VaultName $vaultName -Name $secretName -IncludeVersions
1616
Get-AzKeyVaultSecret -VaultName $vaultName -Name $secretName -Version $versions[0].Version -AsPlainText | Should -BeExactly $secretTextV2
1717
Get-AzKeyVaultSecret -VaultName $vaultName -Name $secretName -Version $versions[1].Version -AsPlainText | Should -BeExactly $secretText
18+
Get-AzKeyVaultSecret -VaultName $vaultName -Name "doesnotexist" -AsPlainText | Should -BeNullOrEmpty
1819
}
1920
}

src/KeyVault/KeyVault/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Fixed a bug for `Get-AzKeyVaultSecret -AsPlainText` if the secret is not found [#14645]
2122

2223
## Version 3.4.1
2324
* Supported upcoming new API design for `Export-AzKeyVaultSecurityDomain`

src/KeyVault/KeyVault/Commands/GetAzureKeyVaultSecret.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ private void WriteSecret(PSKeyVaultSecret secret)
284284
{
285285
if (AsPlainText)
286286
{
287-
WriteObject(ConvertFromSecureString(secret.SecretValue));
287+
WriteObject(ConvertFromSecureString(secret?.SecretValue));
288288
}
289289
else
290290
{
@@ -294,6 +294,10 @@ private void WriteSecret(PSKeyVaultSecret secret)
294294

295295
private string ConvertFromSecureString(SecureString secretValue)
296296
{
297+
if(secretValue == null)
298+
{
299+
return null;
300+
}
297301
var ssPtr = Marshal.SecureStringToBSTR(secretValue);
298302
try
299303
{

0 commit comments

Comments
 (0)