Clarified error message when updating purged secret

Azure · Apr 25, 2021 · a3014bc · a3014bc
1 parent 5a79ab3
commit a3014bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/KeyVault/KeyVault/ChangeLog.md b/src/KeyVault/KeyVault/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Clarified error message when updating purged secret [#14800]
 
 ## Version 3.4.2
 * Fixed a bug for `Get-AzKeyVaultSecret -AsPlainText` if the secret is not found [#14645]

diff --git a/src/KeyVault/KeyVault/Models/KeyVaultDataServiceClient.cs b/src/KeyVault/KeyVault/Models/KeyVaultDataServiceClient.cs
@@ -20,6 +20,7 @@
 using System.Net;
 using System.Security;
 using System.Security.Cryptography.X509Certificates;
+using System.Text.RegularExpressions;
 using System.Xml;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
@@ -1439,6 +1440,20 @@ public PSDeletedKeyVaultManagedStorageSasDefinition DeleteManagedStorageSasDefin
         private Exception GetInnerException(Exception exception)
         {
             while (exception.InnerException != null) exception = exception.InnerException;
+            if (exception is KeyVaultErrorException kvEx)
+            {
+                var detailedMsg = exception.Message;
+                var match = Regex.Match(kvEx.Response.Content, @"""message"":"".+?""");
+                while (match.Success)
+                {
+                    var msg = match.Value.Substring(11);
+                    msg = msg.Substring(0, msg.Length - 1);
+                    detailedMsg += (Environment.NewLine + msg);
+                    match = match.NextMatch();
+                }
+
+                exception = new KeyVaultErrorException(detailedMsg, kvEx);
+            }
             return exception;
         }