Addressing code review comments.

Author: Francisco-Gamino

src/ResourceManager/Automation/Commands.Automation/Cmdlet/AzureAutomationBaseCmdlet.cs

@@ -90,13 +90,10 @@ public override void ExecuteCmdlet()
                 {
                     if (!string.IsNullOrEmpty(ErrorResponseException.Response.Content))
                     {
-                        if (IsValidJsonObject(ErrorResponseException.Response.Content))
+                        var message = ParseJson(ErrorResponseException.Response.Content);
+                        if (!string.IsNullOrEmpty(message))
                         {
-                            var message = ParseJson(ErrorResponseException.Response.Content);
-                            if (!string.IsNullOrEmpty(message))
-                            {
-                                throw new ErrorResponseException(message, ErrorResponseException);
-                            }
+                            throw new ErrorResponseException(message, ErrorResponseException);
                         }
                     }
                 }
@@ -113,7 +110,7 @@ private string ParseJson(string value)
             value = value.Trim();
             try
             {
-                var nestedError = JsonConvert.DeserializeObject<AzureAutomationNestedErrorResponseMessage>(value);
+                var nestedError = JsonConvert.DeserializeObject<AzureAutomationErrorResponseMessage>(value);
                 return nestedError.Error.Message;
             }
             catch
@@ -123,7 +120,7 @@ private string ParseJson(string value)
 
             try
             {
-                var error = JsonConvert.DeserializeObject<AzureAutomationErrorResponseMessage>(value);
+                var error = JsonConvert.DeserializeObject<AzureAutomationErrorInfo>(value);
                 return error.Message;
             }
             catch
@@ -167,25 +164,5 @@ protected bool GenerateCmdletOutput(IEnumerable<object> results)
 
             return ret;
         }
-
-        // This function determines if the given value is a Json object.
-        private bool IsValidJsonObject(string value)
-        {
-            value = value.Trim();
-            if (value.StartsWith("{") && value.EndsWith("}"))
-            {
-                try
-                {
-                    var result = JObject.Parse(value);
-                    return true;
-                }
-                catch
-                {
-                    // ignore the failure
-                    return false;
-                }
-            }
-            return false;
-        }
     }
 }

src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj

@@ -148,9 +148,9 @@
     <Compile Include="Common\AutomationPSClientSourceControl.cs" />
     <Compile Include="Common\AutomationPSClientWebhook.cs" />
     <Compile Include="Common\AutomationCmdletParameterSet.cs" />
-    <Compile Include="Common\AzureAutomationNestedErrorResponseMessage.cs" />
-    <Compile Include="Common\AzureAutomationOperationException.cs" />
+    <Compile Include="Common\AzureAutomationErrorInfo.cs" />
     <Compile Include="Common\AzureAutomationErrorResponseMessage.cs" />
+    <Compile Include="Common\AzureAutomationOperationException.cs" />
     <Compile Include="Common\Constants.cs" />
     <Compile Include="Common\DscNodeStatus.cs" />
     <Compile Include="Common\IAutomationPSClient.cs" />

src/ResourceManager/Automation/Commands.Automation/Common/AzureAutomationNestedErrorResponseMessage.cs renamed to src/ResourceManager/Automation/Commands.Automation/Common/AzureAutomationErrorInfo.cs

@@ -19,28 +19,21 @@ namespace Microsoft.Azure.Commands.Automation.Common
     /// <summary>
     /// The error response message.
     /// </summary>
-    public class AzureAutomationNestedErrorResponseMessage
+    public class AzureAutomationErrorInfo
     {
-        // Gets or sets the extended error info.
+        // Gets or sets the error code.
         [JsonProperty(Required = Required.Default)]
-        public AzureAutomationErrorInfo Error { get; set; }
+        public string Code { get; set; }
 
-        // Initializes a new instance of the class.
-        public AzureAutomationNestedErrorResponseMessage(string code, string message)
-        {
-            this.Error = new AzureAutomationErrorInfo { Code = code, Message = message };
-        }
+        // Gets or sets the error message.
+        [JsonProperty(Required = Required.Default)]
+        public string Message { get; set; }
 
-        /// The error information.
-        public class AzureAutomationErrorInfo
+        // Initializes a new instance of the class.
+        public AzureAutomationErrorInfo(string code, string message)
         {
-            // Gets or sets the error code.
-            [JsonProperty(Required = Required.Default)]
-            public string Code { get; set; }
-
-            // Gets or sets the error message.
-            [JsonProperty(Required = Required.Default)]
-            public string Message { get; set; }
+            this.Code = code;
+            this.Message = message;
         }
     }
 }

src/ResourceManager/Automation/Commands.Automation/Common/AzureAutomationErrorResponseMessage.cs

@@ -21,19 +21,14 @@ namespace Microsoft.Azure.Commands.Automation.Common
     /// </summary>
     public class AzureAutomationErrorResponseMessage
     {
-        // Gets or sets the error code.
+        // Gets or sets the extended error info.
         [JsonProperty(Required = Required.Default)]
-        public string Code { get; set; }
-
-        // Gets or sets the error message.
-        [JsonProperty(Required = Required.Default)]
-        public string Message { get; set; }
+        public AzureAutomationErrorInfo Error { get; set; }
 
         // Initializes a new instance of the class.
         public AzureAutomationErrorResponseMessage(string code, string message)
         {
-            this.Code = code;
-            this.Message = message;
+            this.Error = new AzureAutomationErrorInfo(code, message);
         }
     }
 }