Skip to content

Commit b3a874b

Browse files
dharakumarmsftdharakumarmsft
authored
Remove wait script and update readme (#207)
1 parent 6b3a838 commit b3a874b

File tree

8 files changed

+16
-184
lines changed

8 files changed

+16
-184
lines changed

‎scenarios/Agents/setup/basic-agent-identity/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ languages:
2222

2323
![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/basic-agent-identity/BicepVersion.svg)
2424

25-
[![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)
25+
[![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)
2626

27-
[![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)
27+
[![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)
2828

2929
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.
3030

‎scenarios/Agents/setup/basic-agent-keys/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ languages:
2222

2323
![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/basic-agent-keys/BicepVersion.svg)
2424

25-
[![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)
25+
[![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)
2626

27-
[![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)
27+
[![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)
2828

29-
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.
29+
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.
3030
## Resources
3131

3232
| Provider and type | Description |

‎scenarios/Agents/setup/network-secured-agent/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ languages:
2323

2424
![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/network-secured-agent/BicepVersion.svg)
2525

26-
[![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)
26+
[![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)
2727

28-
[![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)
28+
[![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)
2929

3030
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).
3131

‎scenarios/Agents/setup/network-secured-agent/azuredeploy.json‎

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.33.93.31351",
8-
"templateHash": "15513953893093752510"
8+
"templateHash": "15839381951477066016"
99
}
1010
},
1111
"parameters": {
@@ -1721,72 +1721,6 @@
17211721
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--private-endpoint', parameters('name'), parameters('uniqueSuffix')))]"
17221722
]
17231723
},
1724-
{
1725-
"type": "Microsoft.Resources/deployments",
1726-
"apiVersion": "2022-09-01",
1727-
"name": "[format('wait-script-{0}-deployment', parameters('uniqueSuffix'))]",
1728-
"properties": {
1729-
"expressionEvaluationOptions": {
1730-
"scope": "inner"
1731-
},
1732-
"mode": "Incremental",
1733-
"parameters": {
1734-
"name": {
1735-
"value": "[format('wait-script-{0}', parameters('uniqueSuffix'))]"
1736-
},
1737-
"location": {
1738-
"value": "[parameters('location')]"
1739-
}
1740-
},
1741-
"template": {
1742-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
1743-
"contentVersion": "1.0.0.0",
1744-
"metadata": {
1745-
"_generator": {
1746-
"name": "bicep",
1747-
"version": "0.33.93.31351",
1748-
"templateHash": "15002511661880391263"
1749-
}
1750-
},
1751-
"parameters": {
1752-
"name": {
1753-
"type": "string"
1754-
},
1755-
"location": {
1756-
"type": "string"
1757-
},
1758-
"retentionTime": {
1759-
"type": "string",
1760-
"defaultValue": "PT1H"
1761-
}
1762-
},
1763-
"resources": [
1764-
{
1765-
"type": "Microsoft.Resources/deploymentScripts",
1766-
"apiVersion": "2023-08-01",
1767-
"name": "[parameters('name')]",
1768-
"location": "[parameters('location')]",
1769-
"kind": "AzurePowerShell",
1770-
"properties": {
1771-
"azPowerShellVersion": "10.0",
1772-
"scriptContent": " Write-Output \"Starting wait script...\"\n Start-Sleep -Seconds 120\n Write-Output \"Wait completed. Proceeding with deployment...\"\n ",
1773-
"retentionInterval": "[parameters('retentionTime')]",
1774-
"cleanupPreference": "Always"
1775-
}
1776-
}
1777-
],
1778-
"outputs": {
1779-
"scriptName": {
1780-
"type": "string",
1781-
"value": "[parameters('name')]"
1782-
}
1783-
}
1784-
}
1785-
},
1786-
"dependsOn": [
1787-
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--project', parameters('name'), parameters('uniqueSuffix')))]"
1788-
]
1789-
},
17901724
{
17911725
"type": "Microsoft.Resources/deployments",
17921726
"apiVersion": "2022-09-01",
@@ -1877,8 +1811,7 @@
18771811
"dependsOn": [
18781812
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--dependencies', parameters('name'), parameters('uniqueSuffix')))]",
18791813
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--project', parameters('name'), parameters('uniqueSuffix')))]",
1880-
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]",
1881-
"[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', parameters('uniqueSuffix')))]"
1814+
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]"
18821815
]
18831816
},
18841817
{
@@ -1960,8 +1893,7 @@
19601893
"dependsOn": [
19611894
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--dependencies', parameters('name'), parameters('uniqueSuffix')))]",
19621895
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--project', parameters('name'), parameters('uniqueSuffix')))]",
1963-
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]",
1964-
"[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', parameters('uniqueSuffix')))]"
1896+
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}--identity', parameters('name'), parameters('uniqueSuffix')))]"
19651897
]
19661898
},
19671899
{

‎scenarios/Agents/setup/network-secured-agent/main.bicep‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,7 @@ module aiProject 'modules-network-secured/network-secured-ai-project.bicep' = {
244244
privateEndpointAndDNS
245245
]
246246
}
247-
module waitScript 'modules-network-secured/common/wait-script.bicep' = {
248-
name: 'wait-script-${uniqueSuffix}-deployment'
249-
params: {
250-
name: 'wait-script-${uniqueSuffix}'
251-
location: location
252-
}
253-
dependsOn: [
254-
aiProject
255-
]
256-
}
247+
257248
module aiServiceRoleAssignments 'modules-network-secured/ai-service-role-assignments.bicep' = {
258249
name: '${name}-${uniqueSuffix}--AiServices-RA'
259250
scope: resourceGroup()
@@ -262,9 +253,6 @@ module aiServiceRoleAssignments 'modules-network-secured/ai-service-role-assignm
262253
aiProjectPrincipalId: identity.outputs.uaiPrincipalId
263254
aiProjectId: aiProject.outputs.aiProjectResourceId
264255
}
265-
dependsOn: [
266-
waitScript
267-
]
268256
}
269257

270258
module aiSearchRoleAssignments 'modules-network-secured/ai-search-role-assignments.bicep' = {
@@ -275,9 +263,6 @@ module aiSearchRoleAssignments 'modules-network-secured/ai-search-role-assignmen
275263
aiProjectPrincipalId: identity.outputs.uaiPrincipalId
276264
aiProjectId: aiProject.outputs.aiProjectResourceId
277265
}
278-
dependsOn: [
279-
waitScript
280-
]
281266
}
282267

283268
module addCapabilityHost 'modules-network-secured/network-capability-host.bicep' = {

‎scenarios/Agents/setup/standard-agent/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ languages:
2222

2323
![Bicep Version](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.azure-ai-agent-service/standard-agent/BicepVersion.svg)
2424

25-
[![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)
25+
[![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)
2626

27-
[![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)
27+
[![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)
2828

2929
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.
3030

‎scenarios/Agents/setup/standard-agent/azuredeploy.json‎

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.33.93.31351",
8-
"templateHash": "1349409650835059152"
8+
"templateHash": "13389557768405645377"
99
}
1010
},
1111
"parameters": {
@@ -938,72 +938,6 @@
938938
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('name'), variables('uniqueSuffix')))]"
939939
]
940940
},
941-
{
942-
"type": "Microsoft.Resources/deployments",
943-
"apiVersion": "2022-09-01",
944-
"name": "[format('wait-script-{0}-deployment', variables('uniqueSuffix'))]",
945-
"properties": {
946-
"expressionEvaluationOptions": {
947-
"scope": "inner"
948-
},
949-
"mode": "Incremental",
950-
"parameters": {
951-
"name": {
952-
"value": "[format('wait-script-{0}', variables('uniqueSuffix'))]"
953-
},
954-
"location": {
955-
"value": "[parameters('location')]"
956-
}
957-
},
958-
"template": {
959-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
960-
"contentVersion": "1.0.0.0",
961-
"metadata": {
962-
"_generator": {
963-
"name": "bicep",
964-
"version": "0.33.93.31351",
965-
"templateHash": "15002511661880391263"
966-
}
967-
},
968-
"parameters": {
969-
"name": {
970-
"type": "string"
971-
},
972-
"location": {
973-
"type": "string"
974-
},
975-
"retentionTime": {
976-
"type": "string",
977-
"defaultValue": "PT1H"
978-
}
979-
},
980-
"resources": [
981-
{
982-
"type": "Microsoft.Resources/deploymentScripts",
983-
"apiVersion": "2023-08-01",
984-
"name": "[parameters('name')]",
985-
"location": "[parameters('location')]",
986-
"kind": "AzurePowerShell",
987-
"properties": {
988-
"azPowerShellVersion": "10.0",
989-
"scriptContent": " Write-Output \"Starting wait script...\"\n Start-Sleep -Seconds 120\n Write-Output \"Wait completed. Proceeding with deployment...\"\n ",
990-
"retentionInterval": "[parameters('retentionTime')]",
991-
"cleanupPreference": "Always"
992-
}
993-
}
994-
],
995-
"outputs": {
996-
"scriptName": {
997-
"type": "string",
998-
"value": "[parameters('name')]"
999-
}
1000-
}
1001-
}
1002-
},
1003-
"dependsOn": [
1004-
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]"
1005-
]
1006-
},
1007941
{
1008942
"type": "Microsoft.Resources/deployments",
1009943
"apiVersion": "2022-09-01",
@@ -1095,8 +1029,7 @@
10951029
},
10961030
"dependsOn": [
10971031
"[resourceId('Microsoft.Resources/deployments', format('dependencies-{0}-{1}-deployment', variables('name'), variables('uniqueSuffix')))]",
1098-
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]",
1099-
"[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', variables('uniqueSuffix')))]"
1032+
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]"
11001033
]
11011034
},
11021035
{
@@ -1179,8 +1112,7 @@
11791112
},
11801113
"dependsOn": [
11811114
"[resourceId('Microsoft.Resources/deployments', format('dependencies-{0}-{1}-deployment', variables('name'), variables('uniqueSuffix')))]",
1182-
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]",
1183-
"[resourceId('Microsoft.Resources/deployments', format('wait-script-{0}-deployment', variables('uniqueSuffix')))]"
1115+
"[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]"
11841116
]
11851117
},
11861118
{

‎scenarios/Agents/setup/standard-agent/main.bicep‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -155,17 +155,6 @@ module aiProject 'modules-standard/standard-ai-project.bicep' = {
155155
}
156156
}
157157

158-
module waitScript 'modules-standard/wait-script.bicep' = {
159-
name: 'wait-script-${uniqueSuffix}-deployment'
160-
params: {
161-
name: 'wait-script-${uniqueSuffix}'
162-
location: location
163-
}
164-
dependsOn: [
165-
aiProject
166-
]
167-
}
168-
169158
module aiServiceRoleAssignments 'modules-standard/ai-service-role-assignments.bicep' = {
170159
name: 'ai-service-role-assignments-${projectName}-${uniqueSuffix}-deployment'
171160
scope: resourceGroup(aiServiceAccountSubscriptionId, aiServiceAccountResourceGroupName)
@@ -174,9 +163,6 @@ module aiServiceRoleAssignments 'modules-standard/ai-service-role-assignments.bi
174163
aiProjectPrincipalId: aiProject.outputs.aiProjectPrincipalId
175164
aiProjectId: aiProject.outputs.aiProjectResourceId
176165
}
177-
dependsOn: [
178-
waitScript
179-
]
180166
}
181167

182168
module aiSearchRoleAssignments 'modules-standard/ai-search-role-assignments.bicep' = {
@@ -187,9 +173,6 @@ module aiSearchRoleAssignments 'modules-standard/ai-search-role-assignments.bice
187173
aiProjectPrincipalId: aiProject.outputs.aiProjectPrincipalId
188174
aiProjectId: aiProject.outputs.aiProjectResourceId
189175
}
190-
dependsOn: [
191-
waitScript
192-
]
193176
}
194177

195178
module addCapabilityHost 'modules-standard/add-capability-host.bicep' = {

0 commit comments

Comments
 (0)