From 0f268af222c013313a1b3ffb353d1b04c7c8c52f Mon Sep 17 00:00:00 2001 From: "Priyanka Singhal (Persistent Systems Inc)" Date: Mon, 24 Feb 2025 19:07:48 +0530 Subject: [PATCH 1/4] fix for malformed url --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 791e653bc..3d7f4c0c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: EOF ) - curl -X POST "${{ secrets.LOGIC_APP_URL }}" \ + curl -X POST "${{ secrets.AUTO_LOGIC_APP_URL }}" \ -H "Content-Type: application/json" \ -d "$EMAIL_BODY" || echo "Failed to send notification" @@ -143,6 +143,6 @@ jobs: ) # Send the notification - curl -X POST "${{ secrets.LOGIC_APP_URL }}" \ + curl -X POST "${{ secrets.AUTO_LOGIC_APP_URL }}" \ -H "Content-Type: application/json" \ -d "$EMAIL_BODY" || echo "Failed to send notification" From 6fe96c324dccadc992936fb0b8aa81ce7422e7cd Mon Sep 17 00:00:00 2001 From: Priyanka-Microsoft Date: Wed, 26 Feb 2025 13:58:32 +0530 Subject: [PATCH 2/4] fix: quota check script with dynamic region handling (#1682) --- .github/workflows/ci.yml | 3 ++- scripts/checkquota.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 791e653bc..83c34d55b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,8 +37,9 @@ jobs: export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }} export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }} export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}" - export GPT_MIN_CAPACITY="130" + export GPT_MIN_CAPACITY="30" export TEXT_EMBEDDING_MIN_CAPACITY="30" + export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}" chmod +x scripts/checkquota.sh if ! scripts/checkquota.sh; then diff --git a/scripts/checkquota.sh b/scripts/checkquota.sh index ddcb4dddf..e1139ce5e 100644 --- a/scripts/checkquota.sh +++ b/scripts/checkquota.sh @@ -1,7 +1,7 @@ #!/bin/bash # List of Azure regions to check for quota (update as needed) -REGIONS=("eastus" "westus" "northcentralus" "uksouth" "swedencentral") +IFS=' ' read -ra REGIONS <<< "$AZURE_REGIONS" SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}" GPT_MIN_CAPACITY="${GPT_MIN_CAPACITY}" @@ -18,7 +18,7 @@ if ! az login --service-principal -u "$AZURE_CLIENT_ID" -p "$AZURE_CLIENT_SECRET fi echo "🔄 Validating required environment variables..." -if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" || -z "$TEXT_EMBEDDING_MIN_CAPACITY" ]]; then +if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" || -z "$TEXT_EMBEDDING_MIN_CAPACITY" || -z "$REGIONS" ]]; then echo "❌ ERROR: Missing required environment variables." exit 1 fi From 122f0f70bfd2033810c764abf8b6ff60b7bc9bb4 Mon Sep 17 00:00:00 2001 From: "Priyanka Singhal (Persistent Systems Inc)" Date: Mon, 24 Feb 2025 19:07:48 +0530 Subject: [PATCH 3/4] fix for malformed url --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83c34d55b..ea1becd73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: EOF ) - curl -X POST "${{ secrets.LOGIC_APP_URL }}" \ + curl -X POST "${{ secrets.AUTO_LOGIC_APP_URL }}" \ -H "Content-Type: application/json" \ -d "$EMAIL_BODY" || echo "Failed to send notification" @@ -144,6 +144,6 @@ jobs: ) # Send the notification - curl -X POST "${{ secrets.LOGIC_APP_URL }}" \ + curl -X POST "${{ secrets.AUTO_LOGIC_APP_URL }}" \ -H "Content-Type: application/json" \ -d "$EMAIL_BODY" || echo "Failed to send notification" From 729f5749ad2e3c56cbd79a34671579c003f26571 Mon Sep 17 00:00:00 2001 From: "Priyanka Singhal (Persistent Systems Inc)" Date: Wed, 26 Feb 2025 17:40:57 +0530 Subject: [PATCH 4/4] comma separated values --- .github/workflows/ci.yml | 4 ++-- scripts/checkquota.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea1becd73..83c34d55b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: EOF ) - curl -X POST "${{ secrets.AUTO_LOGIC_APP_URL }}" \ + curl -X POST "${{ secrets.LOGIC_APP_URL }}" \ -H "Content-Type: application/json" \ -d "$EMAIL_BODY" || echo "Failed to send notification" @@ -144,6 +144,6 @@ jobs: ) # Send the notification - curl -X POST "${{ secrets.AUTO_LOGIC_APP_URL }}" \ + curl -X POST "${{ secrets.LOGIC_APP_URL }}" \ -H "Content-Type: application/json" \ -d "$EMAIL_BODY" || echo "Failed to send notification" diff --git a/scripts/checkquota.sh b/scripts/checkquota.sh index e1139ce5e..e36376565 100644 --- a/scripts/checkquota.sh +++ b/scripts/checkquota.sh @@ -1,7 +1,7 @@ #!/bin/bash # List of Azure regions to check for quota (update as needed) -IFS=' ' read -ra REGIONS <<< "$AZURE_REGIONS" +IFS=', ' read -ra REGIONS <<< "$AZURE_REGIONS" SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}" GPT_MIN_CAPACITY="${GPT_MIN_CAPACITY}"