@@ -126,21 +126,23 @@ module postgreServer 'br/public:avm/res/db-for-postgre-sql/flexible-server:0.1.4
126
126
}
127
127
}
128
128
{{- end}}
129
- {{- if (and .AzureEventHubs .AzureEventHubs.AuthUsingManagedIdentity) }}
129
+ {{- if .AzureEventHubs }}
130
130
131
- module eventHubs 'br/public:avm/res/event-hub/namespace:0.7.1' = {
132
- name: 'eventHubs '
131
+ module eventHubNamespace 'br/public:avm/res/event-hub/namespace:0.7.1' = {
132
+ name: 'eventHubNamespace '
133
133
params: {
134
134
name: '${abbrs.eventHubNamespaces}${resourceToken}'
135
135
location: location
136
136
roleAssignments: [
137
+ {{- if (and .AzureEventHubs .AzureEventHubs.AuthUsingManagedIdentity) }}
137
138
{{- range .Services}}
138
139
{
139
140
principalId: {{bicepName .Name}}Identity.outputs.principalId
140
141
principalType: 'ServicePrincipal'
141
142
roleDefinitionIdOrName: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f526a384-b230-433a-b45c-95f59c4a2dec')
142
143
}
143
144
{{- end}}
145
+ {{- end}}
144
146
]
145
147
eventhubs: [
146
148
{{- range $eventHubName := .AzureEventHubs.EventHubNames}}
@@ -307,15 +309,17 @@ module {{bicepName .Name}} 'br/public:avm/res/app/container-app:0.8.0' = {
307
309
secretRef: 'redis-pass'
308
310
}
309
311
{{- end}}
312
+ {{- if .AzureEventHubs }}
313
+ {
314
+ name: 'SPRING_CLOUD_AZURE_EVENTHUBS_NAMESPACE'
315
+ value: eventHubNamespace.outputs.name
316
+ }
317
+ {{- end}}
310
318
{{- if (and .AzureEventHubs .AzureEventHubs.AuthUsingManagedIdentity) }}
311
319
{
312
320
name: 'SPRING_CLOUD_AZURE_EVENTHUBS_CONNECTION_STRING'
313
321
value: ''
314
322
}
315
- {
316
- name: 'SPRING_CLOUD_AZURE_EVENTHUBS_NAMESPACE'
317
- value: eventHubs.outputs.name
318
- }
319
323
{
320
324
name: 'SPRING_CLOUD_AZURE_EVENTHUBS_CREDENTIAL_MANAGEDIDENTITYENABLED'
321
325
value: 'true'
@@ -325,6 +329,20 @@ module {{bicepName .Name}} 'br/public:avm/res/app/container-app:0.8.0' = {
325
329
value: {{bicepName .Name}}Identity.outputs.clientId
326
330
}
327
331
{{- end}}
332
+ {{- if (and .AzureEventHubs .AzureEventHubs.AuthUsingConnectionString) }}
333
+ {
334
+ name: 'SPRING_CLOUD_AZURE_EVENTHUBS_CONNECTION_STRING'
335
+ value: listKeys('${eventHubNamespace.outputs.resourceId}/AuthorizationRules/RootManageSharedAccessKey', '2024-01-01').primaryConnectionString # Issue: https://github.com/Azure/bicep-registry-modules/issues/3638
336
+ }
337
+ {
338
+ name: 'SPRING_CLOUD_AZURE_EVENTHUBS_CREDENTIAL_MANAGEDIDENTITYENABLED'
339
+ value: 'false'
340
+ }
341
+ {
342
+ name: 'SPRING_CLOUD_AZURE_EVENTHUBS_CREDENTIAL_CLIENTID'
343
+ value: ''
344
+ }
345
+ {{- end}}
328
346
{{- if .Frontend}}
329
347
{{- range $i, $e := .Frontend.Backends}}
330
348
{
@@ -435,4 +453,7 @@ output AZURE_CACHE_REDIS_ID string = redis.outputs.resourceId
435
453
{{- if .DbPostgres}}
436
454
output AZURE_POSTGRES_FLEXIBLE_SERVER_ID string = postgreServer.outputs.resourceId
437
455
{{- end}}
456
+ {{- if .AzureEventHubs }}
457
+ output AZURE_EVENT_HUBS_ID string = eventHubNamespace.outputs.resourceId
458
+ {{- end}}
438
459
{{ end}}
0 commit comments