Cleaned up compute modules & added output descriptions

arm/Microsoft.Compute/availabilitySets/deploy.bicep

@@ -45,7 +45,7 @@ resource availabilitySet 'Microsoft.Compute/availabilitySets@2021-04-01' = {
   properties: {
     platformFaultDomainCount: availabilitySetFaultDomain
     platformUpdateDomainCount: availabilitySetUpdateDomain
-    proximityPlacementGroup: (empty(proximityPlacementGroupId) ? json('null') : proximityPlacementGroupId)
+    proximityPlacementGroup: !empty(proximityPlacementGroupId) ? proximityPlacementGroupId : null
   }
   sku: {
     name: availabilitySetSku
@@ -56,7 +56,7 @@ resource availabilitySet_lock 'Microsoft.Authorization/locks@2016-09-01' = if (l
   name: '${availabilitySet.name}-${lock}-lock'
   properties: {
     level: lock
-    notes: (lock == 'CanNotDelete') ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.'
+    notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.'
   }
   scope: availabilitySet
 }
@@ -69,6 +69,10 @@ module availabilitySet_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, i
   }
 }]
 
+@description('The resource group the availability set was deployed into')
 output availabilitySetResourceName string = availabilitySet.name
+
+@description('The resourceId of the availability set')
 output availabilitySetResourceId string = availabilitySet.id
+@description('The name of the availability set')
 output availabilitySetResourceGroup string = resourceGroup().name

arm/Microsoft.Compute/availabilitySets/readme.md

@@ -66,11 +66,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 ## Outputs
 
-| Output Name | Type |
-| :-- | :-- |
-| `availabilitySetResourceGroup` | string |
-| `availabilitySetResourceId` | string |
-| `availabilitySetResourceName` | string |
+| Output Name | Type | Description |
+| :-- | :-- | :-- |
+| `availabilitySetResourceGroup` | string | The name of the availability set |
+| `availabilitySetResourceId` | string | The resourceId of the availability set |
+| `availabilitySetResourceName` | string | The resource group the availability set was deployed into |
 
 ## Template references
 

arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep

@@ -19,15 +19,13 @@ param tags object = {}
 @description('Optional. Customer Usage Attribution id (GUID). This GUID must be previously registered')
 param cuaId string = ''
 
-var keyVaultName = last(split(keyVaultId, '/'))
-
 module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   name: 'pid-${cuaId}'
   params: {}
 }
 
 resource keyVaultAccessPolicies 'Microsoft.KeyVault/vaults/accessPolicies@2019-09-01' = {
-  name: '${keyVaultName}/add'
+  name: '${last(split(keyVaultId, '/'))}/add'
   properties: {
     accessPolicies: [
       {
@@ -72,7 +70,17 @@ module diskEncryptionSet_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment,
   }
 }]
 
+@description('The resourceId of the disk encryption set')
 output diskEncryptionSetResourceId string = diskEncryptionSet.id
+
+@description('The name of the disk encryption set')
+output diskEncryptionSetName string = diskEncryptionSet.name
+
+@description('The principal Id of the disk encryption set')
 output principalId string = reference('Microsoft.Compute/diskEncryptionSets/${diskEncryptionSetName}', '2020-12-01', 'Full').identity.principalId
-output keyVaultName string = keyVaultName
+
+@description('The name of the key vault with the disk encryption key')
+output keyVaultName string = last(split(keyVaultId, '/'))
+
+@description('The resource group the disk encryption set was deployed into')
 output diskEncryptionResourceGroup string = resourceGroup().name

arm/Microsoft.Compute/diskEncryptionSets/readme.md

@@ -70,12 +70,13 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 ## Outputs
 
-| Output Name | Type |
-| :-- | :-- |
-| `diskEncryptionResourceGroup` | string |
-| `diskEncryptionSetResourceId` | string |
-| `keyVaultName` | string |
-| `principalId` | string |
+| Output Name | Type | Description |
+| :-- | :-- | :-- |
+| `diskEncryptionResourceGroup` | string | The resource group the disk encryption set was deployed into |
+| `diskEncryptionSetName` | string | The name of the disk encryption set |
+| `diskEncryptionSetResourceId` | string | The resourceId of the disk encryption set |
+| `keyVaultName` | string | The name of the key vault with the disk encryption key |
+| `principalId` | string | The principal Id of the disk encryption set |
 
 ## Template references
 

arm/Microsoft.Compute/images/deploy.bicep

@@ -63,6 +63,11 @@ module image_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in r
   }
 }]
 
+@description('The resourceId of the image')
 output imageResourceId string = image.id
+
+@description('The resource group the image was deployed into')
 output imageResourceGroup string = resourceGroup().name
+
+@description('The name of the image')
 output imageName string = image.name

arm/Microsoft.Compute/images/readme.md

@@ -73,11 +73,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 ## Outputs
 
-| Output Name | Type |
-| :-- | :-- |
-| `imageName` | string |
-| `imageResourceGroup` | string |
-| `imageResourceId` | string |
+| Output Name | Type | Description |
+| :-- | :-- | :-- |
+| `imageName` | string | The name of the image |
+| `imageResourceGroup` | string | The resource group the image was deployed into |
+| `imageResourceId` | string | The resourceId of the image |
 
 ## Template references
 

arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep

@@ -46,7 +46,7 @@ resource proximityPlacementGroup_lock 'Microsoft.Authorization/locks@2016-09-01'
   name: '${proximityPlacementGroup.name}-${lock}-lock'
   properties: {
     level: lock
-    notes: (lock == 'CanNotDelete') ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.'
+    notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.'
   }
   scope: proximityPlacementGroup
 }
@@ -59,6 +59,11 @@ module proximityPlacementGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssig
   }
 }]
 
-output proximityPlacementGroupResourceName string = proximityPlacementGroup.name
+@description('The name of the proximity placement group')
+output proximityPlacementGroupName string = proximityPlacementGroup.name
+
+@description('The resourceId the proximity placement group')
 output proximityPlacementGroupResourceId string = proximityPlacementGroup.id
+
+@description('The resource group the proximity placement group was deployed into')
 output proximityPlacementGroupResourceGroup string = resourceGroup().name

arm/Microsoft.Compute/proximityPlacementGroups/readme.md

@@ -63,11 +63,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 ## Outputs
 
-| Output Name | Type |
-| :-- | :-- |
-| `proximityPlacementGroupResourceGroup` | string |
-| `proximityPlacementGroupResourceId` | string |
-| `proximityPlacementGroupResourceName` | string |
+| Output Name | Type | Description |
+| :-- | :-- | :-- |
+| `proximityPlacementGroupName` | string | The name of the proximity placement group |
+| `proximityPlacementGroupResourceGroup` | string | The resource group the proximity placement group was deployed into |
+| `proximityPlacementGroupResourceId` | string | The resourceId the proximity placement group |
 
 ## Template references