Skip to content

Commit 89e29c8

Browse files
jeffrey-acejeffrey-ace
committed
remove force parameter for management partner commands
1 parent f383554 commit 89e29c8

File tree

9 files changed

+81
-88
lines changed

9 files changed

+81
-88
lines changed

‎src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ManagementPartnerTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Tests add management partner
5454
function Test-NewPartner
5555
{
5656
$partnerId="123457"
57-
$partner = New-AzureRmManagementPartner -PartnerId $partnerId -Force
57+
$partner = New-AzureRmManagementPartner -PartnerId $partnerId
5858

5959
# Assert
6060
Assert-AreEqual $partnerId $partner.PartnerId
@@ -71,7 +71,7 @@ Tests update management partner
7171
function Test-UpdatePartner
7272
{
7373
$partnerId="123456"
74-
$partner = Update-AzureRmManagementPartner -PartnerId $partnerId -Force
74+
$partner = Update-AzureRmManagementPartner -PartnerId $partnerId
7575

7676
# Assert
7777
Assert-AreEqual $partnerId $partner.PartnerId
@@ -87,5 +87,5 @@ Tests remove management partner
8787
function Test-RemovePartner
8888
{
8989
$partnerId="123456"
90-
$partner = Remove-AzureRmManagementPartner -PartnerId $partnerId -Force
90+
$partner = Remove-AzureRmManagementPartner -PartnerId $partnerId
9191
}

‎src/ResourceManager/Resources/Commands.Resources/ManagementPartner/NewManagementPartner.cs

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,15 @@ public class NewManagementPartner:AzureManagementPartnerCmdletsBase
1212
[ValidateNotNull]
1313
public string PartnerId { get; set; }
1414

15-
/// <summary>
16-
/// Gets or sets the force parameter.
17-
/// </summary>
18-
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
19-
public SwitchParameter Force { get; set; }
20-
2115
public override void ExecuteCmdlet()
2216
{
23-
string confirmMessage = string.Format(PartnerResources.AddManagementParnter, PartnerId);
24-
25-
ConfirmAction(
26-
Force,
27-
confirmMessage,
28-
PartnerResources.AddManagementParnter,
29-
PartnerId,
30-
() =>
31-
{
32-
var response = new PSManagementPartner(AceProvisioningManagementPartnerApiClient.Partner.CreateAsync(PartnerId).Result);
33-
WriteObject(response);
34-
});
17+
if (ShouldProcess(string.Format(PartnerResources.NewManagementParnterTarget, PartnerId),
18+
string.Format(PartnerResources.NewManagementParnterAction,PartnerId)))
19+
{
20+
var response = new PSManagementPartner(AceProvisioningManagementPartnerApiClient.Partner
21+
.CreateAsync(PartnerId).Result);
22+
WriteObject(response);
23+
}
3524
}
3625
}
3726
}

‎src/ResourceManager/Resources/Commands.Resources/ManagementPartner/RemoveManagementPartner.cs

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,14 @@ public class RemoveManagementPartner : AzureManagementPartnerCmdletsBase
1111
[ValidateNotNull]
1212
public string PartnerId { get; set; }
1313

14-
/// <summary>
15-
/// Gets or sets the force parameter.
16-
/// </summary>
17-
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
18-
public SwitchParameter Force { get; set; }
19-
2014
public override void ExecuteCmdlet()
2115
{
22-
string confirmMessage = string.Format(PartnerResources.UpdateManagementParnter, PartnerId);
23-
24-
ConfirmAction(
25-
Force,
26-
confirmMessage,
27-
PartnerResources.UpdateManagementParnter,
28-
PartnerId,
29-
() =>
30-
{
31-
AceProvisioningManagementPartnerApiClient.Partner.DeleteAsync(PartnerId).Wait();
32-
WriteObject(string.Format(PartnerResources.RemovedManagementPartner, PartnerId));
33-
});
16+
if (ShouldProcess(string.Format(PartnerResources.RemoveManagementParnterTarget, PartnerId),
17+
string.Format(PartnerResources.RemoveManagementParnterAction, PartnerId)))
18+
{
19+
AceProvisioningManagementPartnerApiClient.Partner.DeleteAsync(PartnerId).Wait();
20+
WriteObject(string.Format(PartnerResources.RemovedManagementPartner, PartnerId));
21+
}
3422
}
3523
}
3624
}

‎src/ResourceManager/Resources/Commands.Resources/ManagementPartner/UpdateManagementPartner.cs

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,23 @@
55

