Skip to content

chore: principal_type = "ServicePrincipal" #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
florianow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: principal_type = "ServicePrincipal" #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions modules/azure/aks/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,16 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
}

resource "azurerm_role_assignment" "existing_principals" {
for_each = var.existing_principal_ids

for_each = var.existing_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = each.value
scope = var.scope
}

resource "azurerm_role_assignment" "created_principal" {
count = var.create_service_principal_name != null ? 1 : 0

count = var.create_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.scope
Expand Down Expand Up @@ -193,50 +193,50 @@ resource "azurerm_role_definition" "buildingblock_landingzone_to_hub" {
}

resource "azurerm_role_assignment" "existing_principals_hub" {
for_each = var.existing_hub_principal_ids

for_each = var.existing_hub_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
description = azurerm_role_definition.buildingblock_deploy_hub.description
principal_id = each.value
scope = var.hub_scope
}

resource "azurerm_role_assignment" "created_principal_hub" {
count = var.create_hub_service_principal_name != null ? 1 : 0

count = var.create_hub_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
description = azurerm_role_definition.buildingblock_deploy_hub.description
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
scope = var.hub_scope
}

resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
for_each = var.existing_hub_principal_ids

for_each = var.existing_hub_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
principal_id = each.value
scope = var.scope
}

resource "azurerm_role_assignment" "created_principal_hub_to_landingzone" {
count = var.create_hub_service_principal_name != null ? 1 : 0

count = var.create_hub_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
scope = var.scope
}

resource "azurerm_role_assignment" "existing_principals_landingzone_to_hub" {
for_each = var.existing_principal_ids

for_each = var.existing_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
principal_id = each.value
scope = var.hub_scope
}

