Skip to content

Commit d2ed0be

Browse files
authored
Improvements to AVM documentation links (Azure#3078)
1 parent aca1ab4 commit d2ed0be

14 files changed

+32
-8
lines changed

docs/analyzing-resources.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,4 @@ suppression:
123123
PSRule for Azure comes with many configuration options.
124124
The setup section explains in detail how to configure each option.
125125

126-
[5]: setup/configuring-options.md
126+
[5]: setup/index.md

docs/creating-your-pipeline.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ configuration:
335335
PSRule for Azure comes with many configuration options.
336336
The setup section explains in detail how to configure each option.
337337

338-
[5]: setup/configuring-options.md
338+
[5]: setup/index.md
339339

340340
## Recommended content
341341

docs/en/rules/Azure.AI.DisableLocalAuth.md

+2
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ resource account 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
9292
}
9393
```
9494

95+
<!-- external:avm avm/res/cognitive-services/account disableLocalAuth -->
96+
9597
### Configure with Azure Policy
9698

9799
To address this issue at runtime use the following policies:

docs/en/rules/Azure.AI.ManagedIdentity.md

+2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ resource language 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
9393
}
9494
```
9595

96+
<!-- external:avm avm/res/cognitive-services/account managedIdentities -->
97+
9698
### Configure with Azure Policy
9799

98100
To address this issue at runtime use the following policies:

docs/en/rules/Azure.AI.PrivateEndpoints.md

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ resource account 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
9090
}
9191
```
9292

93+
<!-- external:avm avm/res/cognitive-services/account publicNetworkAccess -->
94+
9395
## LINKS
9496

9597
- [SE:06 Network controls](https://learn.microsoft.com/azure/well-architected/security/networking)

docs/en/rules/Azure.AI.PublicAccess.md

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ resource account 'Microsoft.CognitiveServices/accounts@2023-05-01' = {
9090
}
9191
```
9292

93+
<!-- external:avm avm/res/cognitive-services/account networkAcls,publicNetworkAccess -->
94+
9395
## LINKS
9496

9597
- [SE:06 Network controls](https://learn.microsoft.com/azure/well-architected/security/networking)

docs/en/rules/Azure.AKS.SecretStore.md

+2
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ resource cluster 'Microsoft.ContainerService/managedClusters@2021-07-01' = {
178178
}
179179
```
180180

181+
<!-- external:avm avm/res/container-service/managed-cluster enableKeyvaultSecretsProvider -->
182+
181183
### Configure with Azure CLI
182184

183185
```bash

docs/en/rules/Azure.AKS.SecretStoreRotation.md

+2
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ resource cluster 'Microsoft.ContainerService/managedClusters@2021-07-01' = {
180180
}
181181
```
182182

183+
<!-- external:avm avm/res/container-service/managed-cluster enableSecretRotation -->
184+
183185
### Configure with Azure CLI
184186

185187
```bash

docs/en/rules/Azure.AKS.UptimeSLA.md

+2
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ resource aks 'Microsoft.ContainerService/managedClusters@2023-02-01' = {
129129
}
130130
```
131131

132+
<!-- external:avm avm/res/container-service/managed-cluster skuTier -->
133+
132134
## NOTES
133135

134136
`Basic` and `Paid` are removed in the `2023-02-01` and `2023-02-02 Preview` API version,

docs/en/rules/Azure.APIM.MultiRegion.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ Enhance service availability and resilience by deploying API Management instance
1515

1616
## DESCRIPTION
1717

18-
API Management supports multi-region deployment, which allows the API gateway to be available in more than one region. This configuration enhances service availability by ensuring that if one region experiences an outage, the API gateway remains operational in another region. Multi-region deployment is crucial for maintaining high availability and reducing latency for global users.
18+
API Management supports multi-region deployment, which allows the API gateway to be available in more than one region.
19+
This configuration enhances service availability by ensuring that if one region experiences an outage, the API gateway remains operational in another region.
20+
Multi-region deployment is crucial for maintaining high availability and reducing latency for global users.
1921

2022
This feature is available exclusively in the Premium SKU for API Management.
2123

@@ -93,9 +95,10 @@ resource apiManagementService 'Microsoft.ApiManagement/service@2021-12-01-previe
9395

9496
It is recommended to configure zone redundancy if the region supports it.
9597

96-
Virtual network settings must be configured in the added region, if networking is configured in the existing region or regions. The rule does not take this into consideration.
98+
Virtual network settings must be configured in the added region, if networking is configured in the existing region or regions.
99+
The rule does not take this into consideration.
97100

98-
For developer environments, suppressing the rule might make sense as configuring multi-region for an API Management instance requries the `Premium` SKU currently.
101+
For developer environments, suppressing the rule might make sense as configuring multi-region for an API Management instance requires the `Premium` SKU currently.
99102

100103
## LINKS
101104

docs/en/rules/Azure.APIM.MultiRegionGateway.md

+2
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ resource apiManagementService 'Microsoft.ApiManagement/service@2021-12-01-previe
9696
}
9797
```
9898

99+
<!-- external:avm avm/res/api-management/service additionalLocations -->
100+
99101
## LINKS
100102

101103
- [Resiliency and dependencies](https://learn.microsoft.com/azure/architecture/framework/resiliency/design-resiliency)

docs/en/rules/Azure.APIM.Protocols.md

+2
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = {
137137
}
138138
```
139139

140+
<!-- external:avm avm/res/api-management/service customProperties -->
141+
140142
## LINKS
141143

142144
- [Data encryption in Azure](https://learn.microsoft.com/azure/architecture/framework/security/design-storage-encryption#data-in-transit)

docs/hooks/shortcodes.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def _external_reference_avm(text: str, page: Page) -> str:
167167
avm_latest_version = _avm_module_latest_tag(page, avm_path)
168168

169169
# Add the reference syntax.
170-
syntax_body = _avm_code_reference(avm_path, None)
170+
syntax_body = f"\nTo reference the module, please use the following syntax:{_avm_code_reference(avm_path, None)}"
171171

172172
# Add suggested version.
173173
suggestion_body = ''
@@ -179,10 +179,13 @@ def _external_reference_avm(text: str, page: Page) -> str:
179179
if avm_latest_version != '':
180180
latest_body = f"\n\nTo use the latest version:{_avm_code_reference(avm_path, avm_latest_version)}"
181181

182+
# Add AVM info.
183+
avm_links_body = f"\n\n---\n\n- [What is Azure Verified Modules?](https://aka.ms/avm)\n- [Usage and parameters for this module](https://github.com/Azure/bicep-registry-modules/tree/main/{avm_path})"
184+
182185
return _reference_block(
183186
style = "Example",
184187
title = f"Configure with [Azure Verified Modules](https://github.com/Azure/bicep-registry-modules/tree/main/{avm_path})",
185-
text = f"A pre-built module provided by Microsoft is available from the Azure Bicep public registry.\nTo reference the module, please use the following syntax:{syntax_body}{suggestion_body}{latest_body}"
188+
text = f"A pre-validated module supported by Microsoft is available from the Azure Bicep public registry.{syntax_body}{suggestion_body}{latest_body}{avm_links_body}"
186189
)
187190

188191
def _avm_code_reference(path: str, version: str) -> str:

docs/setup/configuring-expansion.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This feature can be enabled by using the following configuration options.
1111
Each of these configuration options are set within the `ps-rule.yaml` file.
1212
To learn how to set configuration options see [Configuring options][1].
1313

14-
[1]: configuring-options.md
14+
[1]: index.md
1515

1616
## Available options
1717

0 commit comments

Comments
 (0)