Skip to content

chore: dev to main merge #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avijit-Microsoft merged 9 commits into from
Jun 22, 2026
Merged

chore: dev to main merge #91

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5ac11aa
fix: update roleDefinitionIdOrName for Event Hubs Data Sender to use …
harman0108k Jun 16, 2026
b51d538
refactor: streamline conditional expressions for Event Hub and Fabric…
harman0108k Jun 16, 2026
7b50268
refactor: simplify output expression for Event Hub Namespace hostname
harman0108k Jun 16, 2026
91c97f2
refactor: improve formatting and readability of parameter and output …
harman0108k Jun 16, 2026
2d30fc7
refactor: streamline output expressions for Event Hub and Fabric capa…
harman0108k Jun 16, 2026
fbc9ed6
refactor: improve formatting of output expressions for Event Hub Name…
harman0108k Jun 16, 2026
bffec51
refactor: improve formatting and readability of output expressions in…
harman0108k Jun 16, 2026
d3d8737
refactor: improve formatting of parameter and output definitions in m…
harman0108k Jun 16, 2026
51a2728
Merge pull request #89 from harman0108k/psl-updateguid
Roopan-Microsoft Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,15 @@ var solutionSuffix = toLower(trim(replace(
)))

@description('Tag, Created by user name')
param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId
param createdBy string = contains(deployer(), 'userPrincipalName')
? split(deployer().userPrincipalName, '@')[0]
: deployer().objectId

var allTags = union(
{
'azd-env-name': solutionName
TemplateName: 'Real-time Ingestion Fabric Solution Accelerator'
Type:'Non-WAF'
Type: 'Non-WAF'
},
tags
)
Expand Down Expand Up @@ -153,7 +155,7 @@ module eventHubNamespaceModule 'br/public:avm/res/event-hub/namespace:0.14.1' =
messageRetentionInDays: 1
roleAssignments: [
{
roleDefinitionIdOrName: 'Azure Event Hubs Data Sender'
roleDefinitionIdOrName: '2b629674-e913-4c01-ae53-ef4638d8f975' //Azure Event Hubs Data Sender
Comment thread
Saswato-Microsoft marked this conversation as resolved.
principalId: userObjectId
}
]
Expand Down Expand Up @@ -197,22 +199,30 @@ output AZURE_RESOURCE_GROUP string = resourceGroup().name

@description('The name of the Fabric capacity resource')
#disable-next-line BCP318
output AZURE_FABRIC_CAPACITY_NAME string = useExistingFabricCapacity ? existingFabricCapacityName : fabricCapacity!.outputs.name
output AZURE_FABRIC_CAPACITY_NAME string = useExistingFabricCapacity
? existingFabricCapacityName
: fabricCapacity!.outputs.name

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

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

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

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

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

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

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