Regenerate and support latest Azure Batch SDK

  - Add support for Azure Batch SDK 8.0.
    - Includes one new cmdlet (Get-AzureBatchTaskCounts) and a number of cmdlet updates.
  - Re-record tests.
  - Regenerate help text.
  - Use secure string for password fields.

Author: matthchr

src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

@@ -106,7 +106,8 @@ CmdletsToExport = 'Remove-AzureRmBatchAccount', 'Get-AzureRmBatchAccount',
                'New-AzureBatchComputeNodeUser', 'Remove-AzureBatchComputeNodeUser', 
                'Enable-AzureBatchTask', 'Set-AzureBatchTask', 'Stop-AzureBatchTask', 
                'Get-AzureBatchComputeNode', 'Get-AzureBatchJobSchedule', 
-               'New-AzureBatchJobSchedule', 'Remove-AzureBatchJobSchedule'
+               'New-AzureBatchJobSchedule', 'Remove-AzureBatchJobSchedule',
+               'Get-AzureBatchTaskCounts'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/AzureBatch/BatchModelGenerator/Program.cs

@@ -46,9 +46,13 @@ public class Program
             {"Microsoft.Azure.Batch.CloudTask", "PSCloudTask"},
             {"Microsoft.Azure.Batch.CloudServiceConfiguration", "PSCloudServiceConfiguration"},
             {"Microsoft.Azure.Batch.ComputeNode", "PSComputeNode"},
+            {"Microsoft.Azure.Batch.ComputeNodeEndpointConfiguration", "PSComputeNodeEndpointConfiguration"},
             {"Microsoft.Azure.Batch.ComputeNodeError", "PSComputeNodeError"},
             {"Microsoft.Azure.Batch.ComputeNodeInformation", "PSComputeNodeInformation"},
             {"Microsoft.Azure.Batch.ComputeNodeUser", "PSComputeNodeUser"},
+            {"Microsoft.Azure.Batch.ContainerConfiguration", "PSContainerConfiguration"},
+            {"Microsoft.Azure.Batch.ContainerRegistry", "PSContainerRegistry"},
+            {"Microsoft.Azure.Batch.DataDisk", "PSDataDisk"},
             {"Microsoft.Azure.Batch.DeleteCertificateError", "PSDeleteCertificateError"},
             {"Microsoft.Azure.Batch.EnvironmentSetting", "PSEnvironmentSetting"},
             {"Microsoft.Azure.Batch.ExitConditions", "PSExitConditions"},
@@ -57,6 +61,8 @@ public class Program
             {"Microsoft.Azure.Batch.ExitOptions", "PSExitOptions"},
             {"Microsoft.Azure.Batch.FileProperties", "PSFileProperties"},
             {"Microsoft.Azure.Batch.ImageReference", "PSImageReference"},
+            {"Microsoft.Azure.Batch.InboundEndpoint", "PSInboundEndpoint"},
+            {"Microsoft.Azure.Batch.InboundNatPool", "PSInboundNatPool"},
             {"Microsoft.Azure.Batch.RemoteLoginSettings", "PSRemoteLoginSettings"},
             {"Microsoft.Azure.Batch.JobConstraints", "PSJobConstraints"},
             {"Microsoft.Azure.Batch.JobExecutionInformation", "PSJobExecutionInformation"},
@@ -71,13 +77,20 @@ public class Program
             {"Microsoft.Azure.Batch.JobSchedulingError", "PSJobSchedulingError"},
             {"Microsoft.Azure.Batch.JobSpecification", "PSJobSpecification"},
             {"Microsoft.Azure.Batch.JobStatistics", "PSJobStatistics"},
+            {"Microsoft.Azure.Batch.LinuxUserConfiguration", "PSLinuxUserConfiguration"},
             {"Microsoft.Azure.Batch.MetadataItem", "PSMetadataItem"},
             {"Microsoft.Azure.Batch.MultiInstanceSettings", "PSMultiInstanceSettings"},
             {"Microsoft.Azure.Batch.NameValuePair", "PSNameValuePair"},
             {"Microsoft.Azure.Batch.NetworkConfiguration", "PSNetworkConfiguration"},
