Updated outputs for namespace [s], [v], [w]

arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep

@@ -35,10 +35,10 @@ resource authorizationRule 'Microsoft.ServiceBus/namespaces/AuthorizationRules@2
 }
 
 @description('The name of the authorization rule.')
-output authorizationRuleName string = authorizationRule.name
+output name string = authorizationRule.name
 
 @description('The resource ID of the authorization rule.')
-output authorizationRuleResourceId string = authorizationRule.id
+output resourceId string = authorizationRule.id
 
 @description('The name of the Resource Group the authorization rule was created in.')
-output authorizationRuleResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md

@@ -21,9 +21,9 @@ This module deploys authorization rules for a service bus namespace
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `authorizationRuleName` | string | The name of the authorization rule. |
-| `authorizationRuleResourceGroup` | string | The name of the Resource Group the authorization rule was created in. |
-| `authorizationRuleResourceId` | string | The resource ID of the authorization rule. |
+| `name` | string | The name of the authorization rule. |
+| `resourceGroupName` | string | The name of the Resource Group the authorization rule was created in. |
+| `resourceId` | string | The resource ID of the authorization rule. |
 
 ## Template references
 

arm/Microsoft.ServiceBus/namespaces/deploy.bicep

@@ -276,13 +276,13 @@ module serviceBusNamespace_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignmen
 }]
 
 @description('The resource ID of the deployed service bus namespace')
-output serviceBusNamespaceResourceId string = serviceBusNamespace.id
+output resourceId string = serviceBusNamespace.id
 
 @description('The resource group of the deployed service bus namespace')
-output serviceBusNamespaceResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the deployed service bus namespace')
-output serviceBusNamespaceName string = serviceBusNamespace.name
+output name string = serviceBusNamespace.name
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(serviceBusNamespace.identity, 'principalId') ? serviceBusNamespace.identity.principalId : ''

arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep

@@ -34,10 +34,10 @@ resource disasterRecoveryConfig 'Microsoft.ServiceBus/namespaces/disasterRecover
 }
 
 @description('The name of the disaster recovery config.')
-output disasterRecoveryConfigName string = disasterRecoveryConfig.name
+output name string = disasterRecoveryConfig.name
 
 @description('The Resource ID of the disaster recovery config.')
-output disasterRecoveryConfigResourceId string = disasterRecoveryConfig.id
+output resourceId string = disasterRecoveryConfig.id
 
 @description('The name of the Resource Group the disaster recovery config was created in.')
-output disasterRecoveryConfigResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md

@@ -22,9 +22,9 @@ This module deploys a disaster recovery config for a service bus Namespace
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `disasterRecoveryConfigName` | string | The name of the disaster recovery config. |
-| `disasterRecoveryConfigResourceGroup` | string | The name of the Resource Group the disaster recovery config was created in. |
-| `disasterRecoveryConfigResourceId` | string | The Resource ID of the disaster recovery config. |
+| `name` | string | The name of the disaster recovery config. |
+| `resourceGroupName` | string | The name of the Resource Group the disaster recovery config was created in. |
+| `resourceId` | string | The Resource ID of the disaster recovery config. |
 
 ## Template references
 

arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep

@@ -42,10 +42,10 @@ resource ipFilterRule 'Microsoft.ServiceBus/namespaces/ipFilterRules@2018-01-01-
 }
 
 @description('The name of the IP filter rule.')
-output ipFilterRuleName string = ipFilterRule.name
+output name string = ipFilterRule.name
 
 @description('The Resource ID of the IP filter rule.')
-output ipFilterRuleResourceId string = ipFilterRule.id
+output resourceId string = ipFilterRule.id
 
 @description('The name of the Resource Group the IP filter rule was created in.')
-output ipFilterRuleResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md

@@ -23,9 +23,9 @@ This module deploys IP filter rules for a service bus namespace
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `ipFilterRuleName` | string | The name of the IP filter rule. |
-| `ipFilterRuleResourceGroup` | string | The name of the Resource Group the IP filter rule was created in. |
-| `ipFilterRuleResourceId` | string | The Resource ID of the IP filter rule. |
+| `name` | string | The name of the IP filter rule. |
+| `resourceGroupName` | string | The name of the Resource Group the IP filter rule was created in. |
+| `resourceId` | string | The Resource ID of the IP filter rule. |
 
 ## Template references
 

arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep

@@ -34,10 +34,10 @@ resource migrationConfiguration 'Microsoft.ServiceBus/namespaces/migrationConfig
 }
 
 @description('The name of the migration configuration.')
-output migrationConfigurationName string = migrationConfiguration.name
+output name string = migrationConfiguration.name
 
 @description('The Resource ID of the migration configuration')
-output migrationConfigurationResourceId string = migrationConfiguration.id
+output resourceId string = migrationConfiguration.id
 
 @description('The name of the Resource Group the migration configuration was created in.')
-output migrationConfigurationResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md

@@ -22,9 +22,9 @@ This module deploys a migration configuration for a service bus namespace
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `migrationConfigurationName` | string | The name of the migration configuration. |
-| `migrationConfigurationResourceGroup` | string | The name of the Resource Group the migration configuration was created in. |
-| `migrationConfigurationResourceId` | string | The Resource ID of the migration configuration |
+| `name` | string | The name of the migration configuration. |
+| `resourceGroupName` | string | The name of the Resource Group the migration configuration was created in. |
+| `resourceId` | string | The Resource ID of the migration configuration |
 
 ## Template references
 

arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep

@@ -40,10 +40,10 @@ resource authorizationRule 'Microsoft.ServiceBus/namespaces/queues/authorization
 }
 
 @description('The name of the authorization rule.')
-output authorizationRuleName string = authorizationRule.name
+output name string = authorizationRule.name
 
 @description('The Resource ID of the authorization rule.')
-output authorizationRuleResourceId string = authorizationRule.id
+output resourceId string = authorizationRule.id
 
 @description('The name of the Resource Group the authorization rule was created in.')
-output authorizationRuleResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md

@@ -22,9 +22,9 @@ This module deploys an authorization rule for a service bus namespace queue.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `authorizationRuleName` | string | The name of the authorization rule. |
-| `authorizationRuleResourceGroup` | string | The name of the Resource Group the authorization rule was created in. |
-| `authorizationRuleResourceId` | string | The Resource ID of the authorization rule. |
+| `name` | string | The name of the authorization rule. |
+| `resourceGroupName` | string | The name of the Resource Group the authorization rule was created in. |
+| `resourceId` | string | The Resource ID of the authorization rule. |
 
 ## Template references
 

arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep

@@ -140,10 +140,10 @@ module queue_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in r
 }]
 
 @description('The name of the deployed queue')
-output queueName string = queue.name
+output name string = queue.name
 
 @description('The resource ID of the deployed queue')
-output queueResourceId string = queue.id
+output resourceId string = queue.id
 
 @description('The resource group of the deployed queue')
-output queueResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.ServiceBus/namespaces/queues/readme.md

@@ -60,13 +60,13 @@ This module deploys a queue for a service bus namespace.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `queueName` | string | The name of the deployed queue |
-| `queueResourceGroup` | string | The resource group of the deployed queue |
-| `queueResourceId` | string | The resource ID of the deployed queue |
+| `name` | string | The name of the deployed queue |
+| `resourceGroupName` | string | The resource group of the deployed queue |
+| `resourceId` | string | The resource ID of the deployed queue |
 
 ## Template references
 
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
 - [Namespaces/Queues](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ServiceBus/2021-06-01-preview/namespaces/queues)
 - [Namespaces/Queues/Authorizationrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ServiceBus/2017-04-01/namespaces/queues/authorizationRules)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.ServiceBus/namespaces/readme.md

@@ -142,9 +142,9 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `serviceBusNamespaceName` | string | The name of the deployed service bus namespace |
-| `serviceBusNamespaceResourceGroup` | string | The resource group of the deployed service bus namespace |
-| `serviceBusNamespaceResourceId` | string | The resource ID of the deployed service bus namespace |
+| `name` | string | The name of the deployed service bus namespace |
+| `resourceGroupName` | string | The resource group of the deployed service bus namespace |
+| `resourceId` | string | The resource ID of the deployed service bus namespace |
 | `systemAssignedPrincipalId` | string | The principal ID of the system assigned identity. |
 
 ## Template references
@@ -161,4 +161,4 @@ You can specify multiple user assigned identities to a resource by providing add
 - [Namespaces/Virtualnetworkrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ServiceBus/2018-01-01-preview/namespaces/virtualnetworkrules)
 - [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints)
 - [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints/privateDnsZoneGroups)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep

@@ -30,10 +30,10 @@ resource virtualNetworkRule 'Microsoft.ServiceBus/namespaces/virtualNetworkRules
 }
 
 @description('The name of the virtual network rule.')
-output virtualNetworkRuleName string = virtualNetworkRule.name
+output name string = virtualNetworkRule.name
 
 @description('The Resource ID of the virtual network rule.')
-output virtualNetworkRuleResourceId string = virtualNetworkRule.id
+output resourceId string = virtualNetworkRule.id
 
 @description('The name of the Resource Group the virtual network rule was created in.')
-output virtualNetworkRuleResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md

@@ -21,9 +21,9 @@ This module deploys a virtual network rule for a service bus namespace.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `virtualNetworkRuleName` | string | The name of the virtual network rule. |
-| `virtualNetworkRuleResourceGroup` | string | The name of the Resource Group the virtual network rule was created in. |
-| `virtualNetworkRuleResourceId` | string | The Resource ID of the virtual network rule. |
+| `name` | string | The name of the virtual network rule. |
+| `resourceGroupName` | string | The name of the Resource Group the virtual network rule was created in. |
+| `resourceId` | string | The Resource ID of the virtual network rule. |
 
 ## Template references
 

arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep

@@ -37,10 +37,10 @@ resource administrator 'Microsoft.Sql/managedInstances/administrators@2021-02-01
 }
 
 @description('The name of the deployed managed instance')
-output administratorName string = administrator.name
+output name string = administrator.name
 
 @description('The resource ID of the deployed managed instance')
-output administratorResourceId string = administrator.id
+output resourceId string = administrator.id
 
 @description('The resource group of the deployed managed instance')
-output administratorResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Sql/managedInstances/administrators/readme.md

@@ -23,9 +23,9 @@ This module deploys an administrator for the SQL managed instance
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `administratorName` | string | The name of the deployed managed instance |
-| `administratorResourceGroup` | string | The resource group of the deployed managed instance |
-| `administratorResourceId` | string | The resource ID of the deployed managed instance |
+| `name` | string | The name of the deployed managed instance |
+| `resourceGroupName` | string | The resource group of the deployed managed instance |
+| `resourceId` | string | The resource ID of the deployed managed instance |
 
 ## Template references
 

arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep

@@ -47,10 +47,10 @@ resource backupLongTermRetentionPolicy 'Microsoft.Sql/managedInstances/databases
 }
 
 @description('The name of the deployed database backup long-term retention policy')
-output backupLongTermRetentionPolicyName string = backupLongTermRetentionPolicy.name
+output name string = backupLongTermRetentionPolicy.name
 
 @description('The resource ID of the deployed database backup long-term retention policy')
-output backupLongTermRetentionPolicyResourceId string = backupLongTermRetentionPolicy.id
+output resourceId string = backupLongTermRetentionPolicy.id
 
 @description('The resource group of the deployed database backup long-term retention policy')
-output backupLongTermRetentionPolicyResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md

@@ -25,9 +25,9 @@ This module deploys a backup long-term retention policies for SQL Managed Instan
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `backupLongTermRetentionPolicyName` | string | The name of the deployed database backup long-term retention policy |
-| `backupLongTermRetentionPolicyResourceGroup` | string | The resource group of the deployed database backup long-term retention policy |
-| `backupLongTermRetentionPolicyResourceId` | string | The resource ID of the deployed database backup long-term retention policy |
+| `name` | string | The name of the deployed database backup long-term retention policy |
+| `resourceGroupName` | string | The resource group of the deployed database backup long-term retention policy |
+| `resourceId` | string | The resource ID of the deployed database backup long-term retention policy |
 
 ## Template references
 

arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep

@@ -35,10 +35,10 @@ resource backupShortTermRetentionPolicy 'Microsoft.Sql/managedInstances/database
 }
 
 @description('The name of the deployed database backup short-term retention policy')
-output backupShortTermRetentionPolicyName string = backupShortTermRetentionPolicy.name
+output name string = backupShortTermRetentionPolicy.name
 
 @description('The resource ID of the deployed database backup short-term retention policy')
-output backupShortTermRetentionPolicyResourceId string = backupShortTermRetentionPolicy.id
+output resourceId string = backupShortTermRetentionPolicy.id
 
 @description('The resource group of the deployed database backup short-term retention policy')
-output backupShortTermRetentionPolicyResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md

@@ -23,9 +23,9 @@ This module deploys a backup short-term retention policies for SQL Managed Insta
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `backupShortTermRetentionPolicyName` | string | The name of the deployed database backup short-term retention policy |
-| `backupShortTermRetentionPolicyResourceGroup` | string | The resource group of the deployed database backup short-term retention policy |
-| `backupShortTermRetentionPolicyResourceId` | string | The resource ID of the deployed database backup short-term retention policy |
+| `name` | string | The name of the deployed database backup short-term retention policy |
+| `resourceGroupName` | string | The resource group of the deployed database backup short-term retention policy |
+| `resourceId` | string | The resource ID of the deployed database backup short-term retention policy |
 
 ## Template references
 

arm/Microsoft.Sql/managedInstances/databases/deploy.bicep

@@ -177,10 +177,10 @@ module database_backupLongTermRetentionPolicy 'backupLongTermRetentionPolicies/d
 }
 
 @description('The name of the deployed database')
-output databaseName string = database.name
+output name string = database.name
 
 @description('The resource ID of the deployed database')
-output databaseResourceId string = database.id
+output resourceId string = database.id
 
 @description('The resource group the database was deployed into')
-output databaseResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Sql/managedInstances/databases/readme.md

@@ -66,9 +66,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `databaseName` | string | The name of the deployed database |
-| `databaseResourceGroup` | string | The resource group the database was deployed into |
-| `databaseResourceId` | string | The resource ID of the deployed database |
+| `name` | string | The name of the deployed database |
+| `resourceGroupName` | string | The resource group the database was deployed into |
+| `resourceId` | string | The resource ID of the deployed database |
 
 ## Template references
 

arm/Microsoft.Sql/managedInstances/deploy.bicep

@@ -310,7 +310,7 @@ module managedInstance_encryptionProtector 'encryptionProtector/deploy.bicep' =
   name: '${uniqueString(deployment().name, location)}-SqlMi-EncryProtector'
   params: {
     managedInstanceName: managedInstance.name
-    serverKeyName: contains(encryptionProtectorObj, 'serverKeyName') ? encryptionProtectorObj.serverKeyName : managedInstance_key[0].outputs.keyName
+    serverKeyName: contains(encryptionProtectorObj, 'serverKeyName') ? encryptionProtectorObj.serverKeyName : managedInstance_key[0].outputs.name
     name: contains(encryptionProtectorObj, 'name') ? encryptionProtectorObj.serverKeyType : 'current'
     serverKeyType: contains(encryptionProtectorObj, 'serverKeyType') ? encryptionProtectorObj.serverKeyType : 'ServiceManaged'
     autoRotationEnabled: contains(encryptionProtectorObj, 'autoRotationEnabled') ? encryptionProtectorObj.autoRotationEnabled : true
@@ -328,13 +328,13 @@ module managedInstance_administrator 'administrators/deploy.bicep' = if (!empty(
 }
 
 @description('The name of the deployed managed instance')
-output managedInstanceName string = managedInstance.name
+output name string = managedInstance.name
 
 @description('The resource ID of the deployed managed instance')
-output managedInstanceResourceId string = managedInstance.id
+output resourceId string = managedInstance.id
 
 @description('The resource group of the deployed managed instance')
-output managedInstanceResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(managedInstance.identity, 'principalId') ? managedInstance.identity.principalId : ''