Skip to content

ci: fix ACA state ownership in azd deploy #65

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
Cataldir merged 1 commit into from
Mar 12, 2026
Merged

ci: fix ACA state ownership in azd deploy #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 17 additions & 22 deletions .github/workflows/azd-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,23 @@ jobs:
fi
azd env set RS_KEY "$TFSTATE_KEY"

- name: Resolve ACA environment ownership mode
run: |
set -euo pipefail

RG_NAME="tutor-${AZURE_ENV_NAME}"
ACA_NAME="tutor-${AZURE_ENV_NAME}-acae"

if az containerapp env show --resource-group "$RG_NAME" --name "$ACA_NAME" >/dev/null 2>&1; then
echo "Detected existing ACA environment ${ACA_NAME}; Terraform will reference it."
echo "TF_VAR_existing_container_app_environment_name=${ACA_NAME}" >> "$GITHUB_ENV"
azd env set TF_VAR_existing_container_app_environment_name "$ACA_NAME"
else
echo "No existing ACA environment detected; Terraform will create managed environment ${ACA_NAME}."
echo "TF_VAR_existing_container_app_environment_name=" >> "$GITHUB_ENV"
azd env set TF_VAR_existing_container_app_environment_name ""
fi

- name: Ensure Terraform state account is reachable from GitHub runners
env:
TFSTATE_RESOURCE_GROUP: ${{ secrets.TERRAFORM_STATE_RESOURCE_GROUP }}
Expand Down Expand Up @@ -502,11 +519,6 @@ jobs:

terraform import azurerm_api_management.main "/subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${RG_NAME}/providers/Microsoft.ApiManagement/service/${APIM_NAME}" || true

if [ "$AZURE_ENV_NAME" != "prod" ]; then
aca_env_id="/subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${RG_NAME}/providers/Microsoft.App/managedEnvironments/tutor-${AZURE_ENV_NAME}-acae"
terraform import 'azurerm_container_app_environment.main[0]' "$aca_env_id" || true
fi

cosmos_account_id="$(az cosmosdb list -g "$RG_NAME" --query '[0].id' -o tsv 2>/dev/null || true)"
if [ -n "$cosmos_account_id" ]; then
terraform import 'azurerm_cosmosdb_sql_container.containers["upskilling_plans"]' "${cosmos_account_id}/sqlDatabases/tutor/containers/upskilling_plans" || true
Expand Down Expand Up @@ -547,23 +559,6 @@ jobs:
terraform state rm "$entry" || true
done <<< "$apim_edge_state_entries"

- name: Detach managed ACA environment from foundation state
env:
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
ARM_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
ARM_USE_OIDC: true
run: |
set -euo pipefail

cd infra/terraform
if ! terraform init -reconfigure -backend-config=backend.hcl; then
echo "WARNING: Terraform init failed while detaching ACA environment from foundation state."
exit 0
fi

terraform state rm azurerm_container_app_environment.main || true

- name: Provision infrastructure
env:
ARM_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down
Loading