Fix issue with Batch error formatting

  - Also fix New-AzBatchTask parameter requirements.

Author: matthchr

src/Batch/Batch/ApplicationPackages/GetBatchApplicationPackageCommand.cs

@@ -39,7 +39,7 @@ public class GetBatchApplicationPackageCommand : BatchCmdletBase
         [ValidateNotNullOrEmpty]
         public string ApplicationVersion { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             if (string.IsNullOrEmpty(this.ApplicationVersion))
             {

src/Batch/Batch/ApplicationPackages/NewBatchApplicationPackageCommand.cs

@@ -60,7 +60,7 @@ public class NewBatchApplicationPackageCommand : BatchCmdletBase
         [ValidateNotNullOrEmpty]
         public SwitchParameter ActivateOnly { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             PSApplicationPackage response = BatchClient.UploadAndActivateApplicationPackage(
                 this.ResourceGroupName,

src/Batch/Batch/ApplicationPackages/RemoveBatchApplicationPackageCommand.cs

@@ -43,7 +43,7 @@ public class RemoveBatchApplicationPackageCommand : BatchCmdletBase
         [ValidateNotNullOrEmpty]
         public string ApplicationVersion { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             WriteVerboseWithTimestamp(Resources.BeginMAMLCall, mamlCall);
             BatchClient.DeleteApplicationPackage(this.ResourceGroupName, this.AccountName, this.ApplicationName, this.ApplicationVersion);

src/Batch/Batch/Applications/GetBatchApplicationCommand.cs

@@ -38,7 +38,7 @@ public class GetBatchApplicationCommand : BatchCmdletBase
         [Alias("ApplicationId")]
         public string ApplicationName { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             if (string.IsNullOrEmpty(this.ApplicationName))
             {

src/Batch/Batch/Applications/NewBatchApplicationCommand.cs

@@ -49,7 +49,7 @@ public class NewBatchApplicationCommand : BatchCmdletBase
         [ValidateNotNullOrEmpty]
         public string DisplayName { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             PSApplication response = BatchClient.AddApplication(this.ResourceGroupName, this.AccountName, this.ApplicationName, this.AllowUpdates, this.DisplayName);
             WriteObject(response);

src/Batch/Batch/Applications/RemoveBatchApplicationCommand.cs

@@ -38,7 +38,7 @@ public class RemoveBatchApplicationCommand : BatchCmdletBase
         [Alias("ApplicationId")]
         public string ApplicationName { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             WriteVerboseWithTimestamp(Resources.BeginMAMLCall, mamlCall);
             BatchClient.DeleteApplication(this.ResourceGroupName, this.AccountName, this.ApplicationName);

src/Batch/Batch/Applications/SetBatchApplicationCommand.cs

@@ -50,7 +50,7 @@ public class SetBatchApplicationCommand : BatchCmdletBase
         [ValidateNotNullOrEmpty]
         public bool? AllowUpdates { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             WriteVerboseWithTimestamp(Resources.BeginMAMLCall, mamlCall);
             BatchClient.UpdateApplication(this.ResourceGroupName, this.AccountName, this.ApplicationName, this.AllowUpdates, this.DefaultVersion, this.DisplayName);

src/Batch/Batch/BatchAccounts/GetBatchAccountCommand.cs

@@ -35,7 +35,7 @@ public class GetBatchAccountCommand : BatchCmdletBase
         [Parameter(Position = 2, ValueFromPipelineByPropertyName = true)]
         public Hashtable Tag { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             if (string.IsNullOrEmpty(this.AccountName))
             {

src/Batch/Batch/BatchAccounts/GetBatchAccountKeysCommand.cs

@@ -36,7 +36,7 @@ public class GetBatchAccountKeysCommand : BatchCmdletBase
         /// Get the keys associated with the specified account. If only the account name is passed in, then
         /// look up its resource group and construct a new BatchAccountContext to hold everything.
         /// </summary>
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             BatchAccountContext context = BatchClient.GetKeys(this.ResourceGroupName, this.AccountName);
             WriteObject(context);

src/Batch/Batch/BatchAccounts/GetBatchAccountNodeAgentSkuCommand.cs

@@ -36,7 +36,7 @@ public int MaxCount
             set { this.maxCount = value; }
         }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             foreach (PSNodeAgentSku nodeAgentSku in BatchClient.ListNodeAgentSkus(this.BatchContext, this.Filter, this.MaxCount, this.AdditionalBehaviors))
             {

src/Batch/Batch/BatchAccounts/NewBatchAccountCommand.cs

@@ -58,7 +58,7 @@ public class NewBatchAccountCommand : BatchCmdletBase
         [Parameter(ValueFromPipelineByPropertyName = true)]
         public Hashtable Tag { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             AccountCreateParameters parameters = new AccountCreateParameters(this.ResourceGroupName, this.AccountName, this.Location)
             {

src/Batch/Batch/BatchAccounts/NewBatchAccountKeyCommand.cs

@@ -52,7 +52,7 @@ public string KeyType
             }
         }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             BatchAccountContext context = BatchClient.RegenerateKeys(this.ResourceGroupName, this.AccountName, this.keyType);
             WriteObject(context);

src/Batch/Batch/BatchAccounts/RemoveBatchAccountCommand.cs

@@ -38,7 +38,7 @@ public class RemoveBatchAccountCommand : BatchCmdletBase
         [Parameter]
         public SwitchParameter Force { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             ConfirmAction(
                 Force.IsPresent,

src/Batch/Batch/BatchAccounts/SetBatchAccountCommand.cs

@@ -41,7 +41,7 @@ public class SetBatchAccountCommand : BatchCmdletBase
         [ValidateNotNullOrEmpty]
         public string AutoStorageAccountId { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             BatchAccountContext context = BatchClient.UpdateAccount(this.ResourceGroupName, this.AccountName, this.Tag, this.AutoStorageAccountId);
             WriteObject(context);

src/Batch/Batch/BatchCmdletBase.cs

@@ -19,11 +19,13 @@
 using Microsoft.WindowsAzure.Commands.Common;
 using Newtonsoft.Json.Linq;
 using System;
+using System.Linq;
+using System.Text;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
 
 namespace Microsoft.Azure.Commands.Batch
 {
-    public class BatchCmdletBase : AzureRMCmdlet
+    public abstract class BatchCmdletBase : AzureRMCmdlet
     {
         private BatchClient batchClient;
 
@@ -43,62 +45,63 @@ public BatchClient BatchClient
             set { batchClient = value; }
         }
 
-        protected virtual void OnProcessRecord()
-        {
-            // Intentionally left blank
-        }
+        protected abstract void ExecuteCmdletImpl();
 
         public override void ExecuteCmdlet()
         {
             try
             {
                 Validate.ValidateInternetConnection();
-                ProcessRecord();
-                OnProcessRecord();
+                ExecuteCmdletImpl();
             }
-            catch (AggregateException ex)
+            catch (BatchException ex)
             {
-                // When the OM encounters an error, it'll throw a BatchException.
-                // BatchExceptions have special handling to extract detailed failure information.  When an AggregateException
-                // is encountered, loop through the inner exceptions.  If there's a nested BatchException, perform the 
-                // special handling.  Otherwise, just write out the error.
-                AggregateException flattened = ex.Flatten();
-                foreach (Exception inner in flattened.InnerExceptions)
+                if (ex?.RequestInformation != null)
                 {
-                    BatchException asBatch = inner as BatchException;
-                    if (asBatch != null)
-                    {
-                        HandleBatchException(asBatch);
-                    }
-                    else
+                    StringBuilder sb = new StringBuilder();
+                    sb.AppendLine($"HttpStatusCode: " + ex.RequestInformation.HttpStatusCode);
+                    sb.AppendLine($"StatusMessage: " + ex.RequestInformation.HttpStatusMessage);
+                    sb.AppendLine($"ClientRequestId: {ex.RequestInformation.ClientRequestId}");
+                    sb.AppendLine($"RequestId: {ex.RequestInformation.ServiceRequestId}");
+
+                    if (ex.RequestInformation.BatchError != null)
                     {
-                        WriteExceptionError(inner);
+                        sb.AppendLine();
+                        sb.AppendLine($"Error code: {ex.RequestInformation.BatchError.Code}");
+                        if (ex.RequestInformation.BatchError.Message != null)
+                        {
+                            sb.AppendLine($"Message: {ex.RequestInformation.BatchError.Message.Value}");
+                        }
+
+                        if (ex.RequestInformation.BatchError.Values != null && ex.RequestInformation.BatchError.Values.Any())
+                        {
+                            sb.AppendLine("Error details:");
+                            foreach (var item in ex.RequestInformation.BatchError.Values)
+                            {
+                                sb.AppendLine($"{item.Key}: {item.Value}");
+                            }
+                        }
                     }
+
+                    throw new BatchException(ex.RequestInformation, sb.ToString(), ex.InnerException);
                 }
-            }
-            catch (BatchException ex)
-            {
-                HandleBatchException(ex);
+
+                throw;
             }
             catch (CloudException ex)
             {
-                var updatedEx = ex;
-
-                if (ex.Response != null && ex.Response.Content != null)
+                if (ex.Response?.Content != null)
                 {
                     var message = FindDetailedMessage(ex.Response.Content);
 
                     if (message != null)
                     {
-                        updatedEx = new CloudException(message, ex);
+                        var updatedEx = new CloudException(message, ex);
+                        throw updatedEx;
                     }
                 }
 
-                WriteExceptionError(updatedEx);
-            }
-            catch (Exception ex)
-            {
-                WriteExceptionError(ex);
+                throw;
             }
         }
 
@@ -110,7 +113,6 @@ public override void ExecuteCmdlet()
         /// <returns></returns>
         internal static string FindDetailedMessage(string content)
         {
-            // TODO: Revise after Task 2362107 is completed on the server side
             string message = null;
 
             if (CloudException.IsJson(content))
@@ -146,24 +148,5 @@ internal static string FindDetailedMessage(string content)
 
             return message;
         }
-
-        /// <summary>
-        /// Extracts failure details from the BatchException object to create a more informative error message for the user.
-        /// </summary>
-        /// <param name="ex">The BatchException object</param>
-        private void HandleBatchException(BatchException ex)
-        {
-            if (ex != null)
-            {
-                if (ex.RequestInformation != null && ex.RequestInformation.BatchError != null)
-                {
-                    WriteExceptionError(new BatchException(ex.RequestInformation, ex.ToString(), ex.InnerException));
-                }
-                else
-                {
-                    WriteExceptionError(ex);
-                }
-            }
-        }
     }
 }

src/Batch/Batch/BatchObjectModelCmdletBase.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Azure.Commands.Batch
     /// <summary>
     /// Base class for cmdlets that use the Batch OM.
     /// </summary>
-    public class BatchObjectModelCmdletBase : BatchCmdletBase
+    public abstract class BatchObjectModelCmdletBase : BatchCmdletBase
     {
         /// <summary>
         /// Collection of custom behaviors to perform on service calls

src/Batch/Batch/Certificates/GetBatchCertificateCommand.cs

@@ -49,7 +49,7 @@ public int MaxCount
         [ValidateNotNullOrEmpty]
         public string Select { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             ListCertificateOptions options = new ListCertificateOptions(this.BatchContext, this.AdditionalBehaviors)
             {

src/Batch/Batch/Certificates/NewBatchCertificateCommand.cs

@@ -41,7 +41,7 @@ public class NewBatchCertificateCommand : BatchObjectModelCmdletBase
         [ValidateNotNullOrEmpty]
         public SecureString Password { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             NewCertificateParameters parameters = new NewCertificateParameters(this.BatchContext, this.FilePath, this.RawData,
                 this.AdditionalBehaviors)

src/Batch/Batch/Certificates/RemoveBatchCertificateCommand.cs

@@ -33,7 +33,7 @@ public class RemoveBatchCertificateCommand : BatchObjectModelCmdletBase
         [ValidateNotNullOrEmpty]
         public string Thumbprint { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             CertificateOperationParameters parameters = new CertificateOperationParameters(this.BatchContext,
                 this.ThumbprintAlgorithm, this.Thumbprint, this.AdditionalBehaviors);

src/Batch/Batch/Certificates/StopBatchCertificateDeletionCommand.cs

@@ -31,7 +31,7 @@ public class StopBatchCertificateDeletionCommand : BatchObjectModelCmdletBase
         [ValidateNotNullOrEmpty]
         public string Thumbprint { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             CertificateOperationParameters parameters = new CertificateOperationParameters(this.BatchContext,
                 this.ThumbprintAlgorithm, this.Thumbprint, this.AdditionalBehaviors);

src/Batch/Batch/ComputeNodeUsers/NewBatchComputeNodeUserCommand.cs

@@ -55,7 +55,7 @@ public class NewBatchComputeNodeUserCommand : BatchObjectModelCmdletBase
         [Parameter]
         public SwitchParameter IsAdmin { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             NewComputeNodeUserParameters parameters = new NewComputeNodeUserParameters(this.BatchContext, this.PoolId, this.ComputeNodeId,
                 this.ComputeNode, this.AdditionalBehaviors)

src/Batch/Batch/ComputeNodeUsers/RemoveBatchComputeNodeUserCommand.cs

@@ -39,7 +39,7 @@ public class RemoveBatchComputeNodeUserCommand : BatchObjectModelCmdletBase
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             ComputeNodeUserOperationParameters parameters = new ComputeNodeUserOperationParameters(this.BatchContext, this.PoolId, this.ComputeNodeId,
                 this.Name, this.AdditionalBehaviors);

src/Batch/Batch/ComputeNodeUsers/SetBatchComputeNodeUserCommand.cs

@@ -47,7 +47,7 @@ public class SetBatchComputeNodeUserCommand : BatchObjectModelCmdletBase
         [ValidateNotNullOrEmpty]
         public DateTime ExpiryTime { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             UpdateComputeNodeUserParameters parameters = new UpdateComputeNodeUserParameters(this.BatchContext,
                 this.PoolId, this.ComputeNodeId, this.Name, this.AdditionalBehaviors)

src/Batch/Batch/ComputeNodes/DisableBatchComputeNodeSchedulingCommand.cs

@@ -41,7 +41,7 @@ public class DisableBatchComputeNodeSchedulingCommand : BatchObjectModelCmdletBa
         [ValidateNotNullOrEmpty]
         public DisableComputeNodeSchedulingOption? DisableSchedulingOption { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             DisableComputeNodeSchedulingParameters parameters = new DisableComputeNodeSchedulingParameters(this.BatchContext,
                 this.PoolId, this.Id, this.ComputeNode, this.AdditionalBehaviors)

src/Batch/Batch/ComputeNodes/EnableBatchComputeNodeSchedulingCommand.cs

@@ -35,7 +35,7 @@ public class EnableBatchComputeNodeSchedulingCommand : BatchObjectModelCmdletBas
         [ValidateNotNullOrEmpty]
         public PSComputeNode ComputeNode { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             ComputeNodeOperationParameters parameters = new ComputeNodeOperationParameters(this.BatchContext, this.PoolId,
                 this.Id, this.ComputeNode, this.AdditionalBehaviors);

src/Batch/Batch/ComputeNodes/GetBatchComputeNodeCommand.cs

@@ -56,7 +56,7 @@ public int MaxCount
         [ValidateNotNullOrEmpty]
         public string Select { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             ListComputeNodeOptions options = new ListComputeNodeOptions(this.BatchContext, this.PoolId, this.Pool, this.AdditionalBehaviors)
             {

src/Batch/Batch/ComputeNodes/GetBatchComputeNodeRemoteLoginSettingsCommand.cs

@@ -37,7 +37,7 @@ public class GetBatchComputeNodeRemoteLoginSettingsCommand : BatchObjectModelCmd
         [ValidateNotNullOrEmpty]
         public PSComputeNode ComputeNode { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             ComputeNodeOperationParameters parameters = new ComputeNodeOperationParameters(this.BatchContext, this.PoolId, this.ComputeNodeId, this.ComputeNode, this.AdditionalBehaviors);
 

src/Batch/Batch/ComputeNodes/RemoveBatchComputeNodeCommand.cs

@@ -49,7 +49,7 @@ public class RemoveBatchComputeNodeCommand : BatchObjectModelCmdletBase
         [Parameter]
         public SwitchParameter Force { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             string computeNodeIds = ComputeNode == null ? string.Join(",", this.Ids) : ComputeNode.Id;
             RemoveComputeNodeParameters parameters = new RemoveComputeNodeParameters(this.BatchContext, this.PoolId,

src/Batch/Batch/ComputeNodes/ResetBatchComputeNodeCommand.cs

@@ -41,7 +41,7 @@ public class ResetBatchComputeNodeCommand : BatchObjectModelCmdletBase
         [ValidateNotNullOrEmpty]
         public ComputeNodeReimageOption? ReimageOption { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ExecuteCmdletImpl()
         {
             ReimageComputeNodeParameters parameters = new ReimageComputeNodeParameters(this.BatchContext, this.PoolId,
                 this.Id, this.ComputeNode, this.AdditionalBehaviors)