+            {"Microsoft.Azure.Batch.NetworkSecurityGroupRule", "PSNetworkSecurityGroupRule"},
             {"Microsoft.Azure.Batch.NodeAgentSku", "PSNodeAgentSku"},
             {"Microsoft.Azure.Batch.NodeFile", "PSNodeFile"},
             {"Microsoft.Azure.Batch.OSDisk", "PSOSDisk"},
+            {"Microsoft.Azure.Batch.OutputFile", "PSOutputFile"},
+            {"Microsoft.Azure.Batch.OutputFileDestination", "PSOutputFileDestination"},
+            {"Microsoft.Azure.Batch.OutputFileUploadOptions", "PSOutputFileUploadOptions"},
+            {"Microsoft.Azure.Batch.OutputFileBlobContainerDestination", "PSOutputFileBlobContainerDestination"},
+            {"Microsoft.Azure.Batch.PoolEndpointConfiguration", "PSPoolEndpointConfiguration"},
             {"Microsoft.Azure.Batch.PoolInformation", "PSPoolInformation"},
             {"Microsoft.Azure.Batch.PoolSpecification", "PSPoolSpecification"},
             {"Microsoft.Azure.Batch.PoolStatistics", "PSPoolStatistics"},
@@ -91,11 +104,14 @@ public class Program
             {"Microsoft.Azure.Batch.StartTaskInformation", "PSStartTaskInformation"},
             {"Microsoft.Azure.Batch.SubtaskInformation", "PSSubtaskInformation"},
             {"Microsoft.Azure.Batch.TaskConstraints", "PSTaskConstraints"},
+            {"Microsoft.Azure.Batch.TaskContainerExecutionInformation", "PSTaskContainerExecutionInformation"},
+            {"Microsoft.Azure.Batch.TaskContainerSettings", "PSTaskContainerSettings"},
+            {"Microsoft.Azure.Batch.TaskCounts", "PSTaskCounts"},
             {"Microsoft.Azure.Batch.TaskDependencies", "PSTaskDependencies"},
             {"Microsoft.Azure.Batch.TaskExecutionInformation", "PSTaskExecutionInformation"},
             {"Microsoft.Azure.Batch.TaskInformation", "PSTaskInformation"},
             {"Microsoft.Azure.Batch.TaskIdRange", "PSTaskIdRange"},
-            {"Microsoft.Azure.Batch.TaskSchedulingError", "PSTaskSchedulingError"},
+            {"Microsoft.Azure.Batch.TaskFailureInformation", "PSTaskFailureInformation"},
             {"Microsoft.Azure.Batch.TaskSchedulingPolicy", "PSTaskSchedulingPolicy"},
             {"Microsoft.Azure.Batch.TaskStatistics", "PSTaskStatistics"},
             {"Microsoft.Azure.Batch.UsageStatistics", "PSUsageStatistics"},

src/ResourceManager/AzureBatch/ChangeLog.md

@@ -27,19 +27,51 @@
         - $autoUser = New-Object Microsoft.Azure.Commands.Batch.Models.PSAutoUserSpecification -ArgumentList @("Task", "Admin")
         - $userIdentity = New-Object Microsoft.Azure.Commands.Batch.Models.PSUserIdentity $autoUser
     - Added the `AuthenticationTokenSettings` parameter. This parameter allows you to request the Batch service provide an authentication token to the task when it runs, avoiding the need to pass Batch account keys to the task in order to issue requests to the Batch service.
