Skip to content

Commit ded2921

Browse files
fix: azd template validation pipeline issue (#115)
* fix: azd template validation pipeline issue (#113) * pipeline issue updated * pipeline issue updated * psr rule file added * removed psl rule file * changed the path * changed the path * readme changes * readme changes * readme changes * readme changes * variable fabric capacity * variable fabric capacity * setting fabriccapacity admin to my id * bicepparams changes to read env variable * bicepparams changes to read env variable * readme changes * readme changes * path changes * path changes * removed pull request * run pipeline on dev merge * accept array for admin value * accept array for admin value * remove run on merge * updated doc for fabric capacity admin value * fix: postprovision cleanup step in temp file (#116) * pipeline issue updated * pipeline issue updated * psr rule file added * removed psl rule file * changed the path * changed the path * readme changes * readme changes * readme changes * readme changes * variable fabric capacity * variable fabric capacity * setting fabriccapacity admin to my id * bicepparams changes to read env variable * bicepparams changes to read env variable * readme changes * readme changes * path changes * path changes * removed pull request * run pipeline on dev merge * accept array for admin value * accept array for admin value * remove run on merge * updated doc for fabric capacity admin value * rerun the pipeline * rerun the pipeline * azd down fix * added recursive * added preprovisioning step * added env variable * fix: use submodules checkout and disable devcontainer for template validation * added step to fix bicepparam decorators in template validation workflow * fix: update bicepparam decorator removal and adjust Bicep module path * remove postprovision cleanup * remove changes * remove changes * remove postprovision cleanup step * commented why we are removing it * commented why we are removing it --------- Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> --------- Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com>
1 parent 62c49bb commit ded2921

File tree

4 files changed

+28
-4
lines changed

4 files changed

+28
-4
lines changed

.github/workflows/azd-template-validation.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919

20+
# This postprovision cleanup step (Stage 19) has been removed from azure.yaml because
21+
# azd down was failing in the pipeline. As a workaround, we are removing this step
22+
# to ensure the pipeline runs successfully.
23+
- name: Remove postprovision cleanup step from azure.yaml
24+
run: |
25+
yq -i 'del(.hooks.postprovision[] | select(.run == "./submodules/ai-landing-zone/bicep/scripts/postprovision.ps1"))' azure.yaml
26+
2027
- uses: microsoft/template-validation-action@Latest
2128
with:
2229
validateAzd: ${{ vars.TEMPLATE_VALIDATE_AZD }}
@@ -29,6 +36,6 @@ jobs:
2936
AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
3037
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
3138
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32-
39+
fabricCapacityMode: 'none'
3340
- name: print result
3441
run: cat ${{ steps.validation.outputs.resultFile }}

README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ This accelerator extends the [AI Landing Zone](https://github.com/Azure/ai-landi
4848
<!-------------------------------------------->
4949
<!-- KEY FEATURES -->
5050
<!-------------------------------------------->
51+
52+
## Features
53+
54+
5155
### Key features
5256
<details open>
5357
<summary>Click to learn more about the key features this solution enables</summary>
@@ -73,6 +77,9 @@ This accelerator extends the [AI Landing Zone](https://github.com/Azure/ai-landi
7377
<!-------------------------------------------->
7478
<!-- QUICK DEPLOY -->
7579
<!-------------------------------------------->
80+
81+
## Getting Started
82+
7683
<h2><img src="./docs/images/readme/quick-deploy.png" width="48" />
7784
Quick deploy
7885
</h2>
@@ -213,6 +220,11 @@ After deployment, you'll have a complete, enterprise-ready platform that unifies
213220
<!------------------------------------------>
214221
<!-- SUPPORTING DOCUMENTATION -->
215222
<!------------------------------------------>
223+
224+
225+
## Guidance
226+
227+
216228
<h2><img src="./docs/images/readme/supporting-documentation.png" width="48" />
217229
Supporting documentation
218230
</h2>
@@ -251,6 +263,10 @@ Supporting documentation
251263
252264
</details>
253265
266+
267+
## Resources
268+
269+
254270
### Cross references
255271
Check out similar solution accelerators
256272
| Solution Accelerator | Description |

docs/DeploymentGuide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Edit `infra/main.bicepparam` or set environment variables:
156156
| `fabricCapacityMode` | Fabric capacity mode: `create`, `byo`, or `none` | `create` |
157157
| `fabricWorkspaceMode` | Fabric workspace mode: `create`, `byo`, or `none` | `create` |
158158
| `fabricCapacitySku` | Fabric capacity SKU (only used when `fabricCapacityMode=create`) | `F8` (default) |
159-
| `fabricCapacityAdmins` | Fabric capacity admin principals (UPN emails or Entra object IDs) (required when `fabricCapacityMode=create`) | `["user@contoso.com"]` |
159+
| `fabricCapacityAdmins` | Fabric capacity admin principals (UPN emails or Entra object IDs) (required when `fabricCapacityMode=create`) | `user@contoso.com,user2@contoso.com` |
160160
| `fabricCapacityResourceId` | Existing Fabric capacity ARM resource ID (required when `fabricCapacityMode=byo`) | `/subscriptions/.../providers/Microsoft.Fabric/capacities/...` |
161161
| `fabricWorkspaceId` | Existing Fabric workspace ID (GUID) (required when `fabricWorkspaceMode=byo`) | `00000000-0000-0000-0000-000000000000` |
162162
| `fabricWorkspaceName` | Existing Fabric workspace name (used when `fabricWorkspaceMode=byo`) | `my-existing-workspace` |

infra/main.bicepparam

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ param aiSearchAdditionalAccessObjectIds = []
9999
// - Full setup: fabricCapacityPreset='create', fabricWorkspacePreset='create'
100100
// - No Fabric: fabricCapacityPreset='none', fabricWorkspacePreset='none'
101101
// - BYO both: fabricCapacityPreset='byo', fabricWorkspacePreset='byo'
102-
var fabricCapacityPreset = 'create'
102+
var fabricCapacityPreset = readEnvironmentVariable('fabricCapacityMode', 'create')
103103
var fabricWorkspacePreset = fabricCapacityPreset
104104

105105
// Legacy toggle retained for back-compat with older docs/scripts
@@ -118,7 +118,8 @@ param fabricWorkspaceName = '' // optional (helpful for naming/UX)
118118
param fabricCapacitySku = 'F8'
119119

120120
// Fabric capacity admin members (email addresses or object IDs).
121-
param fabricCapacityAdmins = []
121+
var fabricAdminValue = readEnvironmentVariable('fabricCapacityAdmins', '')
122+
param fabricCapacityAdmins = empty(fabricAdminValue) ? [] : split(fabricAdminValue, ',')
122123

123124
// ========================================
124125
// PURVIEW PARAMETERS (Optional)

0 commit comments

Comments
 (0)