fix: infra fixes for terraform and bicep #233

pauldotyu · 2025-08-15T03:29:45Z

Purpose

With 2.0.0 release of this app, the azd deployments have been revamped to take a different approach which includes using AZD's Kustomize capability and setting each subproject in this mono-repo as a service. This allows for e2e testing with each container image being built from source. However, there are instances where we want to run azd up and deploy from pre-built container images in ghcr.io.

So the following changes have been added to allow for that while still being flexible for other deployment options:

Bring back azd-hooks directory with predeploy, preprovision, postdeploy, and postprovision scripts and defaults to deploying using Helm and deploying from pre-built container images in ghcr.io/azure-samples/aks-store-demo
Added special azure-build-from-source.yaml which will be used to test deployments e2e from source using Kustomize and existing AZD build functionality
Bump all AVM module versions to latest
Removed RBAC AVM module and moving back to AzureRM role assignment to eliminate the need to create Entra ID Groups

Does this introduce a breaking change?

[x] Yes
[x] No

Pull Request Type

What kind of change does this Pull Request introduce?

[ ] Bugfix
[x] Feature
[ ] Code style update (formatting, local variables)
[x] Refactoring (no functional changes, no api changes)
[x] Documentation content changes
[ ] Other... Please describe:

How to Test

Get the code and run azd up

git clone https://github.com/azure-samples/aks-store-demo
cd aks-store-demo
git checkout azd_fixes
azd up

Test the code

What to Check

Verify that the following are valid

You should have a single AKS cluster with the AKS Store Demo app deployed

Other Information

pauldotyu · 2025-08-15T03:36:07Z

/test-e2e

github-actions · 2025-08-15T03:36:29Z

🚀 @pauldotyu Starting E2E tests...

Workflow Run: 16982292690
Environment: e2etest
Location: australiaeast

github-actions · 2025-08-15T04:05:20Z

❌ @pauldotyu E2E tests failed!

Workflow Run: 16982292690
Status: Failed
Environment: e2etest
Location: australiaeast

Please check the workflow logs for details and try again.

feat: bring back azd-hooks and preprovision script for azure provider registration and cli extension installation chore: remove azure-bicep.yaml file and add azure-build-from-source.yaml with bicep options commented chore: introduce azure-build-from-source.yaml for building images from source and deploying with kustomize (for e2e testing) refactor: revert azure.yaml to deploy with helm (better for non-e2e testing deployments) docs: enhance azd.md documentation for clarity on deployment options and environment variables fix: modify bicep parameters to default to false for observability tools and azure services chore: upgrade terraform provider versions in .terraform.lock.hcl for improved stability fix: update terraform main.tf and outputs.tf to correctly handle source registry and outputs

…ssignments

…ment

pauldotyu · 2025-08-15T21:44:05Z

/test-e2e

github-actions · 2025-08-15T21:44:28Z

🚀 @pauldotyu Starting E2E tests...

Workflow Run: 16999994699
Environment: e2etest
Location: australiaeast

github-actions · 2025-08-15T22:17:26Z

✅ @pauldotyu E2E tests completed successfully!

Workflow Run: 16999994699
Duration: ~33 minutes
Status: Passed
Environment: e2etest
Location: australiaeast

All tests passed and resources have been cleaned up.

…nt name which azd needs to be able to delete resources

pauldotyu · 2025-08-18T16:51:13Z

/test-e2e

github-actions · 2025-08-18T16:51:40Z

🚀 @pauldotyu Starting E2E tests...

Workflow Run: 17046960531
Environment: e2etest
Location: australiaeast

github-actions · 2025-08-18T16:52:03Z

❌ @pauldotyu E2E tests failed!

Workflow Run: 17046960531
Status: Failed
Environment: e2etest
Location: australiaeast

Please check the workflow logs for details and try again.

github-actions · 2025-08-18T17:27:56Z

🚀 @pauldotyu Starting E2E tests...

Workflow Run: 17046960531
Environment: e2etest
Location: australiaeast

github-actions · 2025-08-18T18:02:15Z

✅ @pauldotyu E2E tests completed successfully!

Workflow Run: 17046960531
Duration: ~71 minutes
Status: Passed
Environment: e2etest
Location: australiaeast

All tests passed and resources have been cleaned up.

Co-authored-by: Copilot <[email protected]>

…RE_SERVICE_BUS_URI

…Y setting behavior

pauldotyu · 2025-08-18T21:29:29Z

/test-e2e

github-actions · 2025-08-18T21:29:53Z

🚀 @pauldotyu Starting E2E tests...

Workflow Run: 17052994374
Environment: e2etest
Location: australiaeast

github-actions · 2025-08-18T21:37:47Z

❌ @pauldotyu E2E tests failed!

Workflow Run: 17052994374
Status: Failed
Environment: e2etest
Location: australiaeast

Please check the workflow logs for details and try again.

pauldotyu · 2025-08-18T21:42:50Z

/test-e2e

github-actions · 2025-08-18T21:43:14Z

🚀 @pauldotyu Starting E2E tests...

Workflow Run: 17053255276
Environment: e2etest
Location: australiaeast

Copilot

Pull Request Overview

This PR refactors the Azure Developer CLI deployment infrastructure to support multiple deployment scenarios, moving from a Kustomize-only approach to a default Helm-based deployment with pre-built container images. The key changes enable flexible deployment options while maintaining support for building from source.

