Merge pull request #3 from gaurangisaxena/gasaxena/powershell

resolve comments
Azure · Jul 23, 2019 · 96c8367 · 96c8367
2 parents a33b1d4 + ddec731
commit 96c8367
Show file tree

Hide file tree

Showing 41 changed files with 69 additions and 210 deletions.
diff --git a/src/DataShare/DataShare/Account/GetAzDataShareAccount.cs b/src/DataShare/DataShare/Account/GetAzDataShareAccount.cs
@@ -46,7 +46,6 @@ public class GetAzDataShareAccount : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name of the azure data share account.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ResourceGroupCompleter()]
@@ -58,7 +57,6 @@ public class GetAzDataShareAccount : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share account name.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ResourceNameCompleter(ResourceTypes.Account, "ResourceGroupName")]

diff --git a/src/DataShare/DataShare/Account/NewAzDataShareAccount.cs b/src/DataShare/DataShare/Account/NewAzDataShareAccount.cs
@@ -14,6 +14,7 @@
 
 namespace Microsoft.Azure.Commands.DataShare.Account
 {
+    using System;
     using System.Collections;
     using System.Management.Automation;
     using Microsoft.Azure.Commands.DataShare.Common;
@@ -40,7 +41,6 @@ public class NewAzDataShareAccount : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name of the azure data share account will be created in.")]
         [ResourceGroupCompleter()]
         public string ResourceGroupName { get; set; }
@@ -71,9 +71,11 @@ public class NewAzDataShareAccount : AzureDataShareCmdletBase
         [Parameter]
         public SwitchParameter AsJob { get; set; }
 
+        private const string ResourceType = "DataShare Account";
+
         public override void ExecuteCmdlet()
         {
-            if (this.ShouldProcess(this.Name, "Creating data share account"))
+            if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareAccount.ResourceType)))
             {
                 Account dataShareAccount = this.DataShareManagementClient.Accounts.Create(
                     this.ResourceGroupName,

diff --git a/src/DataShare/DataShare/Account/RemoveAzDataShareAccount.cs b/src/DataShare/DataShare/Account/RemoveAzDataShareAccount.cs
@@ -43,7 +43,6 @@ public class RemoveAzDataShareAccount : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             ParameterSetName = ParameterSetNames.FieldsParameterSet,
             HelpMessage = "The resource group name of azure data share account.")]
         [ResourceGroupCompleter()]
@@ -55,7 +54,6 @@ public class RemoveAzDataShareAccount : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             ParameterSetName = ParameterSetNames.FieldsParameterSet,
             HelpMessage = "Azure data share account name.")]
         [ValidateNotNullOrEmpty]
@@ -87,7 +85,6 @@ public class RemoveAzDataShareAccount : AzureDataShareCmdletBase
 
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Return object (if specified).")]
         public SwitchParameter PassThru { get; set; }
 

diff --git a/src/DataShare/DataShare/Az.DataShare.psd1 b/src/DataShare/DataShare/Az.DataShare.psd1
@@ -145,7 +145,7 @@ PrivateData = @{
         ReleaseNotes = '* Added new Powershell cmdlets for Enable/Disable Custom Domain Https and deprecated the old ones'
 
         # Prerelease string of this module
-        Prerelease = 'preview'
+        # Prerelease = 'preview'
 
         # Flag to indicate whether the module requires explicit user acceptance for install/update
         # RequireLicenseAcceptance = $false

diff --git a/src/DataShare/DataShare/ConsumerInvitation/GetAzDataShareReceivedInvitation.cs b/src/DataShare/DataShare/ConsumerInvitation/GetAzDataShareReceivedInvitation.cs
@@ -41,7 +41,6 @@ public class GetAzDataShareReceivedInvitation : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share invitation location.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -53,7 +52,6 @@ public class GetAzDataShareReceivedInvitation : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure dataShare invitation id.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]

diff --git a/src/DataShare/DataShare/DataSet/GetAzDataShareDataSet.cs b/src/DataShare/DataShare/DataSet/GetAzDataShareDataSet.cs
@@ -41,7 +41,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name of the azure data share account.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ResourceGroupCompleter()]
@@ -53,7 +52,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share account name.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -65,7 +63,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share name.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -77,7 +74,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data set name.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]

