Skip to content

Commit f2c758f

Browse files
author
Chenglong Liu
committed
Update command
1 parent b2e7bc0 commit f2c758f

File tree

5 files changed

+40
-32
lines changed

5 files changed

+40
-32
lines changed

src/Cdn/Cdn.Autorest/custom/Get-AzCdnProfile.ps1

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,25 @@ function Get-AzCdnProfile {
8282

8383
process {
8484
$internalProfiles = Az.Cdn.internal\Get-AzCdnProfile @PSBoundParameters
85-
Write-Host -ForegroundColor Green $internalProfiles.GetType()
86-
87-
if ($null -eq $internalProfiles )
88-
{
89-
$profiles = $null
90-
}else
85+
86+
if ($null -ne $internalProfiles )
9187
{
9288
if($internalProfiles -is [array]){
93-
$profiles = @()
9489
foreach ($oneInternalProfile in $internalProfiles)
9590
{
9691
if(-Not (ISFrontDoorCdnProfile($oneInternalProfile.SkuName)))
9792
{
98-
$profiles += $oneInternalProfile
93+
Write-Output $oneInternalProfile
9994
}
10095
}
10196
}else
10297
{
10398
$oneInternalProfile = $internalProfiles
10499
if(-Not (ISFrontDoorCdnProfile($oneInternalProfile.SkuName)))
105100
{
106-
$profiles = $internalProfiles
107-
}else{
108-
$profiles = $null
101+
Write-Output $oneInternalProfile
109102
}
110103
}
111104
}
112-
113-
Write-Output $profiles
114105
}
115106
}

src/Cdn/Cdn.Autorest/custom/Get-AzFrontDoorCdnProfile.ps1

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,32 +82,24 @@ function Get-AzFrontDoorCdnProfile {
8282

8383
process {
8484
$internalProfiles = Az.Cdn.internal\Get-AzCdnProfile @PSBoundParameters
85-
if ($null -eq $internalProfiles )
86-
{
87-
$profiles = $null
88-
}else
85+
if ($null -ne $internalProfiles )
8986
{
9087
if($internalProfiles -is [array]){
91-
$profiles = @()
9288
foreach ($oneInternalProfile in $internalProfiles)
9389
{
9490
if(ISFrontDoorCdnProfile($oneInternalProfile.SkuName))
9591
{
96-
$profiles += $oneInternalProfile
92+
Write-Output $oneInternalProfile
9793
}
9894
}
9995
}else
10096
{
10197
$oneInternalProfile = $internalProfiles
10298
if(ISFrontDoorCdnProfile($oneInternalProfile.SkuName))
10399
{
104-
$profiles = $oneInternalProfile
105-
}else{
106-
$profiles = $null
100+
Write-Output $oneInternalProfile
107101
}
108102
}
109103
}
110-
111-
Write-Output $profiles
112104
}
113105
}

src/Cdn/Cdn.Autorest/custom/Remove-AzFrontDoorCdnProfile.ps1

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,19 @@ function Remove-AzFrontDoorCdnProfile {
156156

157157
process {
158158

159-
$frontDoorCdnProfile = Get-AzFrontDoorCdnProfile -ResourceGroupName ${ResourceGroupName} -Name ${Name}
159+
if ($PSCmdlet.ParameterSetName -eq 'Delete') {
160+
$frontDoorCdnProfile = Get-AzFrontDoorCdnProfile -ResourceGroupName ${ResourceGroupName} -Name ${Name}
161+
} elseif ($PSCmdlet.ParameterSetName -eq 'DeleteViaIdentity') {
162+
$frontDoorCdnProfile = $InputObject
163+
}else {
164+
throw "Not supported ParameterSetName."
165+
}
166+
160167
if($null -eq $frontDoorCdnProfile)
161168
{
162169
throw "Provided FrontDoorCdnProfile does not exist."
163170
}else{
171+
Write-Host -ForegroundColor Green "Skuname $($frontDoorCdnProfile.SkuName)"
164172
if(ISFrontDoorCdnProfile($frontDoorCdnProfile.SkuName)){
165173
Az.Cdn.internal\Remove-AzCdnProfile @PSBoundParameters
166174
}else{

src/Cdn/Cdn.Autorest/test/Remove-AzFrontDoorCdnProfile.Tests.ps1

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Remove-AzFrontDoorCdnProfile'
1515
}
1616

1717
Describe 'Remove-AzFrontDoorCdnProfile' {
18-
It 'Delete' {
18+
It 'Delete' -skip{
1919
{
2020
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
2121
try
@@ -28,15 +28,32 @@ Describe 'Remove-AzFrontDoorCdnProfile' {
2828

2929
$profileSku = "Standard_AzureFrontDoor";
3030
New-AzFrontDoorCdnProfile -SkuName $profileSku -Name $frontDoorCdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
31-
#Remove-AzFrontDoorCdnProfile -Name $frontDoorCdnProfileName -ResourceGroupName $ResourceGroupName
31+
Remove-AzFrontDoorCdnProfile -Name $frontDoorCdnProfileName -ResourceGroupName $ResourceGroupName
3232
} Finally
3333
{
34-
#Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
34+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
3535
}
3636
} | Should -Not -Throw
3737
}
3838

39-
It 'DeleteViaIdentity' -skip {
40-
{ throw [System.NotImplementedException] } | Should -Not -Throw
39+
It 'DeleteViaIdentity' {
40+
{
41+
$ResourceGroupName = 'testps-rg-' + (RandomString -allChars $false -len 6)
42+
try
43+
{
44+
Write-Host -ForegroundColor Green "Create test group $($ResourceGroupName)"
45+
New-AzResourceGroup -Name $ResourceGroupName -Location $env.location
46+
47+
$frontDoorCdnProfileName = 'fdp-' + (RandomString -allChars $false -len 6);
48+
Write-Host -ForegroundColor Green "Use frontDoorCdnProfileName : $($frontDoorCdnProfileName)"
49+
50+
$profileSku = "Standard_AzureFrontDoor";
51+
New-AzFrontDoorCdnProfile -SkuName $profileSku -Name $frontDoorCdnProfileName -ResourceGroupName $ResourceGroupName -Location Global
52+
Get-AzFrontDoorCdnProfile -ResourceGroupName $ResourceGroupName -Name $frontDoorCdnProfileName | Remove-AzFrontDoorCdnProfile
53+
} Finally
54+
{
55+
Remove-AzResourceGroup -Name $ResourceGroupName -NoWait
56+
}
57+
} | Should -Not -Throw
4158
}
4259
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Tenant": "72f988bf-86f1-41af-91ab-2d7cd011db47",
2+
"location": "westus",
33
"SubscriptionId": "d7cfdb98-c118-458d-8bdf-246be66b1f5e",
4-
"location": "westus"
4+
"Tenant": "72f988bf-86f1-41af-91ab-2d7cd011db47"
55
}

0 commit comments

Comments
 (0)