Fixes for the command shared by Alvaro

Author: Abdul-Microsoft

.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

infra/main.bicep

@@ -43,7 +43,7 @@ param location string
   }
 })
 @description('Required. Location for all AI service resources. This should be one of the supported Azure AI Service locations.')
-param aiDeploymentsLocation string
+param azureAiServiceLocation string
 
 @minLength(1)
 @description('Optional. Name of the GPT model to deploy:')
@@ -53,8 +53,12 @@ param gptModelName string = 'gpt-4o'
 param gptModelVersion string = '2024-08-06'
 
 @minLength(1)
+@allowed([
+  'Standard'
+  'GlobalStandard'
+])
 @description('Optional. GPT model deployment type. Defaults to GlobalStandard.')
-param modelDeploymentType string = 'GlobalStandard'
+param gptModelDeploymentType string = 'GlobalStandard'
 
 @description('Optional. AI model deployment token capacity. Defaults to 150 for optimal performance.')
 param gptModelCapacity int = 150
@@ -927,7 +931,7 @@ var aiFoundryAiServicesModelDeployment = {
   name: gptModelName
   version: gptModelVersion
   sku: {
-    name: modelDeploymentType
+    name: gptModelDeploymentType
     capacity: gptModelCapacity
   }
   raiPolicyName: 'Microsoft.Default'
@@ -938,7 +942,7 @@ module aiFoundryAiServices 'modules/ai-services.bicep' = if (aiFoundryAIservices
   name: take('avm.res.cognitive-services.account.${aiFoundryAiServicesResourceName}', 64)
   params: {
     name: aiFoundryAiServicesResourceName
-    location: aiDeploymentsLocation
+    location: azureAiServiceLocation
     tags: tags
     projectName: aiFoundryAiServicesAiProjectResourceName
     projectDescription: 'AI Foundry Project'
@@ -1169,7 +1173,7 @@ module containerAppEnvironment 'br/public:avm/res/app/managed-environment:0.11.2
           destination: 'log-analytics'
           logAnalyticsConfiguration: {
             customerId: logAnalyticsWorkspace!.outputs.logAnalyticsWorkspaceId
-            sharedKey: logAnalyticsWorkspace!.outputs.primarySharedKey
+            sharedKey: logAnalyticsWorkspace.outputs.primarySharedKey
           }
         }
       : null

infra/main.parameters.json

@@ -8,10 +8,10 @@
     "location": {
       "value": "${AZURE_LOCATION}"
     },
-    "aiDeploymentsLocation": {
+    "azureAiServiceLocation": {
       "value": "${AZURE_ENV_OPENAI_LOCATION}"
     },
-    "modelDeploymentType": {
+    "gptModelDeploymentType": {
       "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
     },
     "gptModelName": {

infra/main.waf.parameters.json

@@ -11,10 +11,10 @@
     "location": {
       "value": "${AZURE_LOCATION}"
     },
-    "aiDeploymentsLocation": {
+    "azureAiServiceLocation": {
       "value": "${AZURE_ENV_OPENAI_LOCATION}"
     },
-    "modelDeploymentType": {
+    "gptModelDeploymentType": {
       "value": "${AZURE_ENV_MODEL_DEPLOYMENT_TYPE}"
     },
     "gptModelName": {