diff --git a/src/DataShare/DataShare/DataSet/NewAzDataShareDataSet.cs b/src/DataShare/DataShare/DataSet/NewAzDataShareDataSet.cs
@@ -24,6 +24,7 @@ namespace Microsoft.Azure.Commands.DataShare.DataSet
     using System.Management.Automation;
     using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
     using Microsoft.Azure.PowerShell.Cmdlets.DataShare.Extensions;
+    using Microsoft.Azure.PowerShell.Cmdlets.DataShare.Properties;
 
     /// <summary>
     /// Defines the New-DataShareDataSet cmdlet.
@@ -40,17 +41,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name of the azure data share account",
             ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name of the azure data share account",
             ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name of the azure data share account",
             ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
         [ResourceGroupCompleter()]
@@ -61,17 +59,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share account name",
             ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share account name",
             ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share account name",
             ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -83,17 +78,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share name",
             ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share name",
             ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share name",
             ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -105,17 +97,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data set name",
             ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data set name",
             ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data set name",
             ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -148,7 +137,6 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure storage account container name",
             ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -159,7 +147,6 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure ADLS gen2 file system name",
             ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -170,12 +157,10 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure storage file path",
             ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure storage file path",
             ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -186,12 +171,10 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure storage folder path",
             ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure storage folder path",
             ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
         public string FolderPath { get; set; }
@@ -201,7 +184,6 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure storage ADLS gen1 file name",
             ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -212,12 +194,13 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure storage ADLS gen1 folder path",
             ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
         [ValidateNotNullOrEmpty]
         public string AdlsGen1FolderPath { get; set; }
 
+        private const string ResourceType = "DataSet";
+
         public override void ExecuteCmdlet()
         {
             var parsedStorageResourceId = new ResourceIdentifier(this.StorageAccountResourceId);
@@ -229,7 +212,7 @@ public override void ExecuteCmdlet()
                 ParameterSetNames.BlobDataSetParameterSet,
                 StringComparison.OrdinalIgnoreCase))
             {
-                if (this.ShouldProcess(this.Name, "Creating data set"))
+                if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareDataSet.ResourceType)))
                 {
                     if (this.FilePath != null)
                     {
@@ -297,7 +280,7 @@ public override void ExecuteCmdlet()
                 StringComparison.OrdinalIgnoreCase))
             {
 
-                if (this.ShouldProcess(this.Name, "Creating data set"))
+                if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareDataSet.ResourceType)))
                 {
                     if (this.FilePath != null)
                     {
@@ -365,7 +348,7 @@ public override void ExecuteCmdlet()
                 StringComparison.OrdinalIgnoreCase))
             {
                 storageAccountName = parsedStorageResourceId.GetAccountName();
-                if (this.ShouldProcess(this.Name, "Creating data set"))
+                if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareDataSet.ResourceType)))
                 {
                     if (this.FileName != null)
                     {

diff --git a/src/DataShare/DataShare/DataSet/RemoveAzDataShareDataSet.cs b/src/DataShare/DataShare/DataSet/RemoveAzDataShareDataSet.cs
@@ -41,7 +41,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             ParameterSetName = ParameterSetNames.FieldsParameterSet,
             HelpMessage = "The resource group name of the azure data share account.")]
         [ResourceGroupCompleter()]
@@ -53,7 +52,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             ParameterSetName = ParameterSetNames.FieldsParameterSet,
             HelpMessage = "Azure data share account name.")]
         [ValidateNotNullOrEmpty]
@@ -65,7 +63,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             ParameterSetName = ParameterSetNames.FieldsParameterSet,
             HelpMessage = "Azure data share name.")]
         [ValidateNotNullOrEmpty]
@@ -109,7 +106,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
 
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Return object (if specified).")]
         public SwitchParameter PassThru { get; set; }
 

diff --git a/src/DataShare/DataShare/DataSetMapping/GetAzDataShareDataSetMapping.cs b/src/DataShare/DataShare/DataSetMapping/GetAzDataShareDataSetMapping.cs
@@ -41,7 +41,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource group name of azure data share account.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ResourceGroupCompleter()]
@@ -53,7 +52,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share account name.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -66,7 +64,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = true,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data share subscription name.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]
@@ -78,7 +75,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
         /// </summary>
         [Parameter(
             Mandatory = false,
-            ValueFromPipelineByPropertyName = true,
             HelpMessage = "Azure data set mapping name.",
             ParameterSetName = ParameterSetNames.FieldsParameterSet)]
         [ValidateNotNullOrEmpty]