Update to latest

Azure · Jan 4, 2025 · 4b1caf6 · 4b1caf6
1 parent 175b3df
commit 4b1caf6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/avm/res/digital-twins/digital-twins-instance/endpoint/main.bicep b/avm/res/digital-twins/digital-twins-instance/endpoint/main.bicep
@@ -46,23 +46,23 @@ resource eventHubNamespace 'Microsoft.EventHub/namespaces@2024-01-01' existing =
 resource serviceBusNamespace 'Microsoft.ServiceBus/namespaces@2024-01-01' existing = if (properties.endpointType == 'ServiceBus') {
   name: properties.authentication.type == 'IdentityBased'
     ? split(properties.authentication.?serviceBusNamespaceTopicResourceId, '/')[8]
-    : split(properties.authentication.?serviceBusNamespaceAuthorizationRuleResourceId, '/')[8]
+    : split(properties.authentication.?serviceBusNamespaceTopicAuthorizationRuleResourceId, '/')[8]
   scope: properties.authentication.type == 'IdentityBased'
     ? resourceGroup(
         split((properties.authentication.?serviceBusNamespaceTopicResourceId ?? '//'), '/')[2],
         split((properties.authentication.?serviceBusNamespaceTopicResourceId ?? '////'), '/')[4]
       )
     : resourceGroup(
-        split((properties.authentication.?serviceBusNamespaceAuthorizationRuleResourceId ?? '//'), '/')[2],
-        split((properties.authentication.?serviceBusNamespaceAuthorizationRuleResourceId ?? '////'), '/')[4]
+        split((properties.authentication.?serviceBusNamespaceTopicAuthorizationRuleResourceId ?? '//'), '/')[2],
+        split((properties.authentication.?serviceBusNamespaceTopicAuthorizationRuleResourceId ?? '////'), '/')[4]
       )
 
   resource topic 'topics@2024-01-01' existing = if (!empty(properties.authentication.?serviceBusNamespaceTopicResourceId)) {
     name: last(split(properties.authentication.?serviceBusNamespaceTopicResourceId, '/'))
-  }
 
-  resource authorizationRule 'AuthorizationRules@2024-01-01' existing = if (!empty(properties.authentication.?serviceBusNamespaceAuthorizationRuleResourceId)) {
-    name: last(split(properties.authentication.?serviceBusNamespaceAuthorizationRuleResourceId, '/'))
+    resource authorizationRule 'AuthorizationRules@2024-01-01' existing = if (!empty(properties.authentication.?serviceBusNamespaceTopicAuthorizationRuleResourceId)) {
+      name: last(split(properties.authentication.?serviceBusNamespaceTopicAuthorizationRuleResourceId, '/'))
+    }
   }
 }
 
@@ -116,8 +116,8 @@ resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2023-0
                 entityPath: serviceBusNamespace::topic.name
               }
             : {
-                primaryConnectionString: serviceBusNamespace::authorizationRule.listKeys().primaryConnectionString
-                secondaryConnectionString: serviceBusNamespace::authorizationRule.listKeys().secondaryConnectionString
+                primaryConnectionString: serviceBusNamespace::topic::authorizationRule.listKeys().primaryConnectionString
+                secondaryConnectionString: serviceBusNamespace::topic::authorizationRule.listKeys().secondaryConnectionString
               })
         }
       : {})
@@ -259,5 +259,5 @@ type serviceBusNamespaceKeyBasedAuthenticationPropertiesType = {
   type: 'KeyBased'
 
   @description('Required. The ServiceBus Namespace Authorization Rule resource ID.')
-  serviceBusNamespaceAuthorizationRuleResourceId: string
+  serviceBusNamespaceTopicAuthorizationRuleResourceId: string
 }
diff --git a/avm/res/digital-twins/digital-twins-instance/tests/e2e/max/dependencies.bicep b/avm/res/digital-twins/digital-twins-instance/tests/e2e/max/dependencies.bicep
@@ -164,7 +164,7 @@ output eventHubNamespaceEventHubAuthorizationRuleName string = eventHubNamespace
 output serviceBusNamespaceTopicResourceId string = serviceBusNamespace::topic.id
 
 @description('The resource ID of the Service Bus Authorization Rule.')
-output serviceBusNamespaceAuthorizationRuleResourceId string = serviceBusNamespace::topic::authorizationRule.id
+output serviceBusNamespaceTopicAuthorizationRuleResourceId string = serviceBusNamespace::topic::authorizationRule.id
 
 @description('The resource ID of the created Managed Identity.')
 output managedIdentityResourceId string = managedIdentity.id

diff --git a/avm/res/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep b/avm/res/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep
@@ -140,7 +140,7 @@ module testDeployment '../../../main.bicep' = [
           name: 'KeyBasedServiceBusEndpoint'
           properties: {
             authentication: {
-              serviceBusNamespaceAuthorizationRuleResourceId: nestedDependencies.outputs.serviceBusNamespaceAuthorizationRuleResourceId
+              serviceBusNamespaceTopicAuthorizationRuleResourceId: nestedDependencies.outputs.serviceBusNamespaceTopicAuthorizationRuleResourceId
               type: 'KeyBased'
             }
             endpointType: 'ServiceBus'