resource "azurerm_role_assignment" "created_principal_landingzone_to_hub" {
count = var.create_service_principal_name != null ? 1 : 0

count = var.create_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.hub_scope
Expand Down
1 change: 1 addition & 0 deletions modules/azure/azure-bastion/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
resource "azurerm_role_assignment" "buildingblock_deploy" {
for_each = var.principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = each.value
scope = var.scope
Expand Down
2 changes: 2 additions & 0 deletions modules/azure/azure-virtual-machine/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
resource "azurerm_role_assignment" "existing_principals" {
for_each = var.existing_principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = each.value
scope = var.scope
Expand All @@ -106,6 +107,7 @@ resource "azurerm_role_assignment" "existing_principals" {
resource "azurerm_role_assignment" "created_principal" {
count = var.create_service_principal_name != null ? 1 : 0

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.scope
Expand Down
2 changes: 1 addition & 1 deletion modules/azure/budget-alert/backplane/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ No modules.

| Name | Description |
|------|-------------|
| <a name="output_application_password"></a> [application\_password](#output\_application\_password) | Information about the created application password (excludes the actual password value for security). |
| <a name="output_application_password"></a> [application\_password](#output\_application\_password) | Information about the created application password including the password value. |
| <a name="output_created_application"></a> [created\_application](#output\_created\_application) | Information about the created Azure AD application. |
| <a name="output_created_service_principal"></a> [created\_service\_principal](#output\_created\_service\_principal) | Information about the created service principal. |
| <a name="output_documentation_md"></a> [documentation\_md](#output\_documentation\_md) | Markdown documentation with information about the Budget Alert building block backplane |
Expand Down
2 changes: 2 additions & 0 deletions modules/azure/budget-alert/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ resource "azurerm_role_assignment" "existing_principals" {
for_each = var.existing_principal_ids

role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_type = "ServicePrincipal"
principal_id = each.value
scope = var.scope
}
Expand All @@ -63,6 +64,7 @@ resource "azurerm_role_assignment" "created_principal" {
count = var.create_service_principal_name != null ? 1 : 0

role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_type = "ServicePrincipal"
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.scope
}
Expand Down
3 changes: 2 additions & 1 deletion modules/azure/budget-alert/backplane/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ output "application_password" {
value = var.create_service_principal_name != null && var.workload_identity_federation == null ? {
key_id = azuread_application_password.buildingblock_deploy[0].key_id
display_name = azuread_application_password.buildingblock_deploy[0].display_name
value = azuread_application_password.buildingblock_deploy[0].value
} : null
description = "Information about the created application password (excludes the actual password value for security)."
description = "Information about the created application password including the password value."
sensitive = true
}

Expand Down
8 changes: 8 additions & 0 deletions modules/azure/container-registry/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
resource "azurerm_role_assignment" "existing_principals" {
for_each = var.existing_principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = each.value
scope = var.scope
Expand All @@ -157,6 +158,7 @@ resource "azurerm_role_assignment" "existing_principals" {
resource "azurerm_role_assignment" "created_principal" {
count = var.create_service_principal_name != null ? 1 : 0

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.scope
Expand Down Expand Up @@ -209,6 +211,7 @@ resource "azurerm_role_definition" "buildingblock_landingzone_to_hub" {
resource "azurerm_role_assignment" "existing_principals_hub" {
for_each = var.existing_hub_principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
description = azurerm_role_definition.buildingblock_deploy_hub.description
principal_id = each.value
Expand All @@ -218,6 +221,7 @@ resource "azurerm_role_assignment" "existing_principals_hub" {
resource "azurerm_role_assignment" "created_principal_hub" {
count = var.create_hub_service_principal_name != null ? 1 : 0

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
description = azurerm_role_definition.buildingblock_deploy_hub.description
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
Expand All @@ -227,6 +231,7 @@ resource "azurerm_role_assignment" "created_principal_hub" {
resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
for_each = var.existing_hub_principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
principal_id = each.value
scope = var.scope
Expand All @@ -235,6 +240,7 @@ resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
resource "azurerm_role_assignment" "created_principal_hub_to_landingzone" {
count = var.create_hub_service_principal_name != null ? 1 : 0

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
scope = var.scope
Expand All @@ -243,6 +249,7 @@ resource "azurerm_role_assignment" "created_principal_hub_to_landingzone" {
resource "azurerm_role_assignment" "existing_principals_landingzone_to_hub" {
for_each = var.existing_principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
principal_id = each.value
scope = var.hub_scope
Expand All @@ -251,6 +258,7 @@ resource "azurerm_role_assignment" "existing_principals_landingzone_to_hub" {
resource "azurerm_role_assignment" "created_principal_landingzone_to_hub" {
count = var.create_service_principal_name != null ? 1 : 0

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.hub_scope
Expand Down
32 changes: 16 additions & 16 deletions modules/azure/key-vault/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,16 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
}

resource "azurerm_role_assignment" "existing_principals" {
for_each = var.existing_principal_ids

for_each = var.existing_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = each.value
scope = var.scope
}

resource "azurerm_role_assignment" "created_principal" {
count = var.create_service_principal_name != null ? 1 : 0

count = var.create_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.scope
Expand Down Expand Up @@ -193,50 +193,50 @@ resource "azurerm_role_definition" "buildingblock_landingzone_to_hub" {
}

resource "azurerm_role_assignment" "existing_principals_hub" {
for_each = var.existing_hub_principal_ids

for_each = var.existing_hub_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
description = azurerm_role_definition.buildingblock_deploy_hub.description
principal_id = each.value
scope = var.hub_scope
}

resource "azurerm_role_assignment" "created_principal_hub" {
count = var.create_hub_service_principal_name != null ? 1 : 0

count = var.create_hub_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
description = azurerm_role_definition.buildingblock_deploy_hub.description
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
scope = var.hub_scope
}

resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
for_each = var.existing_hub_principal_ids

for_each = var.existing_hub_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
principal_id = each.value
scope = var.scope
}

resource "azurerm_role_assignment" "created_principal_hub_to_landingzone" {
count = var.create_hub_service_principal_name != null ? 1 : 0

count = var.create_hub_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
scope = var.scope
}

resource "azurerm_role_assignment" "existing_principals_landingzone_to_hub" {
for_each = var.existing_principal_ids

for_each = var.existing_principal_ids
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
principal_id = each.value
scope = var.hub_scope
}

resource "azurerm_role_assignment" "created_principal_landingzone_to_hub" {
count = var.create_service_principal_name != null ? 1 : 0

count = var.create_service_principal_name != null ? 1 : 0
principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.hub_scope
Expand Down
1 change: 1 addition & 0 deletions modules/azure/postgresql/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
resource "azurerm_role_assignment" "buildingblock_deploy" {
for_each = var.principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = each.value
scope = var.scope
Expand Down
1 change: 1 addition & 0 deletions modules/azure/spoke-network/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ resource "azurerm_role_definition" "buildingblock_deploy_hub" {
resource "azurerm_role_assignment" "buildingblock_deploy_hub" {
for_each = var.principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
description = azurerm_role_definition.buildingblock_deploy_hub.description
principal_id = each.key
Expand Down
2 changes: 2 additions & 0 deletions modules/azure/storage-account/backplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
resource "azurerm_role_assignment" "existing_principals" {
for_each = var.existing_principal_ids

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = each.value
scope = var.scope
Expand All @@ -81,6 +82,7 @@ resource "azurerm_role_assignment" "existing_principals" {
resource "azurerm_role_assignment" "created_principal" {
count = var.create_service_principal_name != null ? 1 : 0

principal_type = "ServicePrincipal"
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
scope = var.scope
Expand Down
Loading