refactor: Merging the AVM Waf Standard changes to dev branch

.github/workflows/deploy-waf.yml

@@ -109,13 +109,15 @@ jobs:
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
             --parameters \
-              environmentName=${{ env.SOLUTION_PREFIX }} \
-              useWafAlignedArchitecture=true \
-              aiDeploymentsLocation='${{ env.AZURE_LOCATION }}' \
+              solutionName=${{ env.SOLUTION_PREFIX }} \
+              location="${{ env.AZURE_LOCATION }}" \
+              azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
               gptModelCapacity=5 \
-              virtualMachineConfiguration='{"adminUsername": "adminuser", "adminPassword": "P@ssw0rd1234"}' \
-              logAnalyticsWorkspaceConfiguration='{"existingWorkspaceResourceId": ""}'
-
+              enableTelemetry=true \
+              enableMonitoring=true \
+              enablePrivateNetworking=true \
+              enableScalability=true \
+
 
       - name: Send Notification on Failure
         if: failure()

.github/workflows/deploy.yml

@@ -129,19 +129,14 @@ jobs:
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
             --parameters \
-              environmentName=${{ env.SOLUTION_PREFIX }} \
-              solutionLocation="${{ env.AZURE_LOCATION }}" \
-              modelDeploymentType="GlobalStandard" \
+              solutionName=${{ env.SOLUTION_PREFIX }} \
+              location="${{ env.AZURE_LOCATION }}" \
+              gptModelDeploymentType="GlobalStandard" \
               gptModelName="gpt-4o" \
               gptModelVersion="2024-08-06" \
               imageTag="${IMAGE_TAG}" \
-              useWafAlignedArchitecture=false \
-              aiDeploymentsLocation='${{ env.AZURE_LOCATION }}' \
+              azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
               gptModelCapacity=150 \
-              logAnalyticsWorkspaceConfiguration='{"dataRetentionInDays": 30, "existingWorkspaceResourceId": ""}' \
-              applicationInsightsConfiguration='{"retentionInDays": 30}' \
-              virtualNetworkConfiguration='{"enabled": false}' \
-              webServerFarmConfiguration='{"skuCapacity": 1, "skuName": "B2"}' \
             --output json
 
       - name: Extract Web App and API App URLs

.gitignore

@@ -458,3 +458,7 @@ __pycache__/
 *.whl
 .azure
 .github/copilot-instructions.md
+
+# Bicep local files
+*.local*.bicepparam
+*.local*.parameters.json

infra/main.parameters.json

@@ -1,102 +1,42 @@
 {
-    "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
-    "contentVersion": "1.0.0.0",
-    "parameters": {
-      "aiModelDeployments": {
-        "value": [
-          {
-            "name": "gpt",
-            "model": {
-              "name": "gpt-4o",
-              "version": "2024-08-06",
-              "format": "OpenAI"
-            },
-            "sku": {
-              "name": "GlobalStandard",
-              "capacity": 140
-            }
-          }
-        ]
-      },     
-      "environmentName": {
-        "value": "${AZURE_ENV_NAME}"
-      },
-      "solutionLocation": {
-        "value": "${AZURE_LOCATION}"
-      },
-      "aiDeploymentsLocation": {
-        "value": "${AZURE_ENV_OPENAI_LOCATION}"
-      },
-      "modelDeploymentType": {
-        "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
-      },
-      "gptModelName": {
-        "value": "${AZURE_ENV_MODEL_NAME}"
-      },
-      "gptModelVersion": {
-        "value": "${AZURE_ENV_MODEL_VERSION}"
-      },
-      "gptModelCapacity": {
-        "value": "${AZURE_ENV_MODEL_CAPACITY}"
-      },
-      "existingFoundryProjectResourceId": {
-      "value": "${AZURE_ENV_FOUNDRY_PROJECT_ID}"
-      },
-      "imageTag": {
-        "value": "${AZURE_ENV_IMAGE_TAG}"
-      },
-      "enableTelemetry": {
-        "value": "${AZURE_ENV_ENABLE_TELEMETRY}"
-      },
-      "existingLogAnalyticsWorkspaceId": {
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "solutionName": {
+      "value": "${AZURE_ENV_NAME}"
+    },
+    "location": {
+      "value": "${AZURE_LOCATION}"
+    },
+    "azureAiServiceLocation": {
+      "value": "${AZURE_ENV_OPENAI_LOCATION}"
+    },
+    "gptModelDeploymentType": {
+      "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
+    },
+    "gptModelName": {
+      "value": "${AZURE_ENV_MODEL_NAME}"
+    },
+    "gptModelVersion": {
+      "value": "${AZURE_ENV_MODEL_VERSION}"
+    },
+    "gptModelCapacity": {
+      "value": "${AZURE_ENV_MODEL_CAPACITY}"
+    },
+    "backendContainerImageTag": {
+      "value": "${AZURE_ENV_IMAGE_TAG}"
+    },
+    "frontendContainerImageTag": {
+      "value": "${AZURE_ENV_IMAGE_TAG}"
+    },
+    "enableTelemetry": {
+      "value": "${AZURE_ENV_ENABLE_TELEMETRY}"
+    },
+    "existingLogAnalyticsWorkspaceId": {
         "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
-      },
-      "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}"
-      }
+    },
+    "existingAiFoundryAiProjectResourceId": {
+      "value": "${AZURE_ENV_FOUNDRY_PROJECT_ID}"
     }
+  }
 }

