Skip to content

Commit aa3f2af

Browse files
chhayneschhaynes
committed
Merge latest main branch and resolve conflicts
2 parents 36eddc6 + c6141c3 commit aa3f2af

File tree

5,470 files changed

+1348211
-9373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,470 files changed

+1348211
-9373
lines changed

.githooks/pre-push renamed to .githooks/pre-commit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/usr/bin/env sh
2-
":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-push.ps1; else sh .githooks/pre-push.sh; fi; exit $? # Try PowerShell Core first, then sh on Unix
2+
":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-commit.ps1; else sh .githooks/pre-commit.sh; fi; exit $? # Try PowerShell Core first, then sh on Unix
33
":" //; exit # Skip rest on Unix
44

55
@echo off
66
powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
77
if %errorlevel% equ 0 (
8-
powershell -ExecutionPolicy Bypass -File .githooks\pre-push.ps1
8+
powershell -ExecutionPolicy Bypass -File .githooks\pre-commit.ps1
99
) else (
1010
echo Error: PowerShell is not available. Please install PowerShell.
1111
exit /b 1

.githooks/pre-push.ps1 renamed to .githooks/pre-commit.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $Modules = $ChangedFiles |
1010
ForEach-Object { ($_ -split "/")[0] } | # Extract the moudule
1111
Sort-Object -Unique # Ensure uniqueness
1212

13-
Write-Host "Verifying command models..." -ForegroundColor Green
13+
Write-Host "Verifying command models...`n" -ForegroundColor Green
1414

1515
# Get Git root directory
1616
$GitRoot = git rev-parse --show-toplevel
@@ -20,7 +20,6 @@ $Modules | ForEach-Object {
2020
Write-Host "Running: aaz-dev command-model verify -a $GitRoot -t $_" -ForegroundColor Yellow # For logging
2121
aaz-dev command-model verify -a $GitRoot -t $_
2222
if ($LASTEXITCODE -ne 0) {
23-
Write-Host "Please pull the latest <Main> branch, and <Export> your command model again." -ForegroundColor Red
2423
exit 1
2524
}
2625
}

.githooks/pre-push.sh renamed to .githooks/pre-commit.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Modules=$(echo "$ChangedFiles" |
1616
cut -d '/' -f 1 | # Extract the module
1717
sort -u) # Ensure uniqueness
1818

19-
echo "${GREEN}Verifying command models...${NC}"
19+
echo -e "${GREEN}Verifying command models...${NC}\n"
2020

2121
# Get Git root directory
2222
GitRoot=$(git rev-parse --show-toplevel)
@@ -26,7 +26,6 @@ for Module in $Modules; do
2626
echo "${YELLOW}Running: aaz-dev command-model verify -a $GitRoot -t $Module${NC}" # For logging
2727
aaz-dev command-model verify -a "$GitRoot" -t "$Module"
2828
if [[ $? -ne 0 ]]; then
29-
echo "${RED}Please pull the latest <Main> branch, and <Export> your command model again.${NC}"
3029
exit 1
3130
fi
3231
done

‎.github/workflows/verify-metadata.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,3 @@ jobs:
2828
- name: Verify data consistency
2929
id: verification
3030
run: aaz-dev command-model verify --aaz-path $GITHUB_WORKSPACE
31-
continue-on-error: true
32-
33-
- name: Check on exception
34-
if: steps.verification.outcome != 'success'
35-
run: |
36-
echo "Please pull the latest <main> branch, and <Export> your command model again."
37-
exit 1

‎Commands/afd/custom-domain/_create.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,19 @@ Create a new domain within the specified profile.
6767
```bash
6868
afd custom-domain create -g group --custom-domain-name example-custom-domain --profile-name profile --host-name www.contoso.com --minimum-tls-version TLS12 --certificate-type CustomerCertificate --secret secretName
6969
```
70+
71+
### [2025-06-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5jZG4vcHJvZmlsZXMve30vY3VzdG9tZG9tYWlucy97fQ==/2025-06-01.xml) **Stable**
72+
73+
<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/customdomains/{} 2025-06-01 -->
74+
75+
#### examples
76+
77+
- Create a custom domain that uses AFD managed certificate for SSL/TLS encryption.
78+
```bash
79+
afd custom-domain create -g group --custom-domain-name customDomain --profile-name profile --host-name www.contoso.com --minimum-tls-version TLS12 --certificate-type ManagedCertificate
80+
```
81+
82+
- Create a custom domain that uses your own certificate for SSL/TLS encryption, the certificate is stored in Azure Key Vault and referenced by an AFD secret.
83+
```bash
84+
afd custom-domain create -g group --custom-domain-name example-custom-domain --profile-name profile --host-name www.contoso.com --minimum-tls-version TLS12 --certificate-type CustomerCertificate --secret secretName
85+
```

‎Commands/afd/custom-domain/_delete.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,14 @@ Delete an existing AzureFrontDoor domain with the specified domain name under th
4747
```bash
4848
afd custom-domain delete -g group --profile-name profile --custom-domain-name customDomainName
4949
```
50+
51+
### [2025-06-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5jZG4vcHJvZmlsZXMve30vY3VzdG9tZG9tYWlucy97fQ==/2025-06-01.xml) **Stable**
52+
53+
<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/customdomains/{} 2025-06-01 -->
54+
55+
#### examples
56+
57+
- Delete a custom domain.
58+
```bash
59+
afd custom-domain delete -g group --profile-name profile --custom-domain-name customDomainName
60+
```

‎Commands/afd/custom-domain/_list.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,14 @@ List existing AzureFrontDoor domains.
4747
```bash
4848
afd custom-domain list -g group --profile-name profile
4949
```
50+
51+
### [2025-06-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5jZG4vcHJvZmlsZXMve30vY3VzdG9tZG9tYWlucw==/2025-06-01.xml) **Stable**
52+
53+
<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/customdomains 2025-06-01 -->
54+
55+
#### examples
56+
57+
- List all the custom domains within the specified profile.
58+
```bash
59+
afd custom-domain list -g group --profile-name profile
60+
```

‎Commands/afd/custom-domain/_regenerate-validation-token.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,14 @@ Updates the domain validation token.
3636
```bash
3737
afd custom-domain regenerate-validation-token -g MyResourceGroup --profile-name MyProfle --custom-domain-name MyCustomDomain
3838
```
39+
40+
### [2025-06-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5jZG4vcHJvZmlsZXMve30vY3VzdG9tZG9tYWlucy97fS9yZWZyZXNodmFsaWRhdGlvbnRva2Vu/2025-06-01.xml) **Stable**
41+
42+
<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/customdomains/{}/refreshvalidationtoken 2025-06-01 -->
43+
44+
#### examples
45+
46+
- Regenerate the domain validation token.
47+
```bash
48+
afd custom-domain regenerate-validation-token -g MyResourceGroup --profile-name MyProfle --custom-domain-name MyCustomDomain
49+
```

‎Commands/afd/custom-domain/_show.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,14 @@ Get an existing AzureFrontDoor domain with the specified domain name under the s
4747
```bash
4848
afd custom-domain show -g group --profile-name profile --custom-domain-name customDomainName
4949
```
50+
51+
### [2025-06-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5jZG4vcHJvZmlsZXMve30vY3VzdG9tZG9tYWlucy97fQ==/2025-06-01.xml) **Stable**
52+
53+
<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/customdomains/{} 2025-06-01 -->
54+
55+
#### examples
56+
57+
- show details of the custom domain within the specified profile.
58+
```bash
59+
afd custom-domain show -g group --profile-name profile --custom-domain-name customDomainName
60+
```

‎Commands/afd/custom-domain/_update.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,19 @@ Update a new domain within the specified profile.
6767
```bash
6868
afd custom-domain update -g group --custom-domain-name customDomain --profile-name profile --certificate-type ManagedCertificate
6969
```
70+
71+
### [2025-06-01](/Resources/mgmt-plane/L3N1YnNjcmlwdGlvbnMve30vcmVzb3VyY2Vncm91cHMve30vcHJvdmlkZXJzL21pY3Jvc29mdC5jZG4vcHJvZmlsZXMve30vY3VzdG9tZG9tYWlucy97fQ==/2025-06-01.xml) **Stable**
72+
73+
<!-- mgmt-plane /subscriptions/{}/resourcegroups/{}/providers/microsoft.cdn/profiles/{}/customdomains/{} 2025-06-01 -->
74+
75+
#### examples
76+
77+
- Update the custom domain's supported minimum TLS version.
78+
```bash
79+
afd custom-domain update -g group --custom-domain-name customDomain --profile-name profile --minimum-tls-version TLS12
80+
```
81+
82+
- Update the custom domain's certificate type to AFD managed certificate.
83+
```bash
84+
afd custom-domain update -g group --custom-domain-name customDomain --profile-name profile --certificate-type ManagedCertificate
85+
```

0 commit comments

Comments
 (0)