-* Added the `UserAccounts` parameter to `New-AzureBatchPool`.
-    - This parameter defines user accounts created on each node in the pool.
+    - Added the `ContainerSettings` parameter.
+        - This parameter allows you to request the Batch service run the task inside a container.
+    - Added the `OutputFiles` parameter.
+        - This parameter allows you to configure the task to upload files to Azure Storage after it has finished.
+* Updated parameters to `New-AzureBatchPool`.
+    - Added the `UserAccounts` parameter.
+        - This parameter defines user accounts created on each node in the pool.
+    - Added `TargetLowPriorityComputeNodes` and renamed `TargetDedicated` to `TargetDedicatedComputeNodes`.
+        - A `TargetDedicated` alias was created for the `TargetDedicatedComputeNodes` parameter.
+    - Added the `NetworkConfiguration` parameter.
+        - This parameter allows you to configure the pools network settings.
+* Updated parameters to `New-AzureBatchCertificate`.
+    - The `Password` parameter is now a `SecureString`.
+* Updated parameters to `New-AzureBatchComputeNodeUser`.
+    - The `Password` parameter is now a `SecureString`.
+* Updated parameters to `Set-AzureBatchComputeNodeUser`.
+    - The `Password` parameter is now a `SecureString`.
 * Renamed the `Name` parameter to `Path` on `Get-AzureBatchNodeFile`, `Get-AzureBatchNodeFileContent`, and `Remove-AzureBatchNodeFile`.
     - A `Name` alias was created for the `Path` parameter.
 * Changes to objects:
     - Removed the `RunElevated` property on `PSCloudTask`, `PSStartTask`, `PSJobManagerTask`, `PSJobPreparationTask`, and `PSJobReleaseTask`. The `UserIdentity` property has been added to replace `RunElevated`. Equivalent behavior to `RunElevated = $true` can be achieved by constructing a `PSUserIdentity` as shown below:
         - $autoUser = New-Object Microsoft.Azure.Commands.Batch.Models.PSAutoUserSpecification -ArgumentList @("Task", "Admin")
         - $userIdentity = New-Object Microsoft.Azure.Commands.Batch.Models.PSUserIdentity $autoUser
     - Added the `AuthenticationTokenSettings` property to `PSCloudTask` and `PSJobManagerTask`.
+    - Added the `OutputFiles` property to `PSCloudTask`, and `PSJobManagerTask`.
+    - Added the `ContainerSettings` property to `PSCloudTask`, `PSStartTask`, `PSJobManagerTask`, `PSJobPreparationTask`, and `PSJobReleaseTask`.
+    - Added the `AllowLowPriorityNode` property to `PSJobManagerTask`.
+    - Renamed the `SchedulingError` property on `PSJobPreparationTaskExecutionInformation`, `PSJobReleaseTaskExecutionInformation`, `PSStartTaskInformation`, `PSSubtaskInformation`, and `PSTaskExecutionInformation` to `FailureInformation`.
+        - `FailureInformation` is returned any time there is a task failure. This includes all previous scheduling error cases, as well as nonzero task exit codes, and file upload failures from the new output files feature.
+    - Renamed `PSTaskSchedulingError` to `PSTaskFailureInformation`.
+    - Added the `ContainerInformation` and `Result` properties to `PSJobPreparationTaskExecutionInformation`, `PSJobReleaseTaskExecutionInformation`, `PSStartTaskInformation`, `PSSubtaskInformation`, and `PSTaskExecutionInformation`.
     - Added the `UserAccounts` property to `PSCloudPool` and `PSPoolSpecification`.
+    - Added the `TargetLowPriorityComputeNodes` property to `PSCloudPool` and `PSPoolSpecification`, and renamed `TargetDedicated` to `TargetDedicatedComputeNodes`.
     - Renamed the `Name` property on `PSNodeFile` to `Path`.
+    - Added the `EndpointConfiguration` and `IsDedicated` property to `PSComputeNode`.
+    - Renamed the `SchedulingError` property on `PSExitConditions` to `PreProcessingError`.
+    - Added the `FileUploadError` to `PSExitConditions`.
     - Added the `DependencyAction` property to `PSExitOptions`.
