diff --git a/scenarios/Agents/setup/basic-agent-identity/README.md b/scenarios/Agents/setup/basic-agent-identity/README.md index d7040f3a..ea7af8f9 100644 --- a/scenarios/Agents/setup/basic-agent-identity/README.md +++ b/scenarios/Agents/setup/basic-agent-identity/README.md @@ -22,9 +22,9 @@ languages: ![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/basic-agent-identity/BicepVersion.svg) -[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.azure-ai-agent-service%2Fbasic-agent-identity%2Fazuredeploy.json) +[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fbasic-agent-identity%2Fazuredeploy.json) -[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.azure-ai-agent-service%2Fbasic-agent-identity%2Fazuredeploy.json) +[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fazuredeploy.json) Resources for the hub, project, storage account, and AI Services will be created for you. The AI Services account will be connected to your project/hub and a gpt-4o-mini model will be deployed in the eastus region. A Microsoft-managed key vault will be used by default. diff --git a/scenarios/Agents/setup/basic-agent-keys/README.md b/scenarios/Agents/setup/basic-agent-keys/README.md index 2ad56dbb..dbb4f8fe 100644 --- a/scenarios/Agents/setup/basic-agent-keys/README.md +++ b/scenarios/Agents/setup/basic-agent-keys/README.md @@ -22,11 +22,11 @@ languages: ![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/basic-agent-keys/BicepVersion.svg) -[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.azure-ai-agent-service%2Fbasic-agent-keys%2Fazuredeploy.json) +[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fbasic-agent-keys%2Fazuredeploy.json) -[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.azure-ai-agent-service%2Fbasic-agent-keys%2Fazuredeploy.json) +[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fbasic-agent-keys%2Fazuredeploy.json) -Resources for the hub, project, storage account, and AI Services will be created for you. The AI Services account will be connected to your project/hub and a gpt-4o-mini model will be deployed in the eastus region. A Microsoft-managed key vault will be used by default. +Resources for the hub, project, storage account, and AI Services will be created for you. The AI Services account will be connected to your project/hub and a gpt-4o-mini model will be deployed in the eastus region. A Microsoft-managed key vault will be used by default. ## Resources | Provider and type | Description | diff --git a/scenarios/Agents/setup/network-secured-agent/README.md b/scenarios/Agents/setup/network-secured-agent/README.md index a52edd3f..58de875b 100644 --- a/scenarios/Agents/setup/network-secured-agent/README.md +++ b/scenarios/Agents/setup/network-secured-agent/README.md @@ -23,9 +23,9 @@ languages: ![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/network-secured-agent/BicepVersion.svg) -[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fdharakumarmsft%2Fazureai-samples%2Fscenario%2FAgents%2Fscenarios%2FAgents%2Fsetup%2Fnetwork-secured-agent%2Fazuredeploy.json) +[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fnetwork-secured-agent%2Fazuredeploy.json) -[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.azure-ai-agent-service%2Fnetwork-secured-agent%2Fazuredeploy.json) +[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fnetwork-secured-agent%2Fazuredeploy.json) This infrastructure-as-code (IaC) solution deploys a network-secured Azure AI agent environment with private networking, managed identities, and role-based access control (RBAC). diff --git a/scenarios/Agents/setup/network-secured-agent/azuredeploy.json b/scenarios/Agents/setup/network-secured-agent/azuredeploy.json index 752e0de6..56c00db3 100644 --- a/scenarios/Agents/setup/network-secured-agent/azuredeploy.json +++ b/scenarios/Agents/setup/network-secured-agent/azuredeploy.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.33.93.31351", - "templateHash": "15513953893093752510" + "templateHash": "15839381951477066016" } }, "parameters": { @@ -1721,72 +1721,6 @@ "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--private-endpoint', parameters('name'), parameters('uniqueSuffix')))]" ] }, - { - "type": "Microsoft.Resources/deployments", - "apiVersion": "2022-09-01", - "name": "[format('wait-script-{0}-deployment', parameters('uniqueSuffix'))]", - "properties": { - "expressionEvaluationOptions": { - "scope": "inner" - }, - "mode": "Incremental", - "parameters": { - "name": { - "value": "[format('wait-script-{0}', parameters('uniqueSuffix'))]" - }, - "location": { - "value": "[parameters('location')]" - } - }, - "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "metadata": { - "_generator": { - "name": "bicep", - "version": "0.33.93.31351", - "templateHash": "15002511661880391263" - } - }, - "parameters": { - "name": { - "type": "string" - }, - "location": { - "type": "string" - }, - "retentionTime": { - "type": "string", - "defaultValue": "PT1H" - } - }, - "resources": [ - { - "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", - "name": "[parameters('name')]", - "location": "[parameters('location')]", - "kind": "AzurePowerShell", - "properties": { - "azPowerShellVersion": "10.0", - "scriptContent": " Write-Output \"Starting wait script...\"\n Start-Sleep -Seconds 120\n Write-Output \"Wait completed. Proceeding with deployment...\"\n ", - "retentionInterval": "[parameters('retentionTime')]", - "cleanupPreference": "Always" - } - } - ], - "outputs": { - "scriptName": { - "type": "string", - "value": "[parameters('name')]" - } - } - } - }, - "dependsOn": [ - "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--project', parameters('name'), parameters('uniqueSuffix')))]" - ] - }, { "type": "Microsoft.Resources/deployments", "apiVersion": "2022-09-01", @@ -1877,8 +1811,7 @@ "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--dependencies', parameters('name'), parameters('uniqueSuffix')))]", "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--project', parameters('name'), parameters('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', parameters('uniqueSuffix')))]" + "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]" ] }, { @@ -1960,8 +1893,7 @@ "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--dependencies', parameters('name'), parameters('uniqueSuffix')))]", "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--project', parameters('name'), parameters('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', parameters('uniqueSuffix')))]" + "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]" ] }, { diff --git a/scenarios/Agents/setup/network-secured-agent/main.bicep b/scenarios/Agents/setup/network-secured-agent/main.bicep index a4cee74b..9d2e11ca 100644 --- a/scenarios/Agents/setup/network-secured-agent/main.bicep +++ b/scenarios/Agents/setup/network-secured-agent/main.bicep @@ -244,16 +244,7 @@ module aiProject 'modules-network-secured/network-secured-ai-project.bicep' = { privateEndpointAndDNS ] } -module waitScript 'modules-network-secured/common/wait-script.bicep' = { - name: 'wait-script-${uniqueSuffix}-deployment' - params: { - name: 'wait-script-${uniqueSuffix}' - location: location - } - dependsOn: [ - aiProject - ] -} + module aiServiceRoleAssignments 'modules-network-secured/ai-service-role-assignments.bicep' = { name: '${name}-${uniqueSuffix}--AiServices-RA' scope: resourceGroup() @@ -262,9 +253,6 @@ module aiServiceRoleAssignments 'modules-network-secured/ai-service-role-assignm aiProjectPrincipalId: identity.outputs.uaiPrincipalId aiProjectId: aiProject.outputs.aiProjectResourceId } - dependsOn: [ - waitScript - ] } module aiSearchRoleAssignments 'modules-network-secured/ai-search-role-assignments.bicep' = { @@ -275,9 +263,6 @@ module aiSearchRoleAssignments 'modules-network-secured/ai-search-role-assignmen aiProjectPrincipalId: identity.outputs.uaiPrincipalId aiProjectId: aiProject.outputs.aiProjectResourceId } - dependsOn: [ - waitScript - ] } module addCapabilityHost 'modules-network-secured/network-capability-host.bicep' = { diff --git a/scenarios/Agents/setup/standard-agent/README.md b/scenarios/Agents/setup/standard-agent/README.md index 74ec5890..03da70bf 100644 --- a/scenarios/Agents/setup/standard-agent/README.md +++ b/scenarios/Agents/setup/standard-agent/README.md @@ -22,9 +22,9 @@ languages: ![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/standard-agent/BicepVersion.svg) -[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fdharakumarmsft%2Fazureai-samples%2Fscenario%2FAgents%2Fscenarios%2FAgents%2Fsetup%2Fstandard-agent%2Fazuredeploy.json) +[![Deploy To Azure](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/deploytoazure.svg?sanitize=true)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fstandard-agent%2Fazuredeploy.json) -[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2Fdharakumarmsft%2Fazureai-samples%2Fscenario%2FAgents%2Fscenarios%2FAgents%2Fsetup%2Fstandard-agent%2Fazuredeploy.json) +[![Visualize](https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/1-CONTRIBUTION-GUIDE/images/visualizebutton.svg?sanitize=true)](http://armviz.io/#/?load=https%3A%2F%2Fraw.githubusercontent.com%2FAzure-Samples%2Fazureai-samples%2Fmain%2Fscenarios%2FAgents%2Fsetup%2Fstandard-agent%2Fazuredeploy.json) Resources for the hub, project, storage account, key vault, AI Services, and Azure AI Search will be created for you. The AI Services, AI Search, and Azure Blob Storage account will be connected to your project/hub using managed identity for authentication and a gpt-4o-mini model will be deployed in the eastus region. diff --git a/scenarios/Agents/setup/standard-agent/azuredeploy.json b/scenarios/Agents/setup/standard-agent/azuredeploy.json index 0341b50d..93ce27c0 100644 --- a/scenarios/Agents/setup/standard-agent/azuredeploy.json +++ b/scenarios/Agents/setup/standard-agent/azuredeploy.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.33.93.31351", - "templateHash": "1349409650835059152" + "templateHash": "13389557768405645377" } }, "parameters": { @@ -938,72 +938,6 @@ "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('name'), variables('uniqueSuffix')))]" ] }, - { - "type": "Microsoft.Resources/deployments", - "apiVersion": "2022-09-01", - "name": "[format('wait-script-{0}-deployment', variables('uniqueSuffix'))]", - "properties": { - "expressionEvaluationOptions": { - "scope": "inner" - }, - "mode": "Incremental", - "parameters": { - "name": { - "value": "[format('wait-script-{0}', variables('uniqueSuffix'))]" - }, - "location": { - "value": "[parameters('location')]" - } - }, - "template": { - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "metadata": { - "_generator": { - "name": "bicep", - "version": "0.33.93.31351", - "templateHash": "15002511661880391263" - } - }, - "parameters": { - "name": { - "type": "string" - }, - "location": { - "type": "string" - }, - "retentionTime": { - "type": "string", - "defaultValue": "PT1H" - } - }, - "resources": [ - { - "type": "Microsoft.Resources/deploymentScripts", - "apiVersion": "2023-08-01", - "name": "[parameters('name')]", - "location": "[parameters('location')]", - "kind": "AzurePowerShell", - "properties": { - "azPowerShellVersion": "10.0", - "scriptContent": " Write-Output \"Starting wait script...\"\n Start-Sleep -Seconds 120\n Write-Output \"Wait completed. Proceeding with deployment...\"\n ", - "retentionInterval": "[parameters('retentionTime')]", - "cleanupPreference": "Always" - } - } - ], - "outputs": { - "scriptName": { - "type": "string", - "value": "[parameters('name')]" - } - } - } - }, - "dependsOn": [ - "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]" - ] - }, { "type": "Microsoft.Resources/deployments", "apiVersion": "2022-09-01", @@ -1095,8 +1029,7 @@ }, "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', format('dependencies-{0}-{1}-deployment', variables('name'), variables('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', variables('uniqueSuffix')))]" + "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]" ] }, { @@ -1179,8 +1112,7 @@ }, "dependsOn": [ "[resourceId('Microsoft.Resources/deployments', format('dependencies-{0}-{1}-deployment', variables('name'), variables('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]", - "[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', variables('uniqueSuffix')))]" + "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]" ] }, { diff --git a/scenarios/Agents/setup/standard-agent/main.bicep b/scenarios/Agents/setup/standard-agent/main.bicep index f5be6491..0fe2bff2 100644 --- a/scenarios/Agents/setup/standard-agent/main.bicep +++ b/scenarios/Agents/setup/standard-agent/main.bicep @@ -155,17 +155,6 @@ module aiProject 'modules-standard/standard-ai-project.bicep' = { } } -module waitScript 'modules-standard/wait-script.bicep' = { - name: 'wait-script-${uniqueSuffix}-deployment' - params: { - name: 'wait-script-${uniqueSuffix}' - location: location - } - dependsOn: [ - aiProject - ] -} - module aiServiceRoleAssignments 'modules-standard/ai-service-role-assignments.bicep' = { name: 'ai-service-role-assignments-${projectName}-${uniqueSuffix}-deployment' scope: resourceGroup(aiServiceAccountSubscriptionId, aiServiceAccountResourceGroupName) @@ -174,9 +163,6 @@ module aiServiceRoleAssignments 'modules-standard/ai-service-role-assignments.bi aiProjectPrincipalId: aiProject.outputs.aiProjectPrincipalId aiProjectId: aiProject.outputs.aiProjectResourceId } - dependsOn: [ - waitScript - ] } module aiSearchRoleAssignments 'modules-standard/ai-search-role-assignments.bicep' = { @@ -187,9 +173,6 @@ module aiSearchRoleAssignments 'modules-standard/ai-search-role-assignments.bice aiProjectPrincipalId: aiProject.outputs.aiProjectPrincipalId aiProjectId: aiProject.outputs.aiProjectResourceId } - dependsOn: [ - waitScript - ] } module addCapabilityHost 'modules-standard/add-capability-host.bicep' = {