From 9c581e1e4b253e9a2690535151394d779b52c5e8 Mon Sep 17 00:00:00 2001 From: Harmanpreet-Microsoft Date: Tue, 17 Mar 2026 15:20:59 +0530 Subject: [PATCH 1/6] Remove unused parameters and definitions from main.parameters.json and main.waf.parameters.json --- infra/main.parameters.json | 63 ---------------------------------- infra/main.waf.parameters.json | 63 ---------------------------------- 2 files changed, 126 deletions(-) diff --git a/infra/main.parameters.json b/infra/main.parameters.json index da8b3cc7..ebc7fcf5 100644 --- a/infra/main.parameters.json +++ b/infra/main.parameters.json @@ -46,69 +46,6 @@ }, "vmAdminPassword": { "value": "${AZURE_ENV_JUMPBOX_ADMIN_PASSWORD}" - }, - "backendExists": { - "value": "${SERVICE_BACKEND_RESOURCE_EXISTS=false}" - }, - "backendDefinition": { - "value": { - "settings": [ - { - "name": "", - "value": "${VAR}", - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR} to use the value of 'VAR' from the current environment." - }, - { - "name": "", - "value": "${VAR_S}", - "secret": true, - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR_S} to use the value of 'VAR_S' from the current environment." - } - ] - } - }, - "frontendExists": { - "value": "${SERVICE_FRONTEND_RESOURCE_EXISTS=false}" - }, - "frontendDefinition": { - "value": { - "settings": [ - { - "name": "", - "value": "${VAR}", - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR} to use the value of 'VAR' from the current environment." - }, - { - "name": "", - "value": "${VAR_S}", - "secret": true, - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR_S} to use the value of 'VAR_S' from the current environment." - } - ] - } - }, - "principalId": { - "value": "${AZURE_PRINCIPAL_ID}" - }, - "aiModelDeployments": { - "value": [ - { - "name": "gpt-4o", - "model": { - "name": "gpt-4o", - "version": "2024-08-06", - "format": "OpenAI" - }, - "sku": { - "name": "GlobalStandard", - "capacity": 50 - } - } - ] } } } diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json index 98a1ead9..f7da35e0 100644 --- a/infra/main.waf.parameters.json +++ b/infra/main.waf.parameters.json @@ -47,9 +47,6 @@ "vmAdminPassword": { "value": "${AZURE_ENV_JUMPBOX_ADMIN_PASSWORD}" }, - "backendExists": { - "value": "${SERVICE_BACKEND_RESOURCE_EXISTS=false}" - }, "enableMonitoring": { "value": true }, @@ -58,66 +55,6 @@ }, "enableScaling": { "value": true - }, - "backendDefinition": { - "value": { - "settings": [ - { - "name": "", - "value": "${VAR}", - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR} to use the value of 'VAR' from the current environment." - }, - { - "name": "", - "value": "${VAR_S}", - "secret": true, - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR_S} to use the value of 'VAR_S' from the current environment." - } - ] - } - }, - "frontendExists": { - "value": "${SERVICE_FRONTEND_RESOURCE_EXISTS=false}" - }, - "frontendDefinition": { - "value": { - "settings": [ - { - "name": "", - "value": "${VAR}", - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR} to use the value of 'VAR' from the current environment." - }, - { - "name": "", - "value": "${VAR_S}", - "secret": true, - "_comment_name": "The name of the environment variable when running in Azure. If empty, ignored.", - "_comment_value": "The value to provide. This can be a fixed literal, or an expression like ${VAR_S} to use the value of 'VAR_S' from the current environment." - } - ] - } - }, - "principalId": { - "value": "${AZURE_PRINCIPAL_ID}" - }, - "aiModelDeployments": { - "value": [ - { - "name": "gpt-4o", - "model": { - "name": "gpt-4o", - "version": "2024-08-06", - "format": "OpenAI" - }, - "sku": { - "name": "GlobalStandard", - "capacity": 50 - } - } - ] } } } From 6845243dc7e9e0324f786105c55969e7a7bc58b5 Mon Sep 17 00:00:00 2001 From: Harmanpreet-Microsoft Date: Tue, 17 Mar 2026 17:33:14 +0530 Subject: [PATCH 2/6] Add aiModelDeployments parameter to main.parameters.json and main.waf.parameters.json --- infra/main.parameters.json | 10 ++++++++++ infra/main.waf.parameters.json | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/infra/main.parameters.json b/infra/main.parameters.json index ebc7fcf5..dc3c0617 100644 --- a/infra/main.parameters.json +++ b/infra/main.parameters.json @@ -20,6 +20,16 @@ "gptModelVersion": { "value": "${AZURE_ENV_MODEL_VERSION}" }, + "aiModelDeployments": { + "value": [ + { + "deploymentType": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", + "modelName": "${AZURE_ENV_MODEL_NAME}", + "modelCapacity": "${AZURE_ENV_MODEL_CAPACITY}", + "modelVersion": "${AZURE_ENV_MODEL_VERSION}" + } + ] + }, "imageVersion": { "value": "${AZURE_ENV_IMAGETAG=latest}" }, diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json index f7da35e0..5ca123b1 100644 --- a/infra/main.waf.parameters.json +++ b/infra/main.waf.parameters.json @@ -20,6 +20,16 @@ "gptModelVersion": { "value": "${AZURE_ENV_MODEL_VERSION}" }, + "aiModelDeployments": { + "value": [ + { + "deploymentType": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", + "modelName": "${AZURE_ENV_MODEL_NAME}", + "modelCapacity": "${AZURE_ENV_MODEL_CAPACITY}", + "modelVersion": "${AZURE_ENV_MODEL_VERSION}" + } + ] + }, "imageVersion": { "value": "${AZURE_ENV_IMAGETAG=latest}" }, From 153f16d02fb2f94b8bea20d68842a6e4d11e8368 Mon Sep 17 00:00:00 2001 From: Harmanpreet-Microsoft Date: Tue, 17 Mar 2026 17:50:28 +0530 Subject: [PATCH 3/6] Refactor aiModelDeployments structure in main.parameters.json and main.waf.parameters.json for improved clarity and organization --- infra/main.parameters.json | 14 ++++++++++---- infra/main.waf.parameters.json | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/infra/main.parameters.json b/infra/main.parameters.json index dc3c0617..92aaae24 100644 --- a/infra/main.parameters.json +++ b/infra/main.parameters.json @@ -23,10 +23,16 @@ "aiModelDeployments": { "value": [ { - "deploymentType": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", - "modelName": "${AZURE_ENV_MODEL_NAME}", - "modelCapacity": "${AZURE_ENV_MODEL_CAPACITY}", - "modelVersion": "${AZURE_ENV_MODEL_VERSION}" + "name": "${AZURE_ENV_MODEL_NAME}", + "model": { + "name": "${AZURE_ENV_MODEL_NAME}", + "version": "${AZURE_ENV_MODEL_VERSION}", + "format": "OpenAI" + }, + "sku": { + "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", + "capacity": "${AZURE_ENV_MODEL_CAPACITY}" + } } ] }, diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json index 5ca123b1..5b87d35a 100644 --- a/infra/main.waf.parameters.json +++ b/infra/main.waf.parameters.json @@ -23,10 +23,16 @@ "aiModelDeployments": { "value": [ { - "deploymentType": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", - "modelName": "${AZURE_ENV_MODEL_NAME}", - "modelCapacity": "${AZURE_ENV_MODEL_CAPACITY}", - "modelVersion": "${AZURE_ENV_MODEL_VERSION}" + "name": "${AZURE_ENV_MODEL_NAME}", + "model": { + "name": "${AZURE_ENV_MODEL_NAME}", + "version": "${AZURE_ENV_MODEL_VERSION}", + "format": "OpenAI" + }, + "sku": { + "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", + "capacity": "${AZURE_ENV_MODEL_CAPACITY}" + } } ] }, From 0bbf21370dde7075dd14cfa2a9d37a22c75c8216 Mon Sep 17 00:00:00 2001 From: Harmanpreet-Microsoft Date: Tue, 17 Mar 2026 18:03:07 +0530 Subject: [PATCH 4/6] Update default values for model deployment parameters in main.parameters.json and main.waf.parameters.json --- infra/main.parameters.json | 18 +++++++++--------- infra/main.waf.parameters.json | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/infra/main.parameters.json b/infra/main.parameters.json index 92aaae24..7f0eaf22 100644 --- a/infra/main.parameters.json +++ b/infra/main.parameters.json @@ -9,29 +9,29 @@ "value": "${AZURE_LOCATION}" }, "gptModelDeploymentType": { - "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}" + "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE=GlobalStandard}" }, "gptModelName": { - "value": "${AZURE_ENV_MODEL_NAME}" + "value": "${AZURE_ENV_MODEL_NAME=gpt-4o}" }, "gptModelCapacity": { - "value": "${AZURE_ENV_MODEL_CAPACITY}" + "value": "${AZURE_ENV_MODEL_CAPACITY=150}" }, "gptModelVersion": { - "value": "${AZURE_ENV_MODEL_VERSION}" + "value": "${AZURE_ENV_MODEL_VERSION=2024-08-06}" }, "aiModelDeployments": { "value": [ { - "name": "${AZURE_ENV_MODEL_NAME}", + "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", "model": { - "name": "${AZURE_ENV_MODEL_NAME}", - "version": "${AZURE_ENV_MODEL_VERSION}", + "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", + "version": "${AZURE_ENV_MODEL_VERSION=2024-08-06}", "format": "OpenAI" }, "sku": { - "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", - "capacity": "${AZURE_ENV_MODEL_CAPACITY}" + "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE=GlobalStandard}", + "capacity": "${AZURE_ENV_MODEL_CAPACITY=150}" } } ] diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json index 5b87d35a..36ab4462 100644 --- a/infra/main.waf.parameters.json +++ b/infra/main.waf.parameters.json @@ -9,29 +9,29 @@ "value": "${AZURE_LOCATION}" }, "gptModelDeploymentType": { - "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}" + "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE=GlobalStandard}" }, "gptModelName": { - "value": "${AZURE_ENV_MODEL_NAME}" + "value": "${AZURE_ENV_MODEL_NAME=gpt-4o}" }, "gptModelCapacity": { - "value": "${AZURE_ENV_MODEL_CAPACITY}" + "value": "${AZURE_ENV_MODEL_CAPACITY=150}" }, "gptModelVersion": { - "value": "${AZURE_ENV_MODEL_VERSION}" + "value": "${AZURE_ENV_MODEL_VERSION=2024-08-06}" }, "aiModelDeployments": { "value": [ { - "name": "${AZURE_ENV_MODEL_NAME}", + "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", "model": { - "name": "${AZURE_ENV_MODEL_NAME}", - "version": "${AZURE_ENV_MODEL_VERSION}", + "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", + "version": "${AZURE_ENV_MODEL_VERSION=2024-08-06}", "format": "OpenAI" }, "sku": { - "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}", - "capacity": "${AZURE_ENV_MODEL_CAPACITY}" + "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE=GlobalStandard}", + "capacity": "${AZURE_ENV_MODEL_CAPACITY=150}" } } ] From acb562c4a71b11b3cc4e0e3b9284c9d61b51c4a7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 17 Mar 2026 12:58:00 +0000 Subject: [PATCH 5/6] Initial plan From 79b74ea954d605cc75298cb779a65e05458ab051 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 17 Mar 2026 13:00:55 +0000 Subject: [PATCH 6/6] Fix aiModelDeployments to use concrete defaults instead of env-var placeholders Co-authored-by: Harmanpreet-Microsoft <175086414+Harmanpreet-Microsoft@users.noreply.github.com> --- infra/main.parameters.json | 10 +++++----- infra/main.waf.parameters.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/infra/main.parameters.json b/infra/main.parameters.json index 7f0eaf22..9af84f3c 100644 --- a/infra/main.parameters.json +++ b/infra/main.parameters.json @@ -23,15 +23,15 @@ "aiModelDeployments": { "value": [ { - "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", + "name": "gpt-4o", "model": { - "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", - "version": "${AZURE_ENV_MODEL_VERSION=2024-08-06}", + "name": "gpt-4o", + "version": "2024-08-06", "format": "OpenAI" }, "sku": { - "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE=GlobalStandard}", - "capacity": "${AZURE_ENV_MODEL_CAPACITY=150}" + "name": "GlobalStandard", + "capacity": 150 } } ] diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json index 36ab4462..563f4961 100644 --- a/infra/main.waf.parameters.json +++ b/infra/main.waf.parameters.json @@ -23,15 +23,15 @@ "aiModelDeployments": { "value": [ { - "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", + "name": "gpt-4o", "model": { - "name": "${AZURE_ENV_MODEL_NAME=gpt-4o}", - "version": "${AZURE_ENV_MODEL_VERSION=2024-08-06}", + "name": "gpt-4o", + "version": "2024-08-06", "format": "OpenAI" }, "sku": { - "name": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE=GlobalStandard}", - "capacity": "${AZURE_ENV_MODEL_CAPACITY=150}" + "name": "GlobalStandard", + "capacity": 150 } } ]