Skip to content

Commit 96c8367

Browse files
gaurangisaxenagaurangisaxena
authored
Merge pull request #3 from gaurangisaxena/gasaxena/powershell
resolve comments
2 parents a33b1d4 + ddec731 commit 96c8367

File tree

41 files changed

+69
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+69
-210
lines changed

‎src/DataShare/DataShare/Account/GetAzDataShareAccount.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public class GetAzDataShareAccount : AzureDataShareCmdletBase
4646
/// </summary>
4747
[Parameter(
4848
Mandatory = false,
49-
ValueFromPipelineByPropertyName = true,
5049
HelpMessage = "The resource group name of the azure data share account.",
5150
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
5251
[ResourceGroupCompleter()]
@@ -58,7 +57,6 @@ public class GetAzDataShareAccount : AzureDataShareCmdletBase
5857
/// </summary>
5958
[Parameter(
6059
Mandatory = false,
61-
ValueFromPipelineByPropertyName = true,
6260
HelpMessage = "Azure data share account name.",
6361
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
6462
[ResourceNameCompleter(ResourceTypes.Account, "ResourceGroupName")]

‎src/DataShare/DataShare/Account/NewAzDataShareAccount.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
namespace Microsoft.Azure.Commands.DataShare.Account
1616
{
17+
using System;
1718
using System.Collections;
1819
using System.Management.Automation;
1920
using Microsoft.Azure.Commands.DataShare.Common;
@@ -40,7 +41,6 @@ public class NewAzDataShareAccount : AzureDataShareCmdletBase
4041
/// </summary>
4142
[Parameter(
4243
Mandatory = true,
43-
ValueFromPipelineByPropertyName = true,
4444
HelpMessage = "The resource group name of the azure data share account will be created in.")]
4545
[ResourceGroupCompleter()]
4646
public string ResourceGroupName { get; set; }
@@ -71,9 +71,11 @@ public class NewAzDataShareAccount : AzureDataShareCmdletBase
7171
[Parameter]
7272
public SwitchParameter AsJob { get; set; }
7373

74+
private const string ResourceType = "DataShare Account";
75+
7476
public override void ExecuteCmdlet()
7577
{
76-
if (this.ShouldProcess(this.Name, "Creating data share account"))
78+
if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareAccount.ResourceType)))
7779
{
7880
Account dataShareAccount = this.DataShareManagementClient.Accounts.Create(
7981
this.ResourceGroupName,

‎src/DataShare/DataShare/Account/RemoveAzDataShareAccount.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public class RemoveAzDataShareAccount : AzureDataShareCmdletBase
4343
/// </summary>
4444
[Parameter(
4545
Mandatory = true,
46-
ValueFromPipelineByPropertyName = true,
4746
ParameterSetName = ParameterSetNames.FieldsParameterSet,
4847
HelpMessage = "The resource group name of azure data share account.")]
4948
[ResourceGroupCompleter()]
@@ -55,7 +54,6 @@ public class RemoveAzDataShareAccount : AzureDataShareCmdletBase
5554
/// </summary>
5655
[Parameter(
5756
Mandatory = true,
58-
ValueFromPipelineByPropertyName = true,
5957
ParameterSetName = ParameterSetNames.FieldsParameterSet,
6058
HelpMessage = "Azure data share account name.")]
6159
[ValidateNotNullOrEmpty]
@@ -87,7 +85,6 @@ public class RemoveAzDataShareAccount : AzureDataShareCmdletBase
8785

8886
[Parameter(
8987
Mandatory = false,
90-
ValueFromPipelineByPropertyName = true,
9188
HelpMessage = "Return object (if specified).")]
9289
public SwitchParameter PassThru { get; set; }
9390

‎src/DataShare/DataShare/Az.DataShare.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ PrivateData = @{
145145
ReleaseNotes = '* Added new Powershell cmdlets for Enable/Disable Custom Domain Https and deprecated the old ones'
146146

147147
# Prerelease string of this module
148-
Prerelease = 'preview'
148+
# Prerelease = 'preview'
149149

150150
# Flag to indicate whether the module requires explicit user acceptance for install/update
151151
# RequireLicenseAcceptance = $false

‎src/DataShare/DataShare/ConsumerInvitation/GetAzDataShareReceivedInvitation.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class GetAzDataShareReceivedInvitation : AzureDataShareCmdletBase
4141
/// </summary>
4242
[Parameter(
4343
Mandatory = false,
44-
ValueFromPipelineByPropertyName = true,
4544
HelpMessage = "Azure data share invitation location.",
4645
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
4746
[ValidateNotNullOrEmpty]
@@ -53,7 +52,6 @@ public class GetAzDataShareReceivedInvitation : AzureDataShareCmdletBase
5352
/// </summary>
5453
[Parameter(
5554
Mandatory = false,
56-
ValueFromPipelineByPropertyName = true,
5755
HelpMessage = "Azure dataShare invitation id.",
5856
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
5957
[ValidateNotNullOrEmpty]

‎src/DataShare/DataShare/DataSet/GetAzDataShareDataSet.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
4141
/// </summary>
4242
[Parameter(
4343
Mandatory = true,
44-
ValueFromPipelineByPropertyName = true,
4544
HelpMessage = "The resource group name of the azure data share account.",
4645
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
4746
[ResourceGroupCompleter()]
@@ -53,7 +52,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
5352
/// </summary>
5453
[Parameter(
5554
Mandatory = true,
56-
ValueFromPipelineByPropertyName = true,
5755
HelpMessage = "Azure data share account name.",
5856
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
5957
[ValidateNotNullOrEmpty]
@@ -65,7 +63,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
6563
/// </summary>
6664
[Parameter(
6765
Mandatory = true,
68-
ValueFromPipelineByPropertyName = true,
6966
HelpMessage = "Azure data share name.",
7067
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
7168
[ValidateNotNullOrEmpty]
@@ -77,7 +74,6 @@ public class GetAzDataShareDataSet : AzureDataShareCmdletBase
7774
/// </summary>
7875
[Parameter(
7976
Mandatory = false,
80-
ValueFromPipelineByPropertyName = true,
8177
HelpMessage = "Azure data set name.",
8278
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
8379
[ValidateNotNullOrEmpty]

‎src/DataShare/DataShare/DataSet/NewAzDataShareDataSet.cs

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ namespace Microsoft.Azure.Commands.DataShare.DataSet
2424
using System.Management.Automation;
2525
using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
2626
using Microsoft.Azure.PowerShell.Cmdlets.DataShare.Extensions;
27+
using Microsoft.Azure.PowerShell.Cmdlets.DataShare.Properties;
2728

2829
/// <summary>
2930
/// Defines the New-DataShareDataSet cmdlet.
@@ -40,17 +41,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
4041
/// </summary>
4142
[Parameter(
4243
Mandatory = true,
43-
ValueFromPipelineByPropertyName = true,
4444
HelpMessage = "The resource group name of the azure data share account",
4545
ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
4646
[Parameter(
4747
Mandatory = true,
48-
ValueFromPipelineByPropertyName = true,
4948
HelpMessage = "The resource group name of the azure data share account",
5049
ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
5150
[Parameter(
5251
Mandatory = true,
53-
ValueFromPipelineByPropertyName = true,
5452
HelpMessage = "The resource group name of the azure data share account",
5553
ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
5654
[ResourceGroupCompleter()]
@@ -61,17 +59,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
6159
/// </summary>
6260
[Parameter(
6361
Mandatory = true,
64-
ValueFromPipelineByPropertyName = true,
6562
HelpMessage = "Azure data share account name",
6663
ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
6764
[Parameter(
6865
Mandatory = true,
69-
ValueFromPipelineByPropertyName = true,
7066
HelpMessage = "Azure data share account name",
7167
ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
7268
[Parameter(
7369
Mandatory = true,
74-
ValueFromPipelineByPropertyName = true,
7570
HelpMessage = "Azure data share account name",
7671
ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
7772
[ValidateNotNullOrEmpty]
@@ -83,17 +78,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
8378
/// </summary>
8479
[Parameter(
8580
Mandatory = true,
86-
ValueFromPipelineByPropertyName = true,
8781
HelpMessage = "Azure data share name",
8882
ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
8983
[Parameter(
9084
Mandatory = true,
91-
ValueFromPipelineByPropertyName = true,
9285
HelpMessage = "Azure data share name",
9386
ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
9487
[Parameter(
9588
Mandatory = true,
96-
ValueFromPipelineByPropertyName = true,
9789
HelpMessage = "Azure data share name",
9890
ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
9991
[ValidateNotNullOrEmpty]
@@ -105,17 +97,14 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
10597
/// </summary>
10698
[Parameter(
10799
Mandatory = true,
108-
ValueFromPipelineByPropertyName = true,
109100
HelpMessage = "Azure data set name",
110101
ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
111102
[Parameter(
112103
Mandatory = true,
113-
ValueFromPipelineByPropertyName = true,
114104
HelpMessage = "Azure data set name",
115105
ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
116106
[Parameter(
117107
Mandatory = true,
118-
ValueFromPipelineByPropertyName = true,
119108
HelpMessage = "Azure data set name",
120109
ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
121110
[ValidateNotNullOrEmpty]
@@ -148,7 +137,6 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
148137
/// </summary>
149138
[Parameter(
150139
Mandatory = true,
151-
ValueFromPipelineByPropertyName = true,
152140
HelpMessage = "Azure storage account container name",
153141
ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
154142
[ValidateNotNullOrEmpty]
@@ -159,7 +147,6 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
159147
/// </summary>
160148
[Parameter(
161149
Mandatory = true,
162-
ValueFromPipelineByPropertyName = true,
163150
HelpMessage = "Azure ADLS gen2 file system name",
164151
ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
165152
[ValidateNotNullOrEmpty]
@@ -170,12 +157,10 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
170157
/// </summary>
171158
[Parameter(
172159
Mandatory = false,
173-
ValueFromPipelineByPropertyName = true,
174160
HelpMessage = "Azure storage file path",
175161
ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
176162
[Parameter(
177163
Mandatory = false,
178-
ValueFromPipelineByPropertyName = true,
179164
HelpMessage = "Azure storage file path",
180165
ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
181166
[ValidateNotNullOrEmpty]
@@ -186,12 +171,10 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
186171
/// </summary>
187172
[Parameter(
188173
Mandatory = false,
189-
ValueFromPipelineByPropertyName = true,
190174
HelpMessage = "Azure storage folder path",
191175
ParameterSetName = ParameterSetNames.BlobDataSetParameterSet)]
192176
[Parameter(
193177
Mandatory = false,
194-
ValueFromPipelineByPropertyName = true,
195178
HelpMessage = "Azure storage folder path",
196179
ParameterSetName = ParameterSetNames.AdlsGen2DataSetParameterSet)]
197180
public string FolderPath { get; set; }
@@ -201,7 +184,6 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
201184
/// </summary>
202185
[Parameter(
203186
Mandatory = false,
204-
ValueFromPipelineByPropertyName = true,
205187
HelpMessage = "Azure storage ADLS gen1 file name",
206188
ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
207189
[ValidateNotNullOrEmpty]
@@ -212,12 +194,13 @@ public class NewAzDataShareDataSet : AzureDataShareCmdletBase
212194
/// </summary>
213195
[Parameter(
214196
Mandatory = true,
215-
ValueFromPipelineByPropertyName = true,
216197
HelpMessage = "Azure storage ADLS gen1 folder path",
217198
ParameterSetName = ParameterSetNames.AdlsGen1DataSetParameterSet)]
218199
[ValidateNotNullOrEmpty]
219200
public string AdlsGen1FolderPath { get; set; }
220201

202+
private const string ResourceType = "DataSet";
203+
221204
public override void ExecuteCmdlet()
222205
{
223206
var parsedStorageResourceId = new ResourceIdentifier(this.StorageAccountResourceId);
@@ -229,7 +212,7 @@ public override void ExecuteCmdlet()
229212
ParameterSetNames.BlobDataSetParameterSet,
230213
StringComparison.OrdinalIgnoreCase))
231214
{
232-
if (this.ShouldProcess(this.Name, "Creating data set"))
215+
if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareDataSet.ResourceType)))
233216
{
234217
if (this.FilePath != null)
235218
{
@@ -297,7 +280,7 @@ public override void ExecuteCmdlet()
297280
StringComparison.OrdinalIgnoreCase))
298281
{
299282

300-
if (this.ShouldProcess(this.Name, "Creating data set"))
283+
if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareDataSet.ResourceType)))
301284
{
302285
if (this.FilePath != null)
303286
{
@@ -365,7 +348,7 @@ public override void ExecuteCmdlet()
365348
StringComparison.OrdinalIgnoreCase))
366349
{
367350
storageAccountName = parsedStorageResourceId.GetAccountName();
368-
if (this.ShouldProcess(this.Name, "Creating data set"))
351+
if (this.ShouldProcess(this.Name, string.Format(Resources.ResourceCreateMessage, NewAzDataShareDataSet.ResourceType)))
369352
{
370353
if (this.FileName != null)
371354
{

‎src/DataShare/DataShare/DataSet/RemoveAzDataShareDataSet.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
4141
/// </summary>
4242
[Parameter(
4343
Mandatory = true,
44-
ValueFromPipelineByPropertyName = true,
4544
ParameterSetName = ParameterSetNames.FieldsParameterSet,
4645
HelpMessage = "The resource group name of the azure data share account.")]
4746
[ResourceGroupCompleter()]
@@ -53,7 +52,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
5352
/// </summary>
5453
[Parameter(
5554
Mandatory = true,
56-
ValueFromPipelineByPropertyName = true,
5755
ParameterSetName = ParameterSetNames.FieldsParameterSet,
5856
HelpMessage = "Azure data share account name.")]
5957
[ValidateNotNullOrEmpty]
@@ -65,7 +63,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
6563
/// </summary>
6664
[Parameter(
6765
Mandatory = true,
68-
ValueFromPipelineByPropertyName = true,
6966
ParameterSetName = ParameterSetNames.FieldsParameterSet,
7067
HelpMessage = "Azure data share name.")]
7168
[ValidateNotNullOrEmpty]
@@ -109,7 +106,6 @@ public class RemoveAzDataShareDataSet : AzureDataShareCmdletBase
109106

110107
[Parameter(
111108
Mandatory = false,
112-
ValueFromPipelineByPropertyName = true,
113109
HelpMessage = "Return object (if specified).")]
114110
public SwitchParameter PassThru { get; set; }
115111

‎src/DataShare/DataShare/DataSetMapping/GetAzDataShareDataSetMapping.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
4141
/// </summary>
4242
[Parameter(
4343
Mandatory = true,
44-
ValueFromPipelineByPropertyName = true,
4544
HelpMessage = "The resource group name of azure data share account.",
4645
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
4746
[ResourceGroupCompleter()]
@@ -53,7 +52,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
5352
/// </summary>
5453
[Parameter(
5554
Mandatory = true,
56-
ValueFromPipelineByPropertyName = true,
5755
HelpMessage = "Azure data share account name.",
5856
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
5957
[ValidateNotNullOrEmpty]
@@ -66,7 +64,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
6664
/// </summary>
6765
[Parameter(
6866
Mandatory = true,
69-
ValueFromPipelineByPropertyName = true,
7067
HelpMessage = "Azure data share subscription name.",
7168
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
7269
[ValidateNotNullOrEmpty]
@@ -78,7 +75,6 @@ public class GetAzDataShareDataSetMapping : AzureDataShareCmdletBase
7875
/// </summary>
7976
[Parameter(
8077
Mandatory = false,
81-
ValueFromPipelineByPropertyName = true,
8278
HelpMessage = "Azure data set mapping name.",
8379
ParameterSetName = ParameterSetNames.FieldsParameterSet)]
8480
[ValidateNotNullOrEmpty]

0 commit comments

Comments
 (0)