From 25b6d989cc99307337c32e96b179dda08ce7640c Mon Sep 17 00:00:00 2001 From: Rafi-Microsoft Date: Tue, 19 May 2026 16:34:18 +0530 Subject: [PATCH 1/2] fix(workflow): generate unique AZURE_ENV_NAME per run to avoid soft-deleted KV conflict Every push to main reuses the static AZURE_ENV_NAME repo variable, which derives a deterministic resourceToken via uniqueString(subscription.id, environmentName, location). The Key Vault created with that token is soft-deleted on each run with purgeProtection=true, blocking redeployment for the full 90-day retention period with ConflictError. Append a UTC HHMMSS suffix to AZURE_ENV_NAME so each run produces a distinct resourceToken, unique resource names, and no soft-delete collision. This matches the proven pattern used by sibling accelerators (content-generation-solution-accelerator and others). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/azure-dev.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index 0e30910..6ca6ae8 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -32,6 +32,13 @@ jobs: with: submodules: recursive + - name: Generate unique env name per run + shell: bash + run: | + HHMMSS=$(date -u +'%H%M%S') + echo "AZURE_ENV_NAME=${AZURE_ENV_NAME}-${HHMMSS}" >> "$GITHUB_ENV" + echo "Using unique AZURE_ENV_NAME: ${AZURE_ENV_NAME}-${HHMMSS}" + - name: Install azd uses: Azure/setup-azd@v2 From 83f96773d43f5f6470e12c36e6d46a2efdace4a8 Mon Sep 17 00:00:00 2001 From: Rafi-Microsoft Date: Wed, 20 May 2026 15:27:02 +0530 Subject: [PATCH 2/2] fix(ci): use GITHUB_RUN_ID for globally unique env name suffix Addresses Copilot review on PR #159: HHMMSS suffix only provides 24-hour uniqueness, but Key Vault soft-delete with purge protection holds names for up to 90 days. GITHUB_RUN_ID is globally unique and short enough to keep env names within azd constraints. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/azure-dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index 6ca6ae8..5d8f638 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -35,9 +35,9 @@ jobs: - name: Generate unique env name per run shell: bash run: | - HHMMSS=$(date -u +'%H%M%S') - echo "AZURE_ENV_NAME=${AZURE_ENV_NAME}-${HHMMSS}" >> "$GITHUB_ENV" - echo "Using unique AZURE_ENV_NAME: ${AZURE_ENV_NAME}-${HHMMSS}" + SUFFIX="${GITHUB_RUN_ID}" + echo "AZURE_ENV_NAME=${AZURE_ENV_NAME}-${SUFFIX}" >> "$GITHUB_ENV" + echo "Using unique AZURE_ENV_NAME: ${AZURE_ENV_NAME}-${SUFFIX}" - name: Install azd uses: Azure/setup-azd@v2