Skip to content

Commit 51a2728

Browse files
Merge pull request #89 from harman0108k/psl-updateguid
fix: update roleDefinitionIdOrName for Event Hubs Data Sender to use GUID
2 parents 23a7cda + d3d8737 commit 51a2728

1 file changed

Lines changed: 23 additions & 9 deletions

File tree

infra/main.bicep

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,15 @@ var solutionSuffix = toLower(trim(replace(
9191
)))
9292

9393
@description('Tag, Created by user name')
94-
param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId
94+
param createdBy string = contains(deployer(), 'userPrincipalName')
95+
? split(deployer().userPrincipalName, '@')[0]
96+
: deployer().objectId
9597

9698
var allTags = union(
9799
{
98100
'azd-env-name': solutionName
99101
TemplateName: 'Real-time Ingestion Fabric Solution Accelerator'
100-
Type:'Non-WAF'
102+
Type: 'Non-WAF'
101103
},
102104
tags
103105
)
@@ -153,7 +155,7 @@ module eventHubNamespaceModule 'br/public:avm/res/event-hub/namespace:0.14.1' =
153155
messageRetentionInDays: 1
154156
roleAssignments: [
155157
{
156-
roleDefinitionIdOrName: 'Azure Event Hubs Data Sender'
158+
roleDefinitionIdOrName: '2b629674-e913-4c01-ae53-ef4638d8f975' //Azure Event Hubs Data Sender
157159
principalId: userObjectId
158160
}
159161
]
@@ -197,22 +199,30 @@ output AZURE_RESOURCE_GROUP string = resourceGroup().name
197199

198200
@description('The name of the Fabric capacity resource')
199201
#disable-next-line BCP318
200-
output AZURE_FABRIC_CAPACITY_NAME string = useExistingFabricCapacity ? existingFabricCapacityName : fabricCapacity!.outputs.name
202+
output AZURE_FABRIC_CAPACITY_NAME string = useExistingFabricCapacity
203+
? existingFabricCapacityName
204+
: fabricCapacity!.outputs.name
201205

202206
@description('The identities added as Fabric Capacity Admin members')
203207
output AZURE_FABRIC_CAPACITY_ADMINISTRATORS array = fabricTotalAdminMembers
204208

205209
@description('The resource ID of the Event Hub Namespace for ingestion.')
206210
#disable-next-line BCP318
207-
output AZURE_EVENT_HUB_NAMESPACE_ID string = useExistingEventHubNamespace ? existingEventHubNamespaceId : eventHubNamespaceModule!.outputs.resourceId
211+
output AZURE_EVENT_HUB_NAMESPACE_ID string = useExistingEventHubNamespace
212+
? existingEventHubNamespaceId
213+
: eventHubNamespaceModule!.outputs.resourceId
208214

209215
@description('The name of the Event Hub Namespace for ingestion.')
210216
#disable-next-line BCP318
211-
output AZURE_EVENT_HUB_NAMESPACE_NAME string = useExistingEventHubNamespace ? eventHubNamespaceNameFromId : eventHubNamespaceModule!.outputs.name
217+
output AZURE_EVENT_HUB_NAMESPACE_NAME string = useExistingEventHubNamespace
218+
? eventHubNamespaceNameFromId
219+
: eventHubNamespaceModule!.outputs.name
212220

213221
@description('The hostname of the Event Hub Namespace for ingestion.')
214222
#disable-next-line BCP318
215-
output AZURE_EVENT_HUB_NAMESPACE_HOSTNAME string = useExistingEventHubNamespace ? '${eventHubNamespaceNameFromId}.servicebus.windows.net' : '${eventHubNamespaceModule!.outputs.name}.servicebus.windows.net'
223+
output AZURE_EVENT_HUB_NAMESPACE_HOSTNAME string = useExistingEventHubNamespace
224+
? '${eventHubNamespaceNameFromId}.servicebus.windows.net'
225+
: '${eventHubNamespaceModule!.outputs.name}.servicebus.windows.net'
216226

217227
@description('The name of the Event Hub for ingestion.')
218228
output AZURE_EVENT_HUB_NAME string = eventHubName
@@ -227,7 +237,11 @@ output USING_EXISTING_EVENT_HUB_NAMESPACE bool = useExistingEventHubNamespace
227237
output USING_EXISTING_FABRIC_CAPACITY bool = useExistingFabricCapacity
228238

229239
@description('The resource group name where the Event Hub Namespace is located. May differ from deployment RG when reusing namespace from different location.')
230-
output AZURE_EVENT_HUB_RESOURCE_GROUP string = useExistingEventHubNamespace ? eventHubNamespaceResourceGroup : resourceGroup().name
240+
output AZURE_EVENT_HUB_RESOURCE_GROUP string = useExistingEventHubNamespace
241+
? eventHubNamespaceResourceGroup
242+
: resourceGroup().name
231243

232244
@description('The subscription ID where the Event Hub Namespace is located. May differ from deployment subscription when reusing namespace from different subscription.')
233-
output AZURE_EVENT_HUB_SUBSCRIPTION_ID string = useExistingEventHubNamespace ? eventHubNamespaceSubscriptionId : subscription().subscriptionId
245+
output AZURE_EVENT_HUB_SUBSCRIPTION_ID string = useExistingEventHubNamespace
246+
? eventHubNamespaceSubscriptionId
247+
: subscription().subscriptionId

0 commit comments

Comments
 (0)