66
namespace Microsoft.Azure.Commands.Resources
77
{
8-
[Cmdlet(VerbsData.Update, "AzureRmManagementPartner", SupportsShouldProcess = true), OutputType(typeof(PSManagementPartner))]
8+
[Cmdlet(VerbsData.Update, "AzureRmManagementPartner", SupportsShouldProcess = true),
9+
OutputType(typeof(PSManagementPartner))]
910
public class UpdateManagementPartner : AzureManagementPartnerCmdletsBase
1011
{
1112
[Parameter(Position = 0, Mandatory = true, HelpMessage = "The management partner id")]
1213
[ValidateNotNull]
1314
public string PartnerId { get; set; }
1415

15-
/// <summary>
16-
/// Gets or sets the force parameter.
17-
/// </summary>
18-
[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
19-
public SwitchParameter Force { get; set; }
20-
2116
public override void ExecuteCmdlet()
2217
{
23-
string confirmMessage = string.Format(PartnerResources.UpdateManagementParnter, PartnerId);
24-
25-
ConfirmAction(
26-
Force,
27-
confirmMessage,
28-
PartnerResources.UpdateManagementParnter,
29-
PartnerId,
30-
() =>
31-
{
32-
var response = new PSManagementPartner(AceProvisioningManagementPartnerApiClient.Partner.UpdateAsync(PartnerId).Result);
33-
WriteObject(response);
34-
});
18+
if (ShouldProcess(string.Format(PartnerResources.UpdateManagementParnterTarget, PartnerId),
19+
string.Format(PartnerResources.UpdateManagementParnterAction, PartnerId)))
20+
{
21+
var response = new PSManagementPartner(AceProvisioningManagementPartnerApiClient.Partner
22+
.UpdateAsync(PartnerId).Result);
23+
WriteObject(response);
24+
}
3525
}
3626
}
3727
}

‎src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs

Lines changed: 41 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,15 +405,24 @@
405405
<data name="ServicePrincipalWithSPNDoesntExist" xml:space="preserve">
406406
<value>Service principal with SPN '{0}' does not exist.</value>
407407
</data>
408-
<data name="RemoveManagementParnter" xml:space="preserve">
408+
<data name="RemoveManagementParnterTarget" xml:space="preserve">
409409
<value>Are you sure you want to remove management partner with id '{0}'.</value>
410410
</data>
411-
<data name="AddManagementParnter" xml:space="preserve">
411+
<data name="RemoveManagementParnterAction" xml:space="preserve">
412+
<value>Removing management partner with id '{0}'.</value>
413+
</data>
414+
<data name="NewManagementParnterTarget" xml:space="preserve">
412415
<value>Are you sure you want to add management partner with id '{0}'.</value>
413416
</data>
414-
<data name="UpdateManagementParnter" xml:space="preserve">
417+
<data name="NewManagementParnterAction" xml:space="preserve">
418+
<value>Adding management partner with id '{0}'.</value>
419+
</data>
420+
<data name="UpdateManagementParnterTarget" xml:space="preserve">
415421
<value>Are you sure you want to change the management partner to '{0}'.</value>
416422
</data>
423+
<data name="UpdateManagementParnterAction" xml:space="preserve">
424+
<value>Updating the management partner to '{0}'.</value>
425+
</data>
417426
<data name="RemovedManagementPartner" xml:space="preserve">
418427
<value>Removed management partner with id '{0}'</value>
419428
</data>

‎src/ResourceManager/Resources/Commands.Resources/help/New-AzureRmManagementPartner.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Add a management partner
1313
## SYNTAX
1414

1515
```
16-
New-AzureRmManagementPartner [-PartnerId] <String> [-Force] [-DefaultProfile <IAzureContextContainer>]
16+
New-AzureRmManagementPartner [-PartnerId] <String> [-DefaultProfile <IAzureContextContainer>]
1717
[-WhatIf] [-Confirm] [<CommonParameters>]
1818
```
1919

@@ -61,9 +61,6 @@ Accept pipeline input: False
6161
Accept wildcard characters: False
6262
```
6363
64-
### -Force
65-
Do not ask for confirmation.
66-
6764
```yaml
6865
Type: SwitchParameter
6966
Parameter Sets: (All)

‎src/ResourceManager/Resources/Commands.Resources/help/Remove-AzureRmManagementPartner.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Remove management partner
1313
## SYNTAX
1414

1515
```
16-
Remove-AzureRmManagementPartner [-PartnerId] <String> [-Force] [-DefaultProfile <IAzureContextContainer>]
16+
Remove-AzureRmManagementPartner [-PartnerId] <String> [-DefaultProfile <IAzureContextContainer>]
1717
[-WhatIf] [-Confirm] [<CommonParameters>]
1818
```
1919

@@ -61,9 +61,6 @@ Accept pipeline input: False
6161
Accept wildcard characters: False
6262
```
6363
64-
### -Force
65-
Do not ask for confirmation.
66-
6764
```yaml
6865
Type: SwitchParameter
6966
Parameter Sets: (All)

‎src/ResourceManager/Resources/Commands.Resources/help/Update-AzureRmManagementPartner.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Update the management partner
1313
## SYNTAX
1414

1515
```
16-
Update-AzureRmManagementPartner [-PartnerId] <String> [-Force] [-DefaultProfile <IAzureContextContainer>]
16+
Update-AzureRmManagementPartner [-PartnerId] <String> [-DefaultProfile <IAzureContextContainer>]
1717
[-WhatIf] [-Confirm] [<CommonParameters>]
1818
```
1919

@@ -61,9 +61,6 @@ Accept pipeline input: False
6161
Accept wildcard characters: False
6262
```
6363
64-
### -Force
65-
Do not ask for confirmation.
66-
6764
```yaml
6865
Type: SwitchParameter
6966
Parameter Sets: (All)

0 commit comments

Comments
 (0)