From df6013c56d1b1dc8d06f537e2e148f58cf081269 Mon Sep 17 00:00:00 2001 From: "Teja Sri Munnangi (Persistent Systems Inc)" Date: Thu, 26 Mar 2026 10:55:06 +0530 Subject: [PATCH 1/6] commit --- .github/workflows/azd-template-validation.yml | 36 ++++++++++++ .github/workflows/azure-dev.yml | 55 +++++++++++++------ 2 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/azd-template-validation.yml diff --git a/.github/workflows/azd-template-validation.yml b/.github/workflows/azd-template-validation.yml new file mode 100644 index 0000000..4c6460c --- /dev/null +++ b/.github/workflows/azd-template-validation.yml @@ -0,0 +1,36 @@ +name: AZD Template Validation +on: + schedule: + - cron: '30 1 * * 4' # Every Thursday at 7:00 AM IST (1:30 AM UTC) + workflow_dispatch: + +permissions: + contents: read + id-token: write + pull-requests: write + +jobs: + template_validation: + runs-on: ubuntu-latest + name: azd template validation + environment: azd-template-gallery + steps: + - uses: actions/checkout@v4 + + - uses: microsoft/template-validation-action@v0.4.3 + with: + validateAzd: ${{ vars.TEMPLATE_VALIDATE_AZD }} + validateTests: ${{ vars.TEMPLATE_VALIDATE_TESTS }} + useDevContainer: ${{ vars.TEMPLATE_USE_DEV_CONTAINER }} + id: validation + env: + AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} + AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} + AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} + AZURE_AI_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues + GITHUB_TOKEN: ${{ secrets.AZD_GITHUB_TOKEN }} + + - name: print result + run: cat ${{ steps.validation.outputs.resultFile }} diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index b7805e0..f8ae47b 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -1,33 +1,52 @@ -name: AZD Template Validation +name: Azure Dev Deploy + on: workflow_dispatch: + push: + branches: + - main permissions: contents: read id-token: write - pull-requests: write jobs: - template_validation: + deploy: runs-on: ubuntu-latest - name: azd template validation - environment: azd-template-gallery + environment: production + env: + AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} + AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} + AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} + AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }} steps: - - uses: actions/checkout@v4 + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Install azd + uses: Azure/setup-azd@v2 - - uses: microsoft/template-validation-action@v0.4.3 + - name: Login to Azure + uses: azure/login@v2 with: - validateAzd: ${{ vars.AZD_VALIDATE }} - useDevContainer: ${{ vars.AZD_USE_DEV_CONTAINER }} - id: validation + client-id: ${{ vars.AZURE_CLIENT_ID }} + tenant-id: ${{ vars.AZURE_TENANT_ID }} + subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }} + + - name: Login to AZD + shell: bash + run: | + azd auth login \ + --client-id "$AZURE_CLIENT_ID" \ + --federated-credential-provider "github" \ + --tenant-id "$AZURE_TENANT_ID" + + - name: Provision and Deploy + shell: bash + run: azd up --no-prompt env: - AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} - AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} - AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} - AZURE_AI_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues - GITHUB_TOKEN: ${{ secrets.AZD_GITHUB_TOKEN }} - - - name: print result - run: cat ${{ steps.validation.outputs.resultFile }} \ No newline at end of file + AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} \ No newline at end of file From 183b8be34751c94b5ec24f6313b8d2e8c8e5cbe8 Mon Sep 17 00:00:00 2001 From: "Teja Sri Munnangi (Persistent Systems Inc)" Date: Thu, 26 Mar 2026 12:05:33 +0530 Subject: [PATCH 2/6] commit --- .github/workflows/azure-dev.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index f8ae47b..5ca3d86 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -45,8 +45,7 @@ jobs: - name: Provision and Deploy shell: bash - run: azd up --no-prompt - env: - AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} - AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} - AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} \ No newline at end of file + run: | + azd env new "$AZURE_ENV_NAME" --subscription "$AZURE_SUBSCRIPTION_ID" --location "$AZURE_LOCATION" --no-prompt || azd env select "$AZURE_ENV_NAME" + azd config set defaults.subscription "$AZURE_SUBSCRIPTION_ID" + azd up --no-prompt \ No newline at end of file From 754d919370ce652d41387b8d6cf764258b1f20c2 Mon Sep 17 00:00:00 2001 From: "Teja Sri Munnangi (Persistent Systems Inc)" Date: Thu, 26 Mar 2026 12:38:33 +0530 Subject: [PATCH 3/6] commit pr conflicts --- .github/workflows/azure-dev.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index 5ca3d86..dab4789 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -2,9 +2,6 @@ name: Azure Dev Deploy on: workflow_dispatch: - push: - branches: - - main permissions: contents: read @@ -46,6 +43,8 @@ jobs: - name: Provision and Deploy shell: bash run: | - azd env new "$AZURE_ENV_NAME" --subscription "$AZURE_SUBSCRIPTION_ID" --location "$AZURE_LOCATION" --no-prompt || azd env select "$AZURE_ENV_NAME" + if ! azd env select "$AZURE_ENV_NAME"; then + azd env new "$AZURE_ENV_NAME" --subscription "$AZURE_SUBSCRIPTION_ID" --location "$AZURE_LOCATION" --no-prompt + fi azd config set defaults.subscription "$AZURE_SUBSCRIPTION_ID" azd up --no-prompt \ No newline at end of file From da37a5430c7213e0d011a9bcbf4ab166aec26380 Mon Sep 17 00:00:00 2001 From: "Teja Sri Munnangi (Persistent Systems Inc)" Date: Thu, 26 Mar 2026 18:44:19 +0530 Subject: [PATCH 4/6] commit changes --- .github/workflows/azd-template-validation.yml | 11 ++++++----- .github/workflows/azure-dev.yml | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/azd-template-validation.yml b/.github/workflows/azd-template-validation.yml index 4c6460c..c3cd8c1 100644 --- a/.github/workflows/azd-template-validation.yml +++ b/.github/workflows/azd-template-validation.yml @@ -13,7 +13,7 @@ jobs: template_validation: runs-on: ubuntu-latest name: azd template validation - environment: azd-template-gallery + environment: production steps: - uses: actions/checkout@v4 @@ -24,13 +24,14 @@ jobs: useDevContainer: ${{ vars.TEMPLATE_USE_DEV_CONTAINER }} id: validation env: - AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} - AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} - AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} + AZURE_AI_SERVICE_LOCATION: ${{ vars.AZURE_AI_SERVICE_LOCATION }} AZURE_AI_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues GITHUB_TOKEN: ${{ secrets.AZD_GITHUB_TOKEN }} - name: print result - run: cat ${{ steps.validation.outputs.resultFile }} + run: cat ${{ steps.validation.outputs.resultFile }} \ No newline at end of file diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index dab4789..9fdbe0a 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -12,9 +12,9 @@ jobs: runs-on: ubuntu-latest environment: production env: - AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }} - AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }} - AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} + AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} + AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }} From 72c172cb8c30f7d97c7e186eab31d364d980dda6 Mon Sep 17 00:00:00 2001 From: "Teja Sri Munnangi (Persistent Systems Inc)" Date: Thu, 26 Mar 2026 18:48:19 +0530 Subject: [PATCH 5/6] commit ac --- .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 9fdbe0a..b6f08ad 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -28,9 +28,9 @@ jobs: - name: Login to Azure uses: azure/login@v2 with: - client-id: ${{ vars.AZURE_CLIENT_ID }} - tenant-id: ${{ vars.AZURE_TENANT_ID }} - subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }} + client-id: ${{ secrets.AZURE_CLIENT_ID }} + tenant-id: ${{ secrets.AZURE_TENANT_ID }} + subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - name: Login to AZD shell: bash From b9b7ce18443ee1623c9f61810bea666dcfdd551d Mon Sep 17 00:00:00 2001 From: "Teja Sri Munnangi (Persistent Systems Inc)" Date: Thu, 26 Mar 2026 19:04:19 +0530 Subject: [PATCH 6/6] commit --- .github/workflows/azd-template-validation.yml | 2 +- .github/workflows/azure-dev.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/azd-template-validation.yml b/.github/workflows/azd-template-validation.yml index c3cd8c1..5f3ef94 100644 --- a/.github/workflows/azd-template-validation.yml +++ b/.github/workflows/azd-template-validation.yml @@ -29,7 +29,7 @@ jobs: AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }} AZURE_LOCATION: ${{ vars.AZURE_LOCATION }} - AZURE_AI_SERVICE_LOCATION: ${{ vars.AZURE_AI_SERVICE_LOCATION }} + AZURE_AI_SERVICE_LOCATION: ${{ vars.AZURE_LOCATION }} AZURE_AI_MODEL_CAPACITY: 1 # keep low to avoid potential quota issues GITHUB_TOKEN: ${{ secrets.AZD_GITHUB_TOKEN }} diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml index b6f08ad..cd365d8 100644 --- a/.github/workflows/azure-dev.yml +++ b/.github/workflows/azure-dev.yml @@ -47,4 +47,5 @@ jobs: azd env new "$AZURE_ENV_NAME" --subscription "$AZURE_SUBSCRIPTION_ID" --location "$AZURE_LOCATION" --no-prompt fi azd config set defaults.subscription "$AZURE_SUBSCRIPTION_ID" + azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_LOCATION" azd up --no-prompt \ No newline at end of file