Update shell to sh for setSPObjectId.ps1 script in azure.yaml, chang main.bicep for subscription deployment, increase capacity for openai

Author: jehayesms

ai-services/gpt-video-analysis-in-a-box/azure.yaml

@@ -10,8 +10,8 @@ hooks:
       run: ./scripts/setSPObjectId.ps1
       interactive: true
       continueOnError: false
-    posix :
-      shell: pwsh
+    posix:
+      shell: sh
       run: ./scripts/setSPObjectId.ps1
       interactive: true
       continueOnError: false

ai-services/gpt-video-analysis-in-a-box/infra/main.bicep

@@ -1,7 +1,7 @@
 targetScope = 'subscription'
 
 @description('Create or select an Azure resource group.')
-param resourceGroupName string = ''
+param resourceGroupName string
 @description('Select the Azure region for the resources for GPT-4V. Make sure it is a region that supports GPT-4V.')
 param location string // as of 2024-01-23, GPT4V is only available in westus in the US, storage account must be in the same region as OpenAI resource
 @description('End the Azure region for the resources for AI Vision Image Analysis 4.0. Make sure it is a region that supports Image Analysis 4.0.')
@@ -46,9 +46,10 @@ var factoryName = '${vprefix}-adf-${vsuffix}'
 
 var openaiName = '${vprefix}-openai-${vsuffix}'
 
-resource resourceGroup 'Microsoft.Resources/resourceGroups@2023-07-01' existing = {
-  name: resourceGroupName
-  scope: subscription()
+// Organize resources in a resource group
+resource resourceGroup 'Microsoft.Resources/resourceGroups@2023-07-01' = {
+  name: !empty(resourceGroupName) ? resourceGroupName : '${vprefix}-rg-${vsuffix}'
+  location: location
 }
 
 // Deploy UAMI

ai-services/gpt-video-analysis-in-a-box/infra/main.parameters.json

@@ -3,7 +3,7 @@
   "contentVersion": "1.0.0.0",
   "parameters": {
     "resourceGroupName": {
-      "value": "${AZURE_RESOURCE_GROUP}"
+      "value": "${AZURE_RESOURCE_GROUP_NAME}"
     },
     "location": {
       "value": "${AZURE_LOCATION}"

ai-services/gpt-video-analysis-in-a-box/infra/modules/openai.bicep

@@ -48,7 +48,7 @@ resource gpt4deployment 'Microsoft.CognitiveServices/accounts/deployments@2023-0
     }
   }
   sku: {
-    capacity: 4
+    capacity: 6
     name: 'Standard'
   }
 }