Minor module syntax updates (#40)

Author: BernieWhite

bicep/modules/keyvault/v1/main.bicep

@@ -1,19 +1,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+targetScope = 'resourceGroup'
+
 metadata name = 'Key Vault'
 metadata description = 'Create or update an Azure Key Vault.'
 
 @sys.description('The name of the Key Vault.')
 param name string
 
-@sys.description('The Azure region to deploy to.')
 @metadata({
   strongType: 'location'
 })
+@sys.description('The Azure region to deploy to.')
 param location string = resourceGroup().location
 
-@sys.description('The access policies defined for this vault.')
 @metadata({
   example: [
     {
@@ -29,6 +30,7 @@ param location string = resourceGroup().location
     }
   ]
 })
+@sys.description('The access policies defined for this vault.')
 param accessPolicies array = []
 
 @sys.description('Determines if Azure can deploy certificates from this Key Vault.')
@@ -46,9 +48,9 @@ param useSoftDelete bool = true
 @sys.description('Determine if purge protection is enabled on this Key Vault.')
 param usePurgeProtection bool = true
 
-@sys.description('The number of days to retain soft deleted vaults and vault objects.')
 @minValue(7)
 @maxValue(90)
+@sys.description('The number of days to retain soft deleted vaults and vault objects.')
 param softDeleteDays int = 90
 
 @sys.description('Determines if access to the objects granted using RBAC. When true, access policies are ignored.')
@@ -62,23 +64,23 @@ param networkAcls object = {
   virtualNetworkRules: []
 }
 
-@sys.description('The workspace to store audit logs.')
 @metadata({
   strongType: 'Microsoft.OperationalInsights/workspaces'
   example: '/subscriptions/<subscription_id>/resourceGroups/<resource_group>/providers/Microsoft.OperationalInsights/workspaces/<workspace_name>'
 })
+@sys.description('The workspace to store audit logs.')
 param workspaceId string = ''
 
-@sys.description('Tags to apply to the resource.')
 @metadata({
   example: {
     service: '<service_name>'
     env: 'prod'
   }
 })
+@sys.description('Tags to apply to the resource.')
 param tags object = resourceGroup().tags
 
-// Define a Key Vault
+@sys.description('Create or update a Key Vault.')
 resource vault 'Microsoft.KeyVault/vaults@2019-09-01' = {
   name: name
   location: location
@@ -101,11 +103,10 @@ resource vault 'Microsoft.KeyVault/vaults@2019-09-01' = {
   tags: tags
 }
 
-// Configure logging
-resource vaultName_Microsoft_Insights_service 'Microsoft.Insights/diagnosticSettings@2016-09-01' = if (!empty(workspaceId)) {
+@sys.description('Configure audit logs for the Key Vault.')
+resource logs 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = if (!empty(workspaceId)) {
   scope: vault
-  name: 'service'
-  location: location
+  name: 'logs'
   properties: {
     workspaceId: workspaceId
     logs: [

bicep/modules/storage/v1/main.bicep

@@ -1,16 +1,18 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+targetScope = 'resourceGroup'
+
 metadata name = 'Storage Account'
 metadata description = 'Create or update an Storage Account.'
 
 @sys.description('The name of the Storage Account.')
 param name string
 
-@sys.description('The Azure region to deploy to.')
 @metadata({
   strongType: 'location'
 })
+@sys.description('The Azure region to deploy to.')
 param location string = resourceGroup().location
 
 @allowed([
@@ -23,16 +25,16 @@ param sku string = 'Standard_GRS'
 @sys.description('Determines if any containers can be configured with the anonymous access types of blob or container.')
 param allowBlobPublicAccess bool = true
 
-@sys.description('Tags to apply to the resource.')
 @metadata({
   example: {
     service: '<service_name>'
     env: 'prod'
   }
 })
+@sys.description('Tags to apply to the resource.')
 param tags object = resourceGroup().tags
 
-// Define a Storage Account
+@sys.description('Create or update an Storage Account.')
 resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = {
   name: name
   location: location
@@ -55,6 +57,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' = {
   tags: tags
 }
 
+@sys.description('Configure Blob Services for a Storage Account.')
 resource blobServices 'Microsoft.Storage/storageAccounts/blobServices@2019-06-01' = {
   parent: storageAccount
   name: 'default'
@@ -73,6 +76,7 @@ resource blobServices 'Microsoft.Storage/storageAccounts/blobServices@2019-06-01
   }
 }
 
+@sys.description('Configure File Services for a Storage Account.')
 resource fileServices 'Microsoft.Storage/storageAccounts/fileServices@2019-06-01' = {
   parent: storageAccount
   name: 'default'

ps-rule.yaml

@@ -15,8 +15,8 @@ binding:
 
 # Require minimum versions of modules.
 requires:
-  PSRule: '@pre >=2.8.1'
-  PSRule.Rules.Azure: '@pre >=1.26.1'
+  PSRule: '@pre >=2.9.0'
+  PSRule.Rules.Azure: '@pre >=1.28.2'
 
 # Use PSRule for Azure.
 include: