From 9c3d80cdcf853ab2d423b66ac2bacb5d4c690488 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Fri, 11 Nov 2022 23:56:16 +0100 Subject: [PATCH 1/3] Added new optional parameter --- modules/Microsoft.Resources/resourceGroups/deploy.bicep | 6 +++++- modules/Microsoft.Resources/resourceGroups/readme.md | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/Microsoft.Resources/resourceGroups/deploy.bicep b/modules/Microsoft.Resources/resourceGroups/deploy.bicep index 461761e354..e1702ca8b2 100644 --- a/modules/Microsoft.Resources/resourceGroups/deploy.bicep +++ b/modules/Microsoft.Resources/resourceGroups/deploy.bicep @@ -20,6 +20,9 @@ param roleAssignments array = [] @description('Optional. Tags of the storage account resource.') param tags object = {} +@description('Optional. The ID of the resource that manages this resource group.') +param managedBy string = '' + @description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') param enableDefaultTelemetry bool = true @@ -36,10 +39,11 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena } } -resource resourceGroup 'Microsoft.Resources/resourceGroups@2019-05-01' = { +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { location: location name: name tags: tags + managedBy: !empty(managedBy) ? managedBy : null properties: {} } diff --git a/modules/Microsoft.Resources/resourceGroups/readme.md b/modules/Microsoft.Resources/resourceGroups/readme.md index 056ed6fef7..390c191101 100644 --- a/modules/Microsoft.Resources/resourceGroups/readme.md +++ b/modules/Microsoft.Resources/resourceGroups/readme.md @@ -17,7 +17,7 @@ This module deploys a resource group. | :-- | :-- | | `Microsoft.Authorization/locks` | [2017-04-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) | | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.Resources/resourceGroups` | [2019-05-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Resources/2019-05-01/resourceGroups) | +| `Microsoft.Resources/resourceGroups` | [2021-04-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Resources/2021-04-01/resourceGroups) | ## Parameters @@ -34,6 +34,7 @@ This module deploys a resource group. | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[deployment().location]` | | Location of the Resource Group. It uses the deployment's location when not provided. | | `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | +| `managedBy` | string | `''` | | The ID of the resource that manages this resource group. | | `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | | `tags` | object | `{object}` | | Tags of the storage account resource. | From c9a89121ad56b1f52729ba3941b6aa32b44e992f Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 20 Dec 2022 18:03:20 +0100 Subject: [PATCH 2/3] Update to latest --- modules/Microsoft.Resources/resourceGroups/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Resources/resourceGroups/deploy.bicep b/modules/Microsoft.Resources/resourceGroups/deploy.bicep index a5bc842efa..a4846473e4 100644 --- a/modules/Microsoft.Resources/resourceGroups/deploy.bicep +++ b/modules/Microsoft.Resources/resourceGroups/deploy.bicep @@ -43,7 +43,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { location: location name: name tags: tags - managedBy: !empty(managedBy) ? managedBy : null + managedBy: !empty(managedBy) ? managedBy : '' properties: {} } From ec55ed76df198230c8ad8f5ad30ed2445fdfa557 Mon Sep 17 00:00:00 2001 From: AlexanderSehr Date: Tue, 20 Dec 2022 18:03:44 +0100 Subject: [PATCH 3/3] Update to latest --- modules/Microsoft.Resources/resourceGroups/deploy.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Resources/resourceGroups/deploy.bicep b/modules/Microsoft.Resources/resourceGroups/deploy.bicep index a4846473e4..f5d6ce8f26 100644 --- a/modules/Microsoft.Resources/resourceGroups/deploy.bicep +++ b/modules/Microsoft.Resources/resourceGroups/deploy.bicep @@ -43,7 +43,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { location: location name: name tags: tags - managedBy: !empty(managedBy) ? managedBy : '' + managedBy: managedBy properties: {} }