Restructures Azure infrastructure configuration to use direct Azure role assignments instead of the AVM role assignment module
Updates all Azure Verified Modules (AVM) to their latest versions across Bicep and Terraform
Replaces the complex service-specific Kustomize configuration with a simplified Helm-based deployment using pre-built container images

Reviewed Changes

Copilot reviewed 27 out of 28 changed files in this pull request and generated 16 comments.

Show a summary per file

File	Description
infra/terraform/variables.tf	Updates default VM size to Standard_D2s_v4
infra/terraform/servicebus.tf	Replaces AVM role assignment module with direct azurerm_role_assignment
infra/terraform/outputs.tf	Adds new deployment status outputs and renames registry-related outputs
infra/terraform/openai.tf	Updates AVM module version and replaces role assignment module
infra/terraform/main.tf	Removes Azure AD group creation and adds source registry local variable
infra/terraform/kubernetes.tf	Updates AVM module versions and replaces group-based RBAC with direct assignment
infra/terraform/cosmosdb.tf	Updates AVM module to latest version
infra/bicep/*.bicep	Updates all AVM module versions to latest releases
infra/bicep/main.parameters.json	Removes default false values from deployment parameters
infra/bicep/main.bicep	Changes default deployment flags to false and adds conditional resource access
azure.yaml	Simplifies from service-specific Kustomize to single Helm deployment with azd-hooks
azd-hooks/*	Adds deployment scripts for provider registration, Helm value generation, and container management
docs/azd.md	Updates documentation for new deployment approach and environment variables

Files not reviewed (1)

infra/terraform/.terraform.lock.hcl: Language not supported

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.}

infra/bicep/main.bicep

github-actions · 2025-08-18T22:16:24Z

✅ @pauldotyu E2E tests completed successfully!

Workflow Run: 17053255276
Duration: ~34 minutes
Status: Passed
Environment: e2etest
Location: australiaeast

All tests passed and resources have been cleaned up.

pauldotyu added 6 commits August 15, 2025 14:39

fix: update default AKS node pool VM size to Standard_D2s_v4

0f2f6e6

fix: update scripts and templates for improved deployments and role a…

7b6dbac

…ssignments

feat: re-add azure-bicep.yaml configuration for aks-store-demo deploy…

3a4ac15

…ment

fix: add Azure.AKS.ContainerInsights to exclusion list

02d1350

fix: remove unused Bicep infrastructure configuration from azure.yaml

5193fd2

pauldotyu force-pushed the azd_fixes branch from 70e57c4 to 5193fd2 Compare August 15, 2025 21:40

pauldotyu added 2 commits August 18, 2025 08:44

fix(bicep): update tags parameter to use appEnvironment for environme…

cde4051

…nt name which azd needs to be able to delete resources

docs: add availability zone support section to azd.md

c915192

usepowershell requested a review from Copilot August 18, 2025 18:40

This comment was marked as outdated.

Sign in to view

pauldotyu and others added 2 commits August 18, 2025 11:44

Update azd-hooks/predeploy.sh

f5747d8

Co-authored-by: Copilot <[email protected]>

Update azd-hooks/predeploy.ps1

3c80d9c

Co-authored-by: Copilot <[email protected]>

pauldotyu requested a review from Copilot August 18, 2025 18:45

This comment was marked as outdated.

Sign in to view

Update azd-hooks/postprovision.ps1

1ff1ca6

Co-authored-by: Copilot <[email protected]>

pauldotyu requested a review from Copilot August 18, 2025 20:08

This comment was marked as outdated.

Sign in to view

Update infra/terraform/main.tf

e261f59

Co-authored-by: Copilot <[email protected]>

Update azd-hooks/predeploy.ps1

8401b06

Co-authored-by: Copilot <[email protected]>

pauldotyu requested a review from Copilot August 18, 2025 20:23

This comment was marked as outdated.

Sign in to view

Update predeploy scripts to use AZURE_SERVICE_BUS_HOST instead of AZU…

170d342

…RE_SERVICE_BUS_URI

pauldotyu requested a review from Copilot August 18, 2025 20:25

This comment was marked as outdated.

Sign in to view

Update preprovision scripts to clarify DEPLOY_AZURE_CONTAINER_REGISTR…

9786b23

…Y setting behavior

Update aks_node_pool_vm_size local variable to provide a default value

918b353

pauldotyu requested a review from Copilot August 18, 2025 21:42

Copilot AI reviewed Aug 18, 2025

View reviewed changes

pauldotyu merged commit 1b7ba07 into main Aug 18, 2025
9 checks passed

pauldotyu deleted the azd_fixes branch August 18, 2025 22:41

fix: infra fixes for terraform and bicep #233

fix: infra fixes for terraform and bicep #233

Uh oh!

Conversation

pauldotyu commented Aug 15, 2025

Purpose

Does this introduce a breaking change?

Pull Request Type

How to Test

What to Check

Other Information

Uh oh!

pauldotyu commented Aug 15, 2025

Uh oh!

github-actions bot commented Aug 15, 2025

Uh oh!

github-actions bot commented Aug 15, 2025

Uh oh!

pauldotyu commented Aug 15, 2025

Uh oh!

github-actions bot commented Aug 15, 2025

Uh oh!

github-actions bot commented Aug 15, 2025

Uh oh!

pauldotyu commented Aug 18, 2025

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

This comment was marked as outdated.

Uh oh!

pauldotyu commented Aug 18, 2025

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

pauldotyu commented Aug 18, 2025

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Aug 18, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants