Skip to content

Commit 914d1fa

Browse files
committed
chore: remove redundant user administrator role for au
1 parent f07dd72 commit 914d1fa

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v0.13.3]
11+
12+
### Changed
13+
14+
- Remove User Administrator role assignment for replicator in administrative units.
15+
1016
## [v0.13.2]
1117

1218
### Changed
@@ -119,7 +125,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
119125

120126
- Initial Release
121127

122-
[unreleased]: https://github.com/meshcloud/terraform-azure-meshplatform/compare/v0.13.2...HEAD
128+
[unreleased]: https://github.com/meshcloud/terraform-azure-meshplatform/compare/v0.13.3...HEAD
129+
[v0.13.3]: https://github.com/meshcloud/terraform-azure-meshplatform/releases/tag/v0.13.3
123130
[v0.13.2]: https://github.com/meshcloud/terraform-azure-meshplatform/releases/tag/v0.13.2
124131
[v0.13.1]: https://github.com/meshcloud/terraform-azure-meshplatform/releases/tag/v0.13.1
125132
[v0.13.0]: https://github.com/meshcloud/terraform-azure-meshplatform/releases/tag/v0.13.0

modules/meshcloud-replicator-service-principal/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ No modules.
1717
|------|------|
1818
| [azuread_administrative_unit.meshcloud_replicator_au](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/administrative_unit) | resource |
1919
| [azuread_administrative_unit_role_member.groups_admin_assignment](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/administrative_unit_role_member) | resource |
20-
| [azuread_administrative_unit_role_member.user_admin_assignment](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/administrative_unit_role_member) | resource |
2120
| [azuread_app_role_assignment.meshcloud_replicator-administrativeunit](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/app_role_assignment) | resource |
2221
| [azuread_app_role_assignment.meshcloud_replicator-directory](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/app_role_assignment) | resource |
2322
| [azuread_app_role_assignment.meshcloud_replicator-group](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/app_role_assignment) | resource |
@@ -27,7 +26,6 @@ No modules.
2726
| [azuread_application_federated_identity_credential.meshcloud_replicator](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/application_federated_identity_credential) | resource |
2827
| [azuread_application_password.application_pw](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/application_password) | resource |
2928
| [azuread_directory_role.groups_administrator](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/directory_role) | resource |
30-
| [azuread_directory_role.user_administrator](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/directory_role) | resource |
3129
| [azuread_service_principal.meshcloud_replicator](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/resources/service_principal) | resource |
3230
| [azurerm_management_group_policy_assignment.privilege-escalation-prevention](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/management_group_policy_assignment) | resource |
3331
| [azurerm_policy_definition.privilege_escalation_prevention](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/policy_definition) | resource |

modules/meshcloud-replicator-service-principal/module.tf

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -329,25 +329,14 @@ There is an issue when assigning the replicator a custom role in the AU scope, w
329329
330330
See https://github.com/hashicorp/terraform-provider-azuread/issues/1546.
331331
332-
For now we assign User Administrator and Groups Administrator roles as that is already restricted to the AU scope.
332+
For now we assign Groups Administrator role as that is already restricted to the AU scope.
333333
*/
334-
resource "azuread_directory_role" "user_administrator" {
335-
count = var.administrative_unit_name == null ? 0 : 1
336-
display_name = "User Administrator"
337-
}
338334

339335
resource "azuread_directory_role" "groups_administrator" {
340336
count = var.administrative_unit_name == null ? 0 : 1
341337
display_name = "Groups Administrator"
342338
}
343339

344-
resource "azuread_administrative_unit_role_member" "user_admin_assignment" {
345-
count = var.administrative_unit_name == null ? 0 : 1
346-
role_object_id = azuread_directory_role.user_administrator[0].object_id
347-
administrative_unit_object_id = azuread_administrative_unit.meshcloud_replicator_au[0].object_id
348-
member_object_id = azuread_service_principal.meshcloud_replicator.object_id
349-
}
350-
351340
resource "azuread_administrative_unit_role_member" "groups_admin_assignment" {
352341
count = var.administrative_unit_name == null ? 0 : 1
353342
role_object_id = azuread_directory_role.groups_administrator[0].object_id

0 commit comments

Comments
 (0)