Skip to content

Commit 1016b10

Browse files
committed
Add PassThru to Remove cmd and DefaultParamSet to Update. Updated ScenarioTests accordingly
1 parent 313ffae commit 1016b10

13 files changed

+2934
-3426
lines changed

src/Websites/Websites.Test/ScenarioTests/AccessRestrictionTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ function Test-RemoveWebAppAccessRestriction
285285
Assert-AreEqual "Deny" $actual.MainSiteAccessRestrictions[1].Action
286286

287287
# Run Tests
288-
$actual = Remove-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers
288+
$actual = Remove-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -PassThru
289289

290290
# Assert
291291
Assert-AreEqual 1 $actual.MainSiteAccessRestrictions.Count
@@ -379,7 +379,7 @@ function Test-RemoveWebAppAccessRestrictionScm
379379
Assert-AreEqual "Deny" $actual.ScmSiteAccessRestrictions[1].Action
380380

381381
# Run Tests
382-
$actual = Remove-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -TargetScmSite
382+
$actual = Remove-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -TargetScmSite -PassThru
383383

384384
# Assert
385385
Assert-AreEqual 1 $actual.ScmSiteAccessRestrictions.Count

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestAddWebAppAccessRestriction.json

Lines changed: 394 additions & 337 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestAddWebAppAccessRestrictionScm.json

Lines changed: 410 additions & 296 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestAddWebAppAccessRestrictionSlot.json

Lines changed: 472 additions & 472 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestGetWebAppAccessRestriction.json

Lines changed: 268 additions & 781 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestRemoveWebAppAccessRestriction.json

Lines changed: 375 additions & 375 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestRemoveWebAppAccessRestrictionScm.json

Lines changed: 369 additions & 483 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestUpdateWebAppAccessRestrictionComplex.json

Lines changed: 335 additions & 392 deletions
Large diffs are not rendered by default.

src/Websites/Websites.Test/SessionRecords/Microsoft.Azure.Commands.Websites.Test.ScenarioTests.AccessRestrictionTests/TestUpdateWebAppAccessRestrictionSimple.json

Lines changed: 280 additions & 280 deletions
Large diffs are not rendered by default.

src/Websites/Websites/Cmdlets/AccessRestriction/RemoveAzureWebAppAccessRestrictionRule.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public class RemoveAzureWebAppAccessRestrictionRuleCmdlet : WebAppBaseClientCmdL
4949
[Parameter(Mandatory = false, HelpMessage = "Deployment Slot name.")]
5050
public string SlotName { get; set; }
5151

52+
[Parameter(Mandatory = false, HelpMessage = "Return the access restriction config object.")]
53+
public SwitchParameter PassThru { get; set; }
54+
5255
public override void ExecuteCmdlet()
5356
{
5457
if (!string.IsNullOrWhiteSpace(ResourceGroupName) && !string.IsNullOrWhiteSpace(WebAppName))
@@ -78,10 +81,13 @@ public override void ExecuteCmdlet()
7881
// Update web app configuration
7982
WebsitesClient.UpdateWebAppConfiguration(ResourceGroupName, webApp.Location, WebAppName, SlotName, siteConfig);
8083

81-
// Refresh object to get the final state
82-
webApp = new PSSite(WebsitesClient.GetWebApp(ResourceGroupName, WebAppName, SlotName));
83-
var accessRestrictionConfig = new PSAccessRestrictionConfig(ResourceGroupName, WebAppName, webApp.SiteConfig, SlotName);
84-
WriteObject(accessRestrictionConfig);
84+
if (PassThru)
85+
{
86+
// Refresh object to get the final state
87+
webApp = new PSSite(WebsitesClient.GetWebApp(ResourceGroupName, WebAppName, SlotName));
88+
var accessRestrictionConfig = new PSAccessRestrictionConfig(ResourceGroupName, WebAppName, webApp.SiteConfig, SlotName);
89+
WriteObject(accessRestrictionConfig);
90+
}
8591
}
8692
}
8793
}

src/Websites/Websites/Cmdlets/AccessRestriction/UpdateAzureWebAppAccessRestrictionConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.WebApps.Cmdlets.WebApps
2323
/// <summary>
2424
/// this commandlet will let you update the access restriction settings of an Azure Website
2525
/// </summary>
26-
[Cmdlet("Update", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "WebAppAccessRestrictionConfig", SupportsShouldProcess = true)]
26+
[Cmdlet("Update", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "WebAppAccessRestrictionConfig", SupportsShouldProcess = true, DefaultParameterSetName = InputValuesParameterSet)]
2727
[OutputType(typeof(PSAccessRestrictionConfig))]
2828
public class UpdateAzureWebAppAccessRestrictionConfigCmdlet : WebAppBaseClientCmdLet
2929
{

src/Websites/Websites/help/Remove-AzWebAppAccessRestrictionRule.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Removes an Access Restriction rule from an Azure Web App.
1313

1414
```
1515
Remove-AzWebAppAccessRestrictionRule [-ResourceGroupName] <String> [-WebAppName] <String> -Name <String>
16-
[-TargetScmSite] [-SlotName <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
17-
[<CommonParameters>]
16+
[-TargetScmSite] [-SlotName <String>] [-PassThru] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
17+
[-Confirm] [<CommonParameters>]
1818
```
1919

2020
## DESCRIPTION
@@ -61,6 +61,21 @@ Accept pipeline input: False
6161
Accept wildcard characters: False
6262
```
6363
64+
### -PassThru
65+
Return the access restriction config object.
66+
67+
```yaml
68+
Type: System.Management.Automation.SwitchParameter
69+
Parameter Sets: (All)
70+
Aliases:
71+
72+
Required: False
73+
Position: Named
74+
Default value: None
75+
Accept pipeline input: False
76+
Accept wildcard characters: False
77+
```
78+
6479
### -ResourceGroupName
6580
Resource Group Name
6681

src/Websites/Websites/help/Update-AzWebAppAccessRestrictionConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Updates the inheritance of Main site Access Restiction config to SCM Site for an
1111

1212
## SYNTAX
1313

14-
### InputValuesParameterSet
14+
### InputValuesParameterSet (Default)
1515
```
1616
Update-AzWebAppAccessRestrictionConfig [-ResourceGroupName] <String> [-Name] <String>
1717
[-ScmSiteUseMainSiteRestrictionConfig] [-SlotName <String>] [-PassThru]

0 commit comments

Comments
 (0)