Skip to content

Align Microsoft.EventHub deployment names #727

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
eriqua merged 1 commit into from
Dec 4, 2021
Merged

Align Microsoft.EventHub deployment names #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions arm/Microsoft.EventHub/namespaces/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ resource eventHubNamespace_diagnosticSettings 'Microsoft.Insights/diagnosticsett
}

module eventHubNamespace_eventHubs 'eventhubs/deploy.bicep' = [for (eventHub, index) in eventHubs: {
name: '${uniqueString(deployment().name, location)}-eventHub-${index}'
name: '${uniqueString(deployment().name, location)}-EvhbNamespace-EventHub-${index}'
params: {
namespaceName: eventHubNamespace.name
name: eventHub.name
Expand Down Expand Up @@ -250,7 +250,7 @@ module eventHubNamespace_eventHubs 'eventhubs/deploy.bicep' = [for (eventHub, in
}]

module eventHubNamespace_diasterRecoveryConfig 'disasterRecoveryConfigs/deploy.bicep' = if (!empty(disasterRecoveryConfig)) {
name: '${uniqueString(deployment().name, location)}-disasterRecoveryConfig'
name: '${uniqueString(deployment().name, location)}-EvhbNamespace-DisRecConfig'
params: {
namespaceName: eventHubNamespace.name
name: disasterRecoveryConfig.name
Expand All @@ -259,7 +259,7 @@ module eventHubNamespace_diasterRecoveryConfig 'disasterRecoveryConfigs/deploy.b
}

module eventHubNamespace_authorizationRules 'authorizationRules/deploy.bicep' = [for (authorizationRule, index) in authorizationRules: {
name: '${uniqueString(deployment().name, location)}-authorizationRules-${index}'
name: '${uniqueString(deployment().name, location)}-EvhbNamespace-AuthRule-${index}'
params: {
namespaceName: eventHubNamespace.name
name: authorizationRule.name
Expand All @@ -268,7 +268,7 @@ module eventHubNamespace_authorizationRules 'authorizationRules/deploy.bicep' =
}]

module eventHubNamespace_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (endpoint, index) in privateEndpoints: {
name: '${uniqueString(deployment().name, location)}-PrivateEndpoints-${index}'
name: '${uniqueString(deployment().name, location)}-EvhbNamespace-PrivateEndpoint-${index}'
params: {
privateEndpointResourceId: eventHubNamespace.id
privateEndpointVnetLocation: (empty(privateEndpoints) ? 'dummy' : reference(split(endpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)
Expand All @@ -278,7 +278,7 @@ module eventHubNamespace_privateEndpoints '.bicep/nested_privateEndpoint.bicep'
}]

module eventHubNamespace_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-EvhbNamespace-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
6 changes: 3 additions & 3 deletions arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ resource eventHub_lock 'Microsoft.Authorization/locks@2016-09-01' = if (lock !=
}

module eventHub_consumergroups 'consumergroups/deploy.bicep' = [for (consumerGroup, index) in consumerGroups: {
name: '${deployment().name}-consumergroup-${index}'
name: '${deployment().name}-ConsumerGroup-${index}'
params: {
namespaceName: namespaceName
eventHubName: eventHub.name
Expand All @@ -157,7 +157,7 @@ module eventHub_consumergroups 'consumergroups/deploy.bicep' = [for (consumerGro
}]

module eventHub_authorizationRules 'authorizationRules/deploy.bicep' = [for (authorizationRule, index) in authorizationRules: {
name: '${deployment().name}-authorizationRule-${index}'
name: '${deployment().name}-AuthRule-${index}'
params: {
namespaceName: namespaceName
eventHubName: eventHub.name
Expand All @@ -167,7 +167,7 @@ module eventHub_authorizationRules 'authorizationRules/deploy.bicep' = [for (aut
}]

module eventHub_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${deployment().name}-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down