-    - Added the `OSDisk` property to `PSVirtualMachineConfiguration`. Note that in order to allow deploying nodes using custom VHDs, the Batch account being used must have been created with `PoolAllocationMode = UserSubscription`.
+    - Added the `OSDisk`, `ContainerConfiguration`, `DataDisks`, and `LicenseType` properties to `PSVirtualMachineConfiguration`.
+    - Added the `VirtualMachineImageId` property to `PSImageReference`. Note that in order to allow deploying nodes using custom VHDs, the `BatchAccountContext` must be using Azure Active Directory authentication.
+    - Added the `OnAllTasksComplete` and `OnTaskFailure` properties to `PSJobSpecification`.
+    - Added the `EndpointConfiguration` property to `PSNetworkConfiguration`.
+    - Renamed `ResizeError` to `ResizeErrors` on `PSCloudPool`, and it is now a collection.
+    - `PSMultiInstanceSettings` constructor no longer takes a required `numberOfInstances` parameter, instead it takes a required `coordinationCommandLine` parameter.
+
 * Added support for Azure Active Directory based authentication.
     - To use Azure Active Directory authentication, retrieve a `BatchAccountContext` object using the `Get-AzureRmBatchAccount` cmdlet, and supply this `BatchAccountContext` to the `-BatchContext` parameter of a Batch service cmdlet. Azure Active Directory authentication is mandatory for accounts with `PoolAllocationMode = UserSubscription`.
     - For existing accounts or for new accounts created with `PoolAllocationMode = BatchService`, you may continue to use shared key authentication by retrieving a `BatchAccountContext` object using the `Get-AzureRmBatchAccoutKeys` cmdlet.

src/ResourceManager/AzureBatch/Commands.Batch.Test/BatchTestHelpers.cs

@@ -27,6 +27,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.Azure.Commands.Batch.Models;
+using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Xunit;
 using ProxyModels = Microsoft.Azure.Batch.Protocol.Models;
@@ -689,6 +690,28 @@ public static AzureOperationResponse<
             return response;
         }
 
+        /// <summary>
+        /// Builds a TaskCountsGetResponse object
+        /// </summary>
+        public static AzureOperationResponse<ProxyModels.TaskCounts, ProxyModels.JobGetTaskCountsHeaders> CreateTaskCountsGetResponse(
+            int active, int running, int succeeded, int failed, ProxyModels.TaskCountValidationStatus validationStatus)
+        {
+            var response = new AzureOperationResponse<ProxyModels.TaskCounts, ProxyModels.JobGetTaskCountsHeaders>();
+            response.Response = new HttpResponseMessage(HttpStatusCode.OK);
+            
+            ProxyModels.TaskCounts taskCounts = new ProxyModels.TaskCounts();
+            taskCounts.Active = active;
+            taskCounts.Running = running;
+            taskCounts.Succeeded = succeeded;
+            taskCounts.Failed = failed;
+            taskCounts.Completed = succeeded + failed;
+            taskCounts.ValidationStatus = validationStatus;
+
+            response.Body = taskCounts;
+
+            return response;
+        }
+
         /// <summary>
         /// Builds a CloudTaskListResponse object
         /// </summary>

src/ResourceManager/AzureBatch/Commands.Batch.Test/Certificates/NewBatchCertificateCommandTests.cs

@@ -24,6 +24,7 @@
 using System.Management.Automation;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
+using Microsoft.WindowsAzure.Commands.Common;
 using Xunit;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
 
@@ -119,7 +120,7 @@ public void NewBatchCertificateRequestBodyTest()
 
             // Verify that when the raw data is specified with a password, the request body matches expectations
             cmdlet.RawData = cert.RawData;
-            cmdlet.Password = BatchTestHelpers.TestCertificatePassword;
+            cmdlet.Password = BatchTestHelpers.TestCertificatePassword.ConvertToSecureString();
             cmdlet.ExecuteCmdlet();
             Assert.Equal(CertificateFormat.Pfx, requestParameters.CertificateFormat);
             Assert.Equal(BatchTestHelpers.TestCertificateAlgorithm, requestParameters.ThumbprintAlgorithm);
@@ -139,7 +140,7 @@ public void NewBatchCertificateRequestBodyTest()
             Assert.Equal(certDataBase64String, requestParameters.Data);
 
             // Verify that when a file path is specified with a password, the request body matches expectations
-            cmdlet.Password = BatchTestHelpers.TestCertificatePassword;
+            cmdlet.Password = BatchTestHelpers.TestCertificatePassword.ConvertToSecureString();
             cmdlet.ExecuteCmdlet();
             Assert.Equal(CertificateFormat.Pfx, requestParameters.CertificateFormat);
             Assert.Equal(BatchTestHelpers.TestCertificateAlgorithm, requestParameters.ThumbprintAlgorithm);

src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj

@@ -44,8 +44,8 @@
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Batch, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Azure.Batch.6.1.0\lib\net45\Microsoft.Azure.Batch.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Batch, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Azure.Batch.8.0.0\lib\net452\Microsoft.Azure.Batch.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
@@ -98,12 +98,10 @@
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.10\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.10\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
@@ -262,6 +260,7 @@
     <Compile Include="ScenarioTests\JobScheduleTests.cs" />
     <Compile Include="Locations\GetBatchLocationQuotasCommandTests.cs" />
     <Compile Include="Tasks\GetBatchSubtaskCommandTests.cs" />
+    <Compile Include="Tasks\GetBatchTaskCountsCommandTests.cs" />
     <Compile Include="Tasks\GetBatchTaskCommandTests.cs" />
     <Compile Include="Tasks\NewBatchTaskCommandTests.cs" />
     <Compile Include="Tasks\RemoveBatchTaskCommandTests.cs" />

src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/NewBatchComputeNodeUserCommandTests.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
+using Microsoft.WindowsAzure.Commands.Common;
 using Xunit;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
 using ProxyModels = Microsoft.Azure.Batch.Protocol.Models;
@@ -57,7 +58,7 @@ public void NewBatchComputeNodeUserParametersTest()
             cmdlet.PoolId = "testPool";
             cmdlet.ComputeNodeId = "computeNode1";
             cmdlet.Name = "testUser";
-            cmdlet.Password = "Password1234";
+            cmdlet.Password = "Password1234".ConvertToSecureString();
 
             // Don't go to the service on an Add ComputeNodeUser call
             RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<
@@ -81,7 +82,7 @@ public void NewBatchComputeNodeUserParametersGetPassedToRequestTest()
             cmdlet.PoolId = "testPool";
             cmdlet.ComputeNodeId = "computeNode1";
             cmdlet.Name = "user";
-            cmdlet.Password = "password";
+            cmdlet.Password = "password".ConvertToSecureString();
             cmdlet.IsAdmin = true;
             cmdlet.ExpiryTime = DateTime.Now.AddDays(30);
 
@@ -101,7 +102,7 @@ public void NewBatchComputeNodeUserParametersGetPassedToRequestTest()
 
             // Verify the request parameters match the cmdlet parameters
             Assert.Equal(cmdlet.Name, requestParameters.Name);
-            Assert.Equal(cmdlet.Password, requestParameters.Password);
+            Assert.Equal(cmdlet.Password.ConvertToString(), requestParameters.Password);
             Assert.Equal(cmdlet.IsAdmin, requestParameters.IsAdmin);
             Assert.Equal(cmdlet.ExpiryTime, requestParameters.ExpiryTime);
         }

src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/SetBatchComputeNoderUserCommandTests.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
+using Microsoft.WindowsAzure.Commands.Common;
 using Xunit;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
 
@@ -82,7 +83,7 @@ public void SetBatchComputeNodeUserRequestTest()
             cmdlet.PoolId = "testPool";
             cmdlet.ComputeNodeId = "computeNode1";
             cmdlet.Name = "testUser";
-            cmdlet.Password = "Password1234";
+            cmdlet.Password = "Password1234".ConvertToSecureString();
             cmdlet.ExpiryTime = DateTime.Now.AddDays(1);
 
             string requestPassword = null;
@@ -101,7 +102,7 @@ public void SetBatchComputeNodeUserRequestTest()
             cmdlet.ExecuteCmdlet();
 
             // Verify the request parameters match expectations
-            Assert.Equal(cmdlet.Password, requestPassword);
+            Assert.Equal(cmdlet.Password.ConvertToString(), requestPassword);
             Assert.Equal(cmdlet.ExpiryTime, requestExpiryTime);
         }
     }