infra/main.waf.parameters.json

@@ -0,0 +1,57 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "solutionName": {
+      "value": "${AZURE_ENV_NAME}"
+    },
+    "location": {
+      "value": "${AZURE_LOCATION}"
+    },
+    "azureAiServiceLocation": {
+      "value": "${AZURE_ENV_OPENAI_LOCATION}"
+    },
+    "gptModelDeploymentType": {
+      "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
+    },
+    "gptModelName": {
+      "value": "${AZURE_ENV_MODEL_NAME}"
+    },
+    "gptModelVersion": {
+      "value": "${AZURE_ENV_MODEL_VERSION}"
+    },
+    "gptModelCapacity": {
+      "value": "${AZURE_ENV_MODEL_CAPACITY}"
+    },
+    "backendContainerImageTag": {
+      "value": "${AZURE_ENV_IMAGE_TAG}"
+    },
+    "frontendContainerImageTag": {
+      "value": "${AZURE_ENV_IMAGE_TAG}"
+    },
+    "enableTelemetry": {
+      "value": "${AZURE_ENV_ENABLE_TELEMETRY}"
+    },
+    "enableMonitoring": {
+      "value": true
+    },
+    "enablePrivateNetworking": {
+      "value": true
+    },
+    "enableScalability": {
+      "value": true
+    },
+    "virtualMachineAdminUsername": {
+      "value": "${AZURE_ENV_VM_ADMIN_USERNAME}"
+    },
+    "virtualMachineAdminPassword": {
+      "value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
+    },
+    "existingLogAnalyticsWorkspaceId": {
+        "value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
+    },
+    "existingAiFoundryAiProjectResourceId": {
+      "value": "${AZURE_ENV_FOUNDRY_PROJECT_ID}"
+    }
+  }
+}

infra/modules/ai-project.bicep

@@ -0,0 +1,42 @@
+@description('Required. Name of the AI Services project.')
+param name string
+
+@description('Required. The location of the Project resource.')
+param location string = resourceGroup().location
+
+@description('Optional. The description of the AI Foundry project to create. Defaults to the project name.')
+param desc string = name
+
+@description('Required. Name of the existing Cognitive Services resource to create the AI Foundry project in.')
+param aiServicesName string
+
+@description('Optional. Tags to be applied to the resources.')
+param tags object = {}
+
+// Reference to cognitive service in current resource group for new projects
+resource cogServiceReference 'Microsoft.CognitiveServices/accounts@2025-06-01' existing = {
+  name: aiServicesName
+}
+
+resource aiProject 'Microsoft.CognitiveServices/accounts/projects@2025-06-01' = {
+  parent: cogServiceReference
+  name: name
+  tags: tags
+  location: location
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    description: desc
+    displayName: name
+  }
+}
+
+@description('Required. Name of the AI project.')
+output name string = aiProject.name
+
+@description('Required. Resource ID of the AI project.')
+output resourceId string = aiProject.id
+
+@description('Required. API endpoint for the AI project.')
+output apiEndpoint string = aiProject!.properties.endpoints['AI Foundry API']