Skip to content

Commit eddd849

Browse files
CamSoperCamSoper
committed
Implemented @markcowl 's feedback. Added new test to cover deletion of profile with existing endpoints.
1 parent a598341 commit eddd849

29 files changed

+1932
-440
lines changed

‎src/ResourceManager/Cdn/Commands.Cdn.Test/Commands.Cdn.Test.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@
183183
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestProfileCrudWithPiping.json">
184184
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
185185
</None>
186+
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestProfileDeleteWithEndpoints.json">
187+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
188+
</None>
186189
<None Include="SessionRecords\Microsoft.Azure.Commands.Cdn.Test.ScenarioTests.ScenarioTest.ProfileTests\TestProfilePipeline.json">
187190
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
188191
</None>

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/CustomDomainTests.ps1

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ Gets and removes custom domain with running endpoint.
1818
#>
1919
function Test-CustomDomainGetRemoveWithRunningEndpoint
2020
{
21+
# Hard-coding host and endpoint names due to requirement for DNS CNAME
2122
$endpointName = "sdktest-3d96e37e-79bd-440d-a84b-d71a8bb3bed6"
2223
$hostName = "sdktest-aef2f35e-01ca-4230-add5-5075b1506915.azureedge-test.net"
24+
2325
$customDomainName = getAssetName
2426

2527
$profileName = getAssetName
@@ -48,9 +50,9 @@ function Test-CustomDomainGetRemoveWithRunningEndpoint
4850
Assert-AreEqual $customDomainName $customDomain.Name
4951
Assert-AreEqual $hostName $customDomain.HostName
5052

51-
$removed = Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false -PassThru
53+
$removed = Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru
5254
Assert-True{$removed}
53-
Assert-ThrowsContains { Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false} "does not exist"
55+
Assert-ThrowsContains { Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "does not exist"
5456

5557
Assert-ThrowsContains { Get-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
5658

@@ -63,6 +65,7 @@ Gets and removes custom domain with stopped endpoint
6365
#>
6466
function Test-CustomDomainGetRemoveWithStoppedEndpoint
6567
{
68+
# Hard-coding host and endpoint names due to requirement for DNS CNAME
6669
$endpointName = "sdktest-b0939e74-75ba-4558-afe6-edc5c19ea713"
6770
$hostName = "sdktest-d8163a47-2912-4b95-8453-1588ca2d014f.azureedge-test.net"
6871

@@ -85,7 +88,7 @@ function Test-CustomDomainGetRemoveWithStoppedEndpoint
8588
$validateResultbyPiping = Test-AzureRmCdnCustomDomain -CdnEndpoint $endpoint -CustomDomainHostName $hostName
8689
Assert-True{$validateResultbyPiping.CustomDomainValidated}
8790

88-
$stopped = Stop-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false
91+
$stopped = Stop-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName
8992

9093
$createdCustomDomain = New-AzureRmCdnCustomDomain -HostName $hostName -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName
9194
Assert-AreEqual $customDomainName $createdCustomDomain.Name
@@ -96,9 +99,9 @@ function Test-CustomDomainGetRemoveWithStoppedEndpoint
9699
Assert-AreEqual $customDomainName $customDomain.Name
97100
Assert-AreEqual $hostName $customDomain.HostName
98101

99-
$removed = Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false -PassThru
102+
$removed = Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru
100103
Assert-True{$removed}
101-
Assert-ThrowsContains { Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false} "does not exist"
104+
Assert-ThrowsContains { Remove-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "does not exist"
102105

103106
Assert-ThrowsContains { Get-AzureRmCdnCustomDomain -CustomDomainName $customDomainName -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
104107

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/EndpointTests.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function Test-EndpointCrudAndAction
6060
$validateResult = Test-AzureRmCdnCustomDomain -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -CustomDomainHostName "unverifiedcustomdomain.com"
6161
Assert-False{$validateResult.CustomDomainValidated}
6262

63-
$endpointRemoved = Remove-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false -PassThru
63+
$endpointRemoved = Remove-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru -Force
6464
Assert-True{$endpointRemoved}
6565

6666
Assert-ThrowsContains { Get-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
@@ -125,7 +125,7 @@ function Test-EndpointCrudAndActionWithPiping
125125
Assert-AreEqual $startedEndpoint.OriginPath $updatedEndpoint.OriginPath
126126
Assert-AreEqual $startedEndpoint.QueryStringCachingBehavior $updatedEndpoint.QueryStringCachingBehavior
127127

128-
$endpointRemoved = Remove-AzureRmCdnEndpoint -CdnEndpoint $createdEndpoint -Confirm:$false -PassThru
128+
$endpointRemoved = Remove-AzureRmCdnEndpoint -CdnEndpoint $createdEndpoint -Force -PassThru
129129
Assert-True{$endpointRemoved}
130130

131131
Assert-ThrowsContains { Get-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
@@ -204,7 +204,7 @@ function Test-EndpointCrudAndActionWithAllProperties
204204
$validateResult = Test-AzureRmCdnCustomDomain -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -CustomDomainHostName "unverifiedcustomdomain.com"
205205
Assert-False{$validateResult.CustomDomainValidated}
206206

207-
$endpointRemoved = Remove-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false -PassThru
207+
$endpointRemoved = Remove-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Force -PassThru
208208
Assert-True{$endpointRemoved}
209209

210210
Assert-ThrowsContains { Get-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
@@ -289,7 +289,7 @@ function Test-EndpointCrudAndActionWithAllPropertiesWithPiping
289289
Assert-AreEqual $startedEndpoint.OriginPath $updatedEndpoint.OriginPath
290290
Assert-AreEqual $startedEndpoint.QueryStringCachingBehavior $updatedEndpoint.QueryStringCachingBehavior
291291

292-
$endpointRemoved = Remove-AzureRmCdnEndpoint -CdnEndpoint $createdEndpoint -Confirm:$false -PassThru
292+
$endpointRemoved = Remove-AzureRmCdnEndpoint -CdnEndpoint $createdEndpoint -Force -PassThru
293293
Assert-True{$endpointRemoved}
294294

295295
Assert-ThrowsContains { Get-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
@@ -349,7 +349,7 @@ function Test-EndpointCrudAndActionWithStoppedEndpoint
349349
Assert-AreEqual $startedEndpoint.OriginPath $updatedEndpoint.OriginPath
350350
Assert-AreEqual $startedEndpoint.QueryStringCachingBehavior $updatedEndpoint.QueryStringCachingBehavior
351351

352-
$endpointRemoved = Remove-AzureRmCdnEndpoint -CdnEndpoint $createdEndpoint -Confirm:$false -PassThru
352+
$endpointRemoved = Remove-AzureRmCdnEndpoint -CdnEndpoint $createdEndpoint -Force -PassThru
353353
Assert-True{$endpointRemoved}
354354

355355
Assert-ThrowsContains { Get-AzureRmCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
@@ -375,8 +375,8 @@ function Test-EndpointPipeline
375375
$originHostName = "www.microsoft.com"
376376

377377

378-
$createdEndpoint1 = New-AzureRmCdnEndpoint -EndpointName $endpointName1 -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -OriginName $originName -OriginHostName $originHostName
379-
$createdEndpoint2 = New-AzureRmCdnEndpoint -EndpointName $endpointName2 -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -OriginName $originName -OriginHostName $originHostName
378+
New-AzureRmCdnEndpoint -EndpointName $endpointName1 -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -OriginName $originName -OriginHostName $originHostName
379+
New-AzureRmCdnEndpoint -EndpointName $endpointName2 -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -OriginName $originName -OriginHostName $originHostName
380380

381381
$endpoints = Get-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName | Get-AzureRmCdnEndpoint
382382

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,12 @@ public void TestProfilePipeline()
4747
{
4848
TestController.NewInstance.RunPowerShellTest(_logger, "Test-ProfilePipeline");
4949
}
50+
51+
[Fact]
52+
[Trait(Category.AcceptanceType, Category.CheckIn)]
53+
public void TestProfileDeleteWithEndpoints()
54+
{
55+
TestController.NewInstance.RunPowerShellTest(_logger, "Test-ProfileDeleteWithEndpoints");
56+
}
5057
}
5158
}

‎src/ResourceManager/Cdn/Commands.Cdn.Test/ScenarioTests/ProfileTests.ps1

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,31 @@ function Test-ProfileCrud
5151
$sso = Get-AzureRmCdnProfileSsoUrl -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName
5252
Assert-NotNull $sso.SsoUriValue
5353

54-
$removed = Remove-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Confirm:$false -PassThru
54+
$removed = Remove-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru
55+
56+
Assert-True { $removed }
57+
Assert-ThrowsContains { Get-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "does not exist"
58+
59+
Remove-AzureRmResourceGroup -Name $resourceGroup.ResourceGroupName -Force
60+
}
61+
62+
<#
63+
.SYNOPSIS
64+
Full Profile CRUD cycle
65+
#>
66+
function Test-ProfileDeleteWithEndpoints
67+
{
68+
$profileName = getAssetName
69+
$endpointName = getAssetName
70+
$resourceGroup = TestSetup-CreateResourceGroup
71+
$profileLocation = "EastUS"
72+
$profileSku = "StandardVerizon"
73+
74+
$createdProfile = New-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $profileLocation -Sku $profileSku
75+
76+
New-AzureRmCdnEndpoint -CdnProfile $createdProfile -OriginName "contoso" -OriginHostName "www.contoso.com" -EndpointName $endpointName
77+
78+
$removed = Remove-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Force -PassThru
5579

5680
Assert-True { $removed }
5781
Assert-ThrowsContains { Get-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "does not exist"
@@ -77,7 +101,7 @@ function Test-ProfileDeleteAndSsoWithPiping
77101
$sso = Get-AzureRmCdnProfileSsoUrl -CdnProfile $createdProfile
78102
Assert-NotNull $sso.SsoUriValue
79103

80-
$removed = Remove-AzureRmCdnProfile -CdnProfile $createdProfile -Confirm:$false -PassThru
104+
$removed = Remove-AzureRmCdnProfile -CdnProfile $createdProfile -PassThru
81105

82106
Assert-True { $removed }
83107
Assert-ThrowsContains { Get-AzureRmCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "does not exist"

0 commit comments

Comments
 (0)