Skip to content

[FrontDoor] Allow Enable-AzFrontDoorCustomDomainHttps's SecretVersion parameter to be optional to support bring-your-own-certificate auto-rotation #14765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VeryEarly merged 2 commits into from
Apr 19, 2021
Merged

[FrontDoor] Allow Enable-AzFrontDoorCustomDomainHttps's SecretVersion parameter to be optional to support bring-your-own-certificate auto-rotation #14765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04a083f
Allow Enable-AzFrontDoorCustomDomainHttps's SecretVersion parameter t…
Apr 16, 2021
7c6fd85
Update ChangeLog.md
VeryEarly Apr 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/FrontDoor/FrontDoor.Test/ScenarioTests/Common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,33 @@ function Assert-Tags($tags1, $tags2)
throw "Tag content not equal. Key:$key Tags1:" + $tags1[$key] + "Tags2:" + $tags2[$key]
}
}
}

<#
.SYNOPSIS
Disable the CustomDomain Https deployment
#>
function TestCleanUp-DisableCustomDomainHttps($resourceGroupName, $frontDoorName, $customFrontendEndpointName)
{
$customDomain = Get-AzFrontDoorFrontendEndpoint -ResourceGroupName $resourceGroupName -FrontDoorName $frontDoorName -Name $customFrontendEndpointName
Assert-AreEqual $customDomain.CustomHttpsProvisioningState "Enabling"
[int]$counter = 0
do
{
Wait-Seconds 60
$customDomain = Get-AzFrontDoorFrontendEndpoint -ResourceGroupName $resourceGroupName -FrontDoorName $frontDoorName -Name $customFrontendEndpointName
} while ($customDomain.CustomHttpsProvisioningState -ne "Enabled" -and $counter++ -lt 60)
Assert-AreEqual $customDomain.CustomHttpsProvisioningState "Enabled"
Assert-AreEqual $customDomain.MinimumTlsVersion "1.2"

$customDomain = Get-AzFrontDoorFrontendEndpoint -ResourceGroupName $resourceGroupName -FrontDoorName $frontDoorName -Name $customFrontendEndpointName
$disabledCustomDomain = $customDomain | Disable-AzFrontDoorCustomDomainHttps
Assert-AreEqual $disabledCustomDomain.CustomHttpsProvisioningState "Disabling"
[int]$counter = 0
do
{
Wait-Seconds 60
$disabledCustomDomain = Get-AzFrontDoorFrontendEndpoint -ResourceGroupName $resourceGroupName -FrontDoorName $frontDoorName -Name $customFrontendEndpointName
} while ($disabledCustomDomain.CustomHttpsProvisioningState -ne "Disabled" -and $counter++ -lt 60)
Assert-AreEqual $disabledCustomDomain.CustomHttpsProvisioningState "Disabled"
}
14 changes: 14 additions & 0 deletions src/FrontDoor/FrontDoor.Test/ScenarioTests/FrontDoorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ public void TestFrontDoorCrudWithPiping()
// TestController.NewInstance.RunPowerShellTest(_logger, "Test-FrontDoorEndpointCustomDomainHTTPS-FrontDoor");
//}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestFrontDoorEndpointCustomDomainHTTPSByocSpecificVersion()
{
TestController.NewInstance.RunPowerShellTest(_logger, "Test-FrontDoorEndpointCustomDomainHTTPS-BYOC-SpecificVersion");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestFrontDoorEndpointCustomDomainHTTPSByocLatestVersion()
{
TestController.NewInstance.RunPowerShellTest(_logger, "Test-FrontDoorEndpointCustomDomainHTTPS-BYOC-LatestVersion");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestFrontDoorCrudRedirect()
Expand Down
58 changes: 38 additions & 20 deletions src/FrontDoor/FrontDoor.Test/ScenarioTests/FrontDoorTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,29 +283,47 @@ function Test-FrontDoorEndpointCustomDomainHTTPS-FrontDoor
Assert-NotNull $retrievedFrontDoor

$customDomain = Enable-AzFrontDoorCustomDomainHttps -ResourceGroupName $ResourceGroupName -FrontDoorName $Name -FrontendEndpointName $customFrontendEndpointName -MinimumTlsVersion "1.2"
Assert-AreEqual $customDomain.CustomHttpsProvisioningState "Enabling"
[int]$counter = 0
do
{
Wait-Seconds 600
$customDomain = Get-AzFrontDoorFrontendEndpoint -ResourceGroupName $ResourceGroupName -FrontDoorName $Name -Name $customFrontendEndpointName
} while ($customDomain.CustomHttpsProvisioningState -ne "Enabled" -and $counter++ -lt 50)
Assert-AreEqual $customDomain.CustomHttpsProvisioningState "Enabled"
Assert-AreEqual $customDomain.MinimumTlsVersion "1.2"

$customDomain = Get-AzFrontDoorFrontendEndpoint -ResourceGroupName $ResourceGroupName -FrontDoorName $Name -Name $customFrontendEndpointName
$disabledCustomDomain = $customDomain | Disable-AzFrontDoorCustomDomainHttps
Assert-AreEqual $disabledCustomDomain.CustomHttpsProvisioningState "Disabling"
[int]$counter = 0
do
{
Wait-Seconds 600
$disabledCustomDomain = Get-AzFrontDoorFrontendEndpoint -ResourceGroupName $ResourceGroupName -FrontDoorName $Name -Name $customFrontendEndpointName
} while ($disabledCustomDomain.CustomHttpsProvisioningState -ne "Disabled" -and $counter++ -lt 50)
Assert-AreEqual $disabledCustomDomain.CustomHttpsProvisioningState "Disabled"
TestCleanUp-DisableCustomDomainHttps $ResourceGroupName $Name $customFrontendEndpointName
$disabledCustomDomain = Get-AzFrontDoorFrontendEndpoint -ResourceId $disabledCustomDomain.Id
}

<#
.SYNOPSIS
Set custom domain https configuration for FrontDoor endpoint using specific secret version.
This case should only been ran in Playback model, live run requires the resource setup which is too cumbersome.
#>
function Test-FrontDoorEndpointCustomDomainHTTPS-BYOC-SpecificVersion
{
$frontDoorName = "frontdoorpstest2"
$resourceGroupName = "bzhanafdtest"
$customFrontendEndpointName = "afd-byoc-latest-localdev-cdn-azure-cn"
$vaultId = "/subscriptions/d7cfdb98-c118-458d-8bdf-246be66b1f5e/resourceGroups/bzhanafdtest/providers/Microsoft.KeyVault/vaults/bzhanbyostest"
$secretName = "frontdoorpstest2"
$secretVersion = "d6b1f0ffd2a142efb2a8a89289802c77"

$customDomain = Enable-AzFrontDoorCustomDomainHttps -ResourceGroupName $resourceGroupName -FrontDoorName $frontDoorName -FrontendEndpointName $customFrontendEndpointName -MinimumTlsVersion "1.2" -VaultId $vaultId -SecretName $secretName -SecretVersion $secretVersion
Assert-AreEqual $customDomain.SecretVersion $secretVersion
TestCleanUp-DisableCustomDomainHttps $resourceGroupName $frontDoorName $customFrontendEndpointName
}

<#
.SYNOPSIS
Set custom domain https configuration for FrontDoor endpoint using latest secret version.
This case should only been ran in Playback model, live run requires the resource setup which is too cumbersome.
#>
function Test-FrontDoorEndpointCustomDomainHTTPS-BYOC-LatestVersion
{
$frontDoorName = "frontdoorpstest2"
$resourceGroupName = "bzhanafdtest"
$customFrontendEndpointName = "afd-byoc-latest-localdev-cdn-azure-cn"
$vaultId = "/subscriptions/d7cfdb98-c118-458d-8bdf-246be66b1f5e/resourceGroups/bzhanafdtest/providers/Microsoft.KeyVault/vaults/bzhanbyostest"
$secretName = "frontdoorpstest2"

$customDomain = Enable-AzFrontDoorCustomDomainHttps -ResourceGroupName $resourceGroupName -FrontDoorName $frontDoorName -FrontendEndpointName $customFrontendEndpointName -MinimumTlsVersion "1.2" -VaultId $vaultId -SecretName $secretName
Assert-Null $customDomain.SecretVersion
TestCleanUp-DisableCustomDomainHttps $resourceGroupName $frontDoorName $customFrontendEndpointName
}

<#
.SYNOPSIS
Full Front Door CRUD to validate default values.
Expand Down
Loading