updating basic setup

Author: fosteramanda

use-cases/agents/setup/basic-setup/README.md

@@ -1,36 +1,18 @@
 # Azure AI Agent Service: Basic Setup 1RP
 
 ## Basic Agent Setup
-
-> **NOTE:** This template required the following workarounds to be performed after it is deployed:
-> 
-> 1. Assign the project system managed identity (SMI) the following role ‘Azure AI Developer’ on its parent AI Services resource 
->    
+   
 
 This bicep template provisions required resources for a basic project setup. A new Cognitive Services Account is created, a gpt-4o model is deployed, and a new project is created.
 
 All agents created in this project will automatically use Microsoft managed, multitenant search and storage resources.
 
 ### Prerequisites
-1. Use only allowlisted subscriptions for 1RP. Two known allowlisted subscriptions are:
-    * Azure OpenAI - Agents - Experiments - Microsoft Azure
-    * AzureAI-Agents-ERA-Corp - Microsoft Azure
-    
-1. Westus2 is the only region currently enabled for end-to-end testing. Ensure both Cognitive Services Account and Project are created in this region.
-   
 1. To deploy the template, you must have the following roles:
     * Cognitive Services Contributor or Contributor
     * [This is needed for the workarounds] Owner or Role Based Access Administrator (because we are assigning project SMI the AI Developer Role, won’t be needed once we fix this)
-<<<<<<< HEAD:use-cases/agents/setup/basic-setup/README.md
         * Permission for: Microsoft.Authorization/roleAssignments/write 
 1. To create your first agent you must have the permissions: Azure AI Developer and Cognitive Services User
-=======
-        * Permission for: Microsoft.Authorization/roleAssignments/write
-1. To create an agent you must have the following roles:
-   * Azure AI Developer
-   * Cognitive Services User
-
->>>>>>> 76d5e96d980cfe782e45278f992cf3a848b51300:scenarios/agents/setup/basic-setup/README.md
 
 ### Steps
 
@@ -40,7 +22,7 @@ All agents created in this project will automatically use Microsoft managed, mul
 * Create new (or use existing) resource group:
 
 ```bash
-    az group create --name <new-rg-name> --location westus2
+    az group create --name <new-rg-name> --location eastus
 ```
 
 * Deploy the template

use-cases/agents/setup/basic-setup/basic-setup.bicep

@@ -1,18 +1,19 @@
-param account_name string = 'aiServices${substring(uniqueString(utcNow()), 0,4)}'
-param project_name string = 'project'
+param accountName string = 'basicaccount${substring(uniqueString(utcNow()), 0,4)}'
+param projectName string = 'project'
 param projectDescription string = 'some description'
 param projectDisplayName string = 'project_display_name'
-param location string = 'westus2'
+param location string = resourceGroup().location
 
 param modelName string = 'gpt-4o'
 param modelFormat string = 'OpenAI'
 param modelVersion string = '2024-11-20'
 param modelSkuName string = 'GlobalStandard'
 param modelCapacity int = 30
 
+
 #disable-next-line BCP081
-resource account_name_resource 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' = {
-  name: account_name
+resource account 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' = {
+  name: accountName
   location: location
   sku: {
     name: 'S0'
@@ -23,14 +24,14 @@ resource account_name_resource 'Microsoft.CognitiveServices/accounts@2025-04-01-
   }
   properties: {
     allowProjectManagement: true
-    customSubDomainName: account_name
+    customSubDomainName: toLower(accountName)
     networkAcls: {
       defaultAction: 'Allow'
       virtualNetworkRules: []
       ipRules: []
     }
     publicNetworkAccess: 'Enabled'
-    disableLocalAuth: false
+    disableLocalAuth: true
   }
 }
 
@@ -40,31 +41,16 @@ resource account_name_resource 'Microsoft.CognitiveServices/accounts@2025-04-01-
   - Agents will use the build-in model deployments
 */ 
 
-#disable-next-line BCP081
-resource modelDeployment 'Microsoft.CognitiveServices/accounts/deployments@2024-10-01'= {
-  parent: account_name_resource
-  name: modelName
-  sku : {
-    capacity: modelCapacity
-    name: modelSkuName
-  }
-  properties: {
-    model:{
-      name: modelName
-      format: modelFormat
-      version: modelVersion
-    }
-  }
-}
+
 
 /*
   Step 3: Create a Cognitive Services Project
     
 */
 #disable-next-line BCP081
-resource account_name_project_name 'Microsoft.CognitiveServices/accounts/projects@2025-04-01-preview' = {
-  parent: account_name_resource
-  name: '${project_name}'
+resource project 'Microsoft.CognitiveServices/accounts/projects@2025-04-01-preview' = {
+  parent: account
+  name: projectName
   location: location
   identity: {
     type: 'SystemAssigned'
@@ -75,6 +61,22 @@ resource account_name_project_name 'Microsoft.CognitiveServices/accounts/project
   }
 }
 
-output ENDPOINT string = account_name_resource.properties.endpoint
-output project_name string = account_name_project_name.name
-output account_name string = account_name_resource.name
+#disable-next-line BCP081
+resource modelDeployment 'Microsoft.CognitiveServices/accounts/deployments@2024-10-01'= {
+  parent: account
+  name: modelName
+  sku : {
+    capacity: modelCapacity
+    name: modelSkuName
+  }
+  properties: {
+    model:{
+      name: modelName
+      format: modelFormat
+      version: modelVersion
+    }
+  }
+}
+
+output account_name string = account.name
+output project_name string = project.name

use-cases/agents/setup/basic-setup/basic-setup.json

@@ -5,15 +5,15 @@
     "_generator": {
       "name": "bicep",
       "version": "0.34.44.8038",
-      "templateHash": "7003199052869733265"
+      "templateHash": "1714052608002840600"
     }
   },
   "parameters": {
-    "account_name": {
+    "accountName": {
       "type": "string",
-      "defaultValue": "[format('aiServices{0}', substring(uniqueString(utcNow()), 0, 4))]"
+      "defaultValue": "[format('basicaccount{0}', substring(uniqueString(utcNow()), 0, 4))]"
     },
-    "project_name": {
+    "projectName": {
       "type": "string",
       "defaultValue": "project"
     },
@@ -27,7 +27,7 @@
     },
     "location": {
       "type": "string",
-      "defaultValue": "westus2"
+      "defaultValue": "[resourceGroup().location]"
     },
     "modelName": {
       "type": "string",
@@ -54,7 +54,7 @@
     {
       "type": "Microsoft.CognitiveServices/accounts",
       "apiVersion": "2025-04-01-preview",
-      "name": "[parameters('account_name')]",
+      "name": "[parameters('accountName')]",
       "location": "[parameters('location')]",
       "sku": {
         "name": "S0"
@@ -65,20 +65,36 @@
       },
       "properties": {
         "allowProjectManagement": true,
-        "customSubDomainName": "[parameters('account_name')]",
+        "customSubDomainName": "[toLower(parameters('accountName'))]",
         "networkAcls": {
           "defaultAction": "Allow",
           "virtualNetworkRules": [],
           "ipRules": []
         },
         "publicNetworkAccess": "Enabled",
-        "disableLocalAuth": false
+        "disableLocalAuth": true
       }
     },
+    {
+      "type": "Microsoft.CognitiveServices/accounts/projects",
+      "apiVersion": "2025-04-01-preview",
+      "name": "[format('{0}/{1}', parameters('accountName'), parameters('projectName'))]",
+      "location": "[parameters('location')]",
+      "identity": {
+        "type": "SystemAssigned"
+      },
+      "properties": {
+        "description": "[parameters('projectDescription')]",
+        "displayName": "[parameters('projectDisplayName')]"
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.CognitiveServices/accounts', parameters('accountName'))]"
+      ]
+    },
     {
       "type": "Microsoft.CognitiveServices/accounts/deployments",
       "apiVersion": "2024-10-01",
-      "name": "[format('{0}/{1}', parameters('account_name'), parameters('modelName'))]",
+      "name": "[format('{0}/{1}', parameters('accountName'), parameters('modelName'))]",
       "sku": {
         "capacity": "[parameters('modelCapacity')]",
         "name": "[parameters('modelSkuName')]"
@@ -91,38 +107,18 @@
         }
       },
       "dependsOn": [
-        "[resourceId('Microsoft.CognitiveServices/accounts', parameters('account_name'))]"
-      ]
-    },
-    {
-      "type": "Microsoft.CognitiveServices/accounts/projects",
-      "apiVersion": "2025-04-01-preview",
-      "name": "[format('{0}/{1}', parameters('account_name'), format('{0}', parameters('project_name')))]",
-      "location": "[parameters('location')]",
-      "identity": {
-        "type": "SystemAssigned"
-      },
-      "properties": {
-        "description": "[parameters('projectDescription')]",
-        "displayName": "[parameters('projectDisplayName')]"
-      },
-      "dependsOn": [
-        "[resourceId('Microsoft.CognitiveServices/accounts', parameters('account_name'))]"
+        "[resourceId('Microsoft.CognitiveServices/accounts', parameters('accountName'))]"
       ]
     }
   ],
   "outputs": {
-    "ENDPOINT": {
+    "account_name": {
       "type": "string",
-      "value": "[reference(resourceId('Microsoft.CognitiveServices/accounts', parameters('account_name')), '2025-04-01-preview').endpoint]"
+      "value": "[parameters('accountName')]"
     },
     "project_name": {
       "type": "string",
-      "value": "[format('{0}', parameters('project_name'))]"
-    },
-    "account_name": {
-      "type": "string",
-      "value": "[parameters('account_name')]"
+      "value": "[parameters('projectName')]"
     }
   }
 }

use-cases/agents/setup/basic-setup/basic-setup.parameters.json

@@ -1,30 +1,30 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "location": {
-      "value": "westus2"
-    },
-    "account_name": {
-      "value": ""
-    },
-    "project_name": {
-      "value": ""
-    },
-    "modelName": {
-      "value": "gpt-4o"
-    },
-    "modelFormat": {
-      "value": "OpenAI"
-    },
-    "modelVersion": {
-      "value": "2024-11-20"
-    },
-    "modelSkuName": {
-      "value": "GlobalStandard"
-    },
-    "modelCapacity": {
-      "value": 30
-    }
-  }
+{
+  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "location": {
+      "value": "eastus"
+    },
+    "ai_services": {
+      "value": "aiServices"
+    },
+    "project_name": {
+      "value": "project"
+    },
+    "modelName": {
+      "value": "gpt-4o"
+    },
+    "modelFormat": {
+      "value": "OpenAI"
+    },
+    "modelVersion": {
+      "value": "2024-11-20"
+    },
+    "modelSkuName": {
+      "value": "GlobalStandard"
+    },
+    "modelCapacity": {
+      "value": 1
+    }
+  }
 }