Skip to content

Commit 309943d

Browse files
committed
bin redundant role assignments
1 parent 9f474a6 commit 309943d

2 files changed

Lines changed: 1 addition & 17 deletions

File tree

modules/azure/storage.tf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,3 @@ resource "azurerm_role_assignment" "alz_storage_container_additional" {
7171
role_definition_name = "Storage Blob Data Owner"
7272
principal_id = each.value
7373
}
74-
75-
# These role assignments are a temporary addition to handle this issue in the Terraform CLI: https://github.com/hashicorp/terraform/issues/36595
76-
# They will be removed once the issue has been resolved
77-
resource "azurerm_role_assignment" "alz_storage_reader" {
78-
for_each = var.create_storage_account ? var.user_assigned_managed_identities : {}
79-
scope = azurerm_storage_account.alz[0].id
80-
role_definition_name = "Reader"
81-
principal_id = azurerm_user_assigned_identity.alz[each.key].principal_id
82-
}
83-
84-
resource "azurerm_role_assignment" "alz_storage_reader_additional" {
85-
for_each = var.create_storage_account ? var.additional_role_assignment_principal_ids : {}
86-
scope = azurerm_storage_account.alz[0].id
87-
role_definition_name = "Reader"
88-
principal_id = each.value
89-
}

modules/file_manipulation/locals.intermediate_root_management_group.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ locals {
1717

1818
# Transform the intermediate root management group in the terraform architecture file to ensure it is marked as existing
1919
locals {
20-
terraform_management_groups_non_root = local.is_terraform_iac_type ? [ for management_group in local.terraform_architecture.management_groups : management_group if management_group.parent_id != null ] : null
20+
terraform_management_groups_non_root = local.is_terraform_iac_type ? [for management_group in local.terraform_architecture.management_groups : management_group if management_group.parent_id != null] : null
2121
terraform_intermediate_root_management_group_updated = local.is_terraform_iac_type ? merge(
2222
local.terraform_intermediate_root_management_group,
2323
{

0 commit comments

Comments
 (0)