Covering the case where you can activate an application package with no filePath needed

Author: matthew-rollitt

src/ResourceManager/AzureBatch/Commands.Batch.Test/Applications/NewBatchApplicationPackageCommandTests.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Batch.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
@@ -66,6 +67,31 @@ public void UploadBatchApplicationPackageTest()
             batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format, false), Times.Once());
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void UploadBatchApplicationPackageNoFilePathProvidedTest()
+        {
+            string accountName = "account01";
+            string resourceGroup = "resourceGroup";
+            string applicationId = "applicationId";
+            string version = "version";
+            string format = "zip";
+            string filePath = "";
+
+            cmdlet.BatchClient = new BatchClient();
+
+            cmdlet.AccountName = accountName;
+            cmdlet.ResourceGroupName = resourceGroup;
+            cmdlet.ApplicationId = applicationId;
+            cmdlet.ApplicationVersion = version;
+            cmdlet.FilePath = filePath;
+            cmdlet.Format = format;
+            cmdlet.ActivateOnly = false;
+
+            Assert.Throws<ArgumentNullException>(() => cmdlet.ExecuteCmdlet());
+
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void ActivateApplicationPackageOnly()

src/ResourceManager/AzureBatch/Commands.Batch/Applications/NewBatchApplicationPackageCommand.cs

@@ -22,31 +22,40 @@ namespace Microsoft.Azure.Commands.Batch
     [Cmdlet(VerbsCommon.New, Constants.AzureRmBatchApplicationPackage), OutputType(typeof(PSApplicationPackage))]
     public class NewBatchApplicationPackageCommand : BatchCmdletBase
     {
-        [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the name of the Batch account.")]
+        internal const string ActivateOnlySet = "ActivateOnly";
+        internal const string UpdateAndActivateSet = "UpdateAndActivate";
+
+        [Parameter(Position = 0, ParameterSetName = UpdateAndActivateSet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the name of the Batch account.")]
+        [Parameter(Position = 0, ParameterSetName = ActivateOnlySet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the name of the Batch account.")]
         [ValidateNotNullOrEmpty]
         public string AccountName { get; set; }
 
-        [Parameter(Position = 1, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the name of the resource group that contains the Batch account.")]
+        [Parameter(Position = 1, ParameterSetName = UpdateAndActivateSet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the name of the resource group that contains the Batch account.")]
+        [Parameter(Position = 1, ParameterSetName = ActivateOnlySet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the name of the resource group that contains the Batch account.")]
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
-        [Parameter(Position = 2, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the id of the application.")]
+        [Parameter(Position = 2, ParameterSetName = UpdateAndActivateSet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the id of the application.")]
+        [Parameter(Position = 2, ParameterSetName = ActivateOnlySet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the id of the application.")]
         [ValidateNotNullOrEmpty]
+
         public string ApplicationId { get; set; }
 
-        [Parameter(Position = 3, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the version of the application.")]
+        [Parameter(Position = 3, ParameterSetName = UpdateAndActivateSet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the version of the application.")]
+        [Parameter(Position = 3, ParameterSetName = ActivateOnlySet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the version of the application.")]
         [ValidateNotNullOrEmpty]
         public string ApplicationVersion { get; set; }
 
-        [Parameter(Position = 4, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the format of the application package binary file.")]
+        [Parameter(Position = 4, ParameterSetName = UpdateAndActivateSet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the format of the application package binary file.")]
+        [Parameter(Position = 4, ParameterSetName = ActivateOnlySet, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the format of the application package binary file.")]
         [ValidateNotNullOrEmpty]
         public string Format { get; set; }
 
-        [Parameter(ValueFromPipelineByPropertyName = true)]
+        [Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = UpdateAndActivateSet, Mandatory = true, HelpMessage = "Specifies the file path of the application that will be uploaded to Azure Storage.")]
         [ValidateNotNullOrEmpty]
         public string FilePath { get; set; }
 
-        [Parameter(ValueFromPipelineByPropertyName = true)]
+        [Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = ActivateOnlySet)]
         [ValidateNotNullOrEmpty]
         public SwitchParameter ActivateOnly { get; set; }
 

src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Applications.cs

@@ -184,7 +184,11 @@ public virtual PSApplicationPackage UploadAndActivateApplicationPackage(
             }
             else
             {
-                // Checks File path and resourceGroupName is valid
+                if (string.IsNullOrEmpty(filePath))
+                {
+                    throw new ArgumentNullException(Resources.NewAppPackageNoPathSpecified);
+                }
+
                 if (!File.Exists(filePath))
                 {
                     throw new FileNotFoundException(string.Format(Resources.FileNotFound, filePath), filePath);

src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.Designer.cs

@@ -442,6 +442,9 @@
   <data name="FileNotFound" xml:space="preserve">
     <value>File not found {0}.</value>
   </data>
+  <data name="NewAppPackageNoPathSpecified" xml:space="preserve">
+    <value>When uploading a new application package, you must specify a value for the FilePath parameter.</value>
+  </data>
   <data name="FailedToUpload" xml:space="preserve">
     <value>Failed to upload {0} to Azure Storage. {1}.</value>
   </data>