Skip to content

Commit 313ffae

Browse files
madsdmadsd
committed
Changes related to Design Review #385 
1 parent 50dd1f8 commit 313ffae

25 files changed

+4737
-3594
lines changed

‎src/Websites/Websites.Test/ScenarioTests/AccessRestrictionTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ public void TestGetWebAppAccessRestriction()
4040

4141
[Fact]
4242
[Trait(Category.AcceptanceType, Category.CheckIn)]
43-
public void TestSetWebAppAccessRestrictionSimple()
43+
public void TestUpdateWebAppAccessRestrictionSimple()
4444
{
45-
WebsitesController.NewInstance.RunPsTest(_logger, "Test-SetWebAppAccessRestrictionSimple");
45+
WebsitesController.NewInstance.RunPsTest(_logger, "Test-UpdateWebAppAccessRestrictionSimple");
4646
}
4747

4848
[Fact]
4949
[Trait(Category.AcceptanceType, Category.CheckIn)]
50-
public void TestSetWebAppAccessRestrictionComplex()
50+
public void TestUpdateWebAppAccessRestrictionComplex()
5151
{
52-
WebsitesController.NewInstance.RunPsTest(_logger, "Test-SetWebAppAccessRestrictionComplex");
52+
WebsitesController.NewInstance.RunPsTest(_logger, "Test-UpdateWebAppAccessRestrictionComplex");
5353
}
5454

5555
[Fact]

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ function Test-GetWebAppAccessRestriction
4141
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
4242

4343
# Get initial access restriction
44-
$actual = Get-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname
44+
$actual = Get-AzWebAppAccessRestrictionConfig -ResourceGroupName $rgname -Name $wname
4545

4646
# Assert
47-
Assert-AreEqual $false $actual.ScmSiteUseMainSiteRestrictions
47+
Assert-AreEqual $false $actual.ScmSiteUseMainSiteRestrictionConfig
4848
Assert-AreEqual 1 $actual.MainSiteAccessRestrictions.Count
4949
Assert-AreEqual "Allow all" $actual.MainSiteAccessRestrictions[0].RuleName
5050
Assert-AreEqual "Allow" $actual.MainSiteAccessRestrictions[0].Action
@@ -64,7 +64,7 @@ function Test-GetWebAppAccessRestriction
6464
.SYNOPSIS
6565
Set inherit restrictions from main flag
6666
#>
67-
function Test-SetWebAppAccessRestrictionSimple
67+
function Test-UpdateWebAppAccessRestrictionSimple
6868
{
6969
# Setup
7070
$rgname = Get-ResourceGroupName
@@ -87,11 +87,11 @@ function Test-SetWebAppAccessRestrictionSimple
8787
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
8888

8989
# Run Tests
90-
Set-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -ScmSiteUseMainSiteRestrictions
91-
$actual = Get-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname
90+
Update-AzWebAppAccessRestrictionConfig -ResourceGroupName $rgname -Name $wname -ScmSiteUseMainSiteRestrictionConfig
91+
$actual = Get-AzWebAppAccessRestrictionConfig -ResourceGroupName $rgname -Name $wname
9292

9393
# Assert
94-
Assert-AreEqual $true $actual.ScmSiteUseMainSiteRestrictions
94+
Assert-AreEqual $true $actual.ScmSiteUseMainSiteRestrictionConfig
9595
}
9696
finally
9797
{
@@ -104,7 +104,7 @@ function Test-SetWebAppAccessRestrictionSimple
104104
.SYNOPSIS
105105
Set inherit restrictions from main flag to true and back to false
106106
#>
107-
function Test-SetWebAppAccessRestrictionComplex
107+
function Test-UpdateWebAppAccessRestrictionComplex
108108
{
109109
# Setup
110110
$rgname = Get-ResourceGroupName
@@ -127,17 +127,17 @@ function Test-SetWebAppAccessRestrictionComplex
127127
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
128128

129129
# Run Tests
130-
$actual = Set-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -ScmSiteUseMainSiteRestrictions
130+
$actual = Update-AzWebAppAccessRestrictionConfig -ResourceGroupName $rgname -Name $wname -ScmSiteUseMainSiteRestrictionConfig -PassThru
131131

132132
# Assert
133-
Assert-AreEqual $true $actual.ScmSiteUseMainSiteRestrictions
133+
Assert-AreEqual $true $actual.ScmSiteUseMainSiteRestrictionConfig
134134

135135
# Run Tests
136-
Set-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -ScmSiteUseMainSiteRestrictions:$false
137-
$actual = Get-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname
136+
Update-AzWebAppAccessRestrictionConfig -ResourceGroupName $rgname -Name $wname -ScmSiteUseMainSiteRestrictionConfig:$false
137+
$actual = Get-AzWebAppAccessRestrictionConfig -ResourceGroupName $rgname -Name $wname
138138

139139
# Assert
140-
Assert-AreEqual $false $actual.ScmSiteUseMainSiteRestrictions
140+
Assert-AreEqual $false $actual.ScmSiteUseMainSiteRestrictionConfig
141141
}
142142
finally
143143
{
@@ -173,7 +173,7 @@ function Test-AddWebAppAccessRestriction
173173
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
174174

175175
# Run Tests
176-
$actual = Add-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -RuleName developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200
176+
$actual = Add-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -PassThru
177177

178178
# Assert
179179
Assert-AreEqual 2 $actual.MainSiteAccessRestrictions.Count
@@ -230,7 +230,7 @@ function Test-AddWebAppAccessRestrictionServiceEndpoint
230230
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
231231

232232
# Run Tests
233-
$actual = Add-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -RuleName vNetIntegration -Action Allow -Subnet $subnetId -Priority 150
233+
$actual = Add-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name vNetIntegration -Action Allow -SubnetId $subnetId -Priority 150 -PassThru
234234

235235
# Assert
236236
Assert-AreEqual 2 $actual.MainSiteAccessRestrictions.Count
@@ -275,7 +275,7 @@ function Test-RemoveWebAppAccessRestriction
275275
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
276276

277277
# Run Tests
278-
$actual = Add-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -RuleName developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200
278+
$actual = Add-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -PassThru
279279

280280
# Assert
281281
Assert-AreEqual 2 $actual.MainSiteAccessRestrictions.Count
@@ -285,7 +285,7 @@ function Test-RemoveWebAppAccessRestriction
285285
Assert-AreEqual "Deny" $actual.MainSiteAccessRestrictions[1].Action
286286

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

290290
# Assert
291291
Assert-AreEqual 1 $actual.MainSiteAccessRestrictions.Count
@@ -326,7 +326,7 @@ function Test-AddWebAppAccessRestrictionScm
326326
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
327327

328328
# Run Tests
329-
$actual = Add-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -RuleName developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -TargetScmSite
329+
$actual = Add-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -TargetScmSite -PassThru
330330

331331
# Assert
332332
Assert-AreEqual 2 $actual.ScmSiteAccessRestrictions.Count
@@ -369,7 +369,7 @@ function Test-RemoveWebAppAccessRestrictionScm
369369
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
370370

371371
# Run Tests
372-
$actual = Add-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -RuleName developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -TargetScmSite
372+
$actual = Add-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -TargetScmSite -PassThru
373373

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

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

384384
# Assert
385385
Assert-AreEqual 1 $actual.ScmSiteAccessRestrictions.Count
@@ -422,10 +422,10 @@ function Test-AddWebAppAccessRestrictionSlot
422422
Assert-AreEqual $serverFarm.Id $webApp.ServerFarmId
423423

424424
# Get initial access restriction
425-
$actual = Get-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -SlotName $slotName
425+
$actual = Get-AzWebAppAccessRestrictionConfig -ResourceGroupName $rgname -Name $wname -SlotName $slotName
426426

427427
# Assert
428-
Assert-AreEqual $false $actual.ScmSiteUseMainSiteRestrictions
428+
Assert-AreEqual $false $actual.ScmSiteUseMainSiteRestrictionConfig
429429
Assert-AreEqual 1 $actual.MainSiteAccessRestrictions.Count
430430
Assert-AreEqual "Allow all" $actual.MainSiteAccessRestrictions[0].RuleName
431431
Assert-AreEqual "Allow" $actual.MainSiteAccessRestrictions[0].Action
@@ -434,7 +434,7 @@ function Test-AddWebAppAccessRestrictionSlot
434434
Assert-AreEqual "Allow" $actual.ScmSiteAccessRestrictions[0].Action
435435

436436
# Run Tests
437-
$actual = Add-AzWebAppAccessRestriction -ResourceGroupName $rgname -Name $wname -RuleName developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -SlotName $slotName
437+
$actual = Add-AzWebAppAccessRestrictionRule -ResourceGroupName $rgname -WebAppName $wname -Name developers -Action Allow -IpAddress 130.220.0.0/27 -Priority 200 -SlotName $slotName -PassThru
438438

439439
# Assert
440440
Assert-AreEqual 2 $actual.MainSiteAccessRestrictions.Count

0 commit comments

Comments
 (0)