Skip to content

Commit ef77628

Browse files
IEvangelisteerhardt
IEvangelist
and
eerhardt
authored
Existing Azure resources (#2653)
* Rework PR * Apply suggestions from code review Co-authored-by: Eric Erhardt <[email protected]> * Correct phrasing for local containers * Apply suggestions from code review Co-authored-by: Eric Erhardt <[email protected]> * Re-generate Bicep and manifest. Also, more feedback * Fix MD lint --------- Co-authored-by: Eric Erhardt <[email protected]>
1 parent c31d324 commit ef77628

12 files changed

+260
-82
lines changed

‎docs/azure/integrations-overview.md‎

Lines changed: 204 additions & 35 deletions
Large diffs are not rendered by default.

‎docs/snippets/azure/AppHost/aspire-manifest.json‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"connectionString": "{config.outputs.appConfigEndpoint}",
2121
"path": "config.module.bicep",
2222
"params": {
23-
"principalId": "",
24-
"principalType": ""
23+
"principalType": "",
24+
"principalId": ""
2525
}
2626
},
2727
"app-insights": {
@@ -34,28 +34,29 @@
3434
},
3535
"cosmos": {
3636
"type": "azure.bicep.v0",
37-
"connectionString": "{cosmos.secretOutputs.connectionString}",
37+
"connectionString": "{cosmos.outputs.connectionString}",
3838
"path": "cosmos.module.bicep",
3939
"params": {
40-
"keyVaultName": ""
40+
"principalType": "",
41+
"principalId": ""
4142
}
4243
},
4344
"event-hubs": {
4445
"type": "azure.bicep.v0",
4546
"connectionString": "{event-hubs.outputs.eventHubsEndpoint}",
4647
"path": "event-hubs.module.bicep",
4748
"params": {
48-
"principalId": "",
49-
"principalType": ""
49+
"principalType": "",
50+
"principalId": ""
5051
}
5152
},
5253
"key-vault": {
5354
"type": "azure.bicep.v0",
5455
"connectionString": "{key-vault.outputs.vaultUri}",
5556
"path": "key-vault.module.bicep",
5657
"params": {
57-
"principalId": "",
58-
"principalType": ""
58+
"principalType": "",
59+
"principalId": ""
5960
}
6061
},
6162
"log-analytics-workspace": {
@@ -67,8 +68,8 @@
6768
"connectionString": "{openai.outputs.connectionString}",
6869
"path": "openai.module.bicep",
6970
"params": {
70-
"principalId": "",
71-
"principalType": ""
71+
"principalType": "",
72+
"principalId": ""
7273
}
7374
},
7475
"postgres-flexible": {
@@ -95,26 +96,26 @@
9596
"connectionString": "{search.outputs.connectionString}",
9697
"path": "search.module.bicep",
9798
"params": {
98-
"principalId": "",
99-
"principalType": ""
99+
"principalType": "",
100+
"principalId": ""
100101
}
101102
},
102103
"service-bus": {
103104
"type": "azure.bicep.v0",
104105
"connectionString": "{service-bus.outputs.serviceBusEndpoint}",
105106
"path": "service-bus.module.bicep",
106107
"params": {
107-
"principalId": "",
108-
"principalType": ""
108+
"principalType": "",
109+
"principalId": ""
109110
}
110111
},
111112
"signalr": {
112113
"type": "azure.bicep.v0",
113114
"connectionString": "Endpoint=https://{signalr.outputs.hostName};AuthType=azure",
114115
"path": "signalr.module.bicep",
115116
"params": {
116-
"principalId": "",
117-
"principalType": ""
117+
"principalType": "",
118+
"principalId": ""
118119
}
119120
},
120121
"sql": {
@@ -130,17 +131,17 @@
130131
"type": "azure.bicep.v0",
131132
"path": "storage.module.bicep",
132133
"params": {
133-
"principalId": "",
134-
"principalType": ""
134+
"principalType": "",
135+
"principalId": ""
135136
}
136137
},
137138
"web-pub-sub": {
138139
"type": "azure.bicep.v0",
139140
"connectionString": "{web-pub-sub.outputs.endpoint}",
140141
"path": "web-pub-sub.module.bicep",
141142
"params": {
142-
"principalId": "",
143-
"principalType": ""
143+
"principalType": "",
144+
"principalId": ""
144145
}
145146
}
146147
}

‎docs/snippets/azure/AppHost/config.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

4-
param principalId string
5-
64
param principalType string
75

6+
param principalId string
7+
88
resource config 'Microsoft.AppConfiguration/configurationStores@2024-05-01' = {
99
name: take('config-${uniqueString(resourceGroup().id)}', 50)
1010
location: location

‎docs/snippets/azure/AppHost/cosmos.module.bicep‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

4-
param keyVaultName string
4+
param principalType string
55

6-
resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
7-
name: keyVaultName
8-
}
6+
param principalId string
97

108
resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = {
119
name: take('cosmos-${uniqueString(resourceGroup().id)}', 44)
@@ -21,17 +19,27 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = {
2119
defaultConsistencyLevel: 'Session'
2220
}
2321
databaseAccountOfferType: 'Standard'
22+
disableLocalAuth: true
2423
}
2524
kind: 'GlobalDocumentDB'
2625
tags: {
2726
'aspire-resource-name': 'cosmos'
2827
}
2928
}
3029

31-
resource connectionString 'Microsoft.KeyVault/vaults/secrets@2023-07-01' = {
32-
name: 'connectionString'
30+
resource cosmos_roleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2024-08-15' existing = {
31+
name: '00000000-0000-0000-0000-000000000002'
32+
parent: cosmos
33+
}
34+
35+
resource cosmos_roleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2024-08-15' = {
36+
name: guid(principalId, cosmos_roleDefinition.id, cosmos.id)
3337
properties: {
34-
value: 'AccountEndpoint=${cosmos.properties.documentEndpoint};AccountKey=${cosmos.listKeys().primaryMasterKey}'
38+
principalId: principalId
39+
roleDefinitionId: cosmos_roleDefinition.id
40+
scope: cosmos.id
3541
}
36-
parent: keyVault
37-
}
42+
parent: cosmos
43+
}
44+
45+
output connectionString string = cosmos.properties.documentEndpoint

‎docs/snippets/azure/AppHost/event-hubs.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ param location string = resourceGroup().location
33

44
param sku string = 'Standard'
55

6-
param principalId string
7-
86
param principalType string
97

8+
param principalId string
9+
1010
resource event_hubs 'Microsoft.EventHub/namespaces@2024-01-01' = {
1111
name: take('event_hubs-${uniqueString(resourceGroup().id)}', 256)
1212
location: location

‎docs/snippets/azure/AppHost/key-vault.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

4-
param principalId string
5-
64
param principalType string
75

6+
param principalId string
7+
88
resource key_vault 'Microsoft.KeyVault/vaults@2023-07-01' = {
99
name: take('keyvault-${uniqueString(resourceGroup().id)}', 24)
1010
location: location

‎docs/snippets/azure/AppHost/openai.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

4-
param principalId string
5-
64
param principalType string
75

6+
param principalId string
7+
88
resource openai 'Microsoft.CognitiveServices/accounts@2024-10-01' = {
99
name: take('openai-${uniqueString(resourceGroup().id)}', 64)
1010
location: location

‎docs/snippets/azure/AppHost/search.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

4-
param principalId string
5-
64
param principalType string
75

6+
param principalId string
7+
88
resource search 'Microsoft.Search/searchServices@2023-11-01' = {
99
name: take('search-${uniqueString(resourceGroup().id)}', 60)
1010
location: location

‎docs/snippets/azure/AppHost/service-bus.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ param location string = resourceGroup().location
33

44
param sku string = 'Standard'
55

6-
param principalId string
7-
86
param principalType string
97

8+
param principalId string
9+
1010
resource service_bus 'Microsoft.ServiceBus/namespaces@2024-01-01' = {
1111
name: take('servicebus-${uniqueString(resourceGroup().id)}', 50)
1212
location: location

‎docs/snippets/azure/AppHost/signalr.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

4-
param principalId string
5-
64
param principalType string
75

6+
param principalId string
7+
88
resource signalr 'Microsoft.SignalRService/signalR@2024-03-01' = {
99
name: take('signalr-${uniqueString(resourceGroup().id)}', 63)
1010
location: location

0 commit comments

Comments
 (0)