Skip to content

Commit ae45672

Browse files
florianowflorianow
committed
chore: principal_type = "ServicePrincipal"
1 parent 20c23e3 commit ae45672

10 files changed

Lines changed: 51 additions & 33 deletions

File tree

‎modules/azure/aks/backplane/main.tf‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
133133
}
134134

135135
resource "azurerm_role_assignment" "existing_principals" {
136-
for_each = var.existing_principal_ids
137-
136+
for_each = var.existing_principal_ids
137+
principal_type = "ServicePrincipal"
138138
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
139139
principal_id = each.value
140140
scope = var.scope
141141
}
142142

143143
resource "azurerm_role_assignment" "created_principal" {
144-
count = var.create_service_principal_name != null ? 1 : 0
145-
144+
count = var.create_service_principal_name != null ? 1 : 0
145+
principal_type = "ServicePrincipal"
146146
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
147147
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
148148
scope = var.scope
@@ -193,50 +193,50 @@ resource "azurerm_role_definition" "buildingblock_landingzone_to_hub" {
193193
}
194194

195195
resource "azurerm_role_assignment" "existing_principals_hub" {
196-
for_each = var.existing_hub_principal_ids
197-
196+
for_each = var.existing_hub_principal_ids
197+
principal_type = "ServicePrincipal"
198198
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
199199
description = azurerm_role_definition.buildingblock_deploy_hub.description
200200
principal_id = each.value
201201
scope = var.hub_scope
202202
}
203203

204204
resource "azurerm_role_assignment" "created_principal_hub" {
205-
count = var.create_hub_service_principal_name != null ? 1 : 0
206-
205+
count = var.create_hub_service_principal_name != null ? 1 : 0
206+
principal_type = "ServicePrincipal"
207207
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
208208
description = azurerm_role_definition.buildingblock_deploy_hub.description
209209
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
210210
scope = var.hub_scope
211211
}
212212

213213
resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
214-
for_each = var.existing_hub_principal_ids
215-
214+
for_each = var.existing_hub_principal_ids
215+
principal_type = "ServicePrincipal"
216216
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
217217
principal_id = each.value
218218
scope = var.scope
219219
}
220220

221221
resource "azurerm_role_assignment" "created_principal_hub_to_landingzone" {
222-
count = var.create_hub_service_principal_name != null ? 1 : 0
223-
222+
count = var.create_hub_service_principal_name != null ? 1 : 0
223+
principal_type = "ServicePrincipal"
224224
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
225225
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
226226
scope = var.scope
227227
}
228228

229229
resource "azurerm_role_assignment" "existing_principals_landingzone_to_hub" {
230-
for_each = var.existing_principal_ids
231-
230+
for_each = var.existing_principal_ids
231+
principal_type = "ServicePrincipal"
232232
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
233233
principal_id = each.value
234234
scope = var.hub_scope
235235
}
236236

237237
resource "azurerm_role_assignment" "created_principal_landingzone_to_hub" {
238-
count = var.create_service_principal_name != null ? 1 : 0
239-
238+
count = var.create_service_principal_name != null ? 1 : 0
239+
principal_type = "ServicePrincipal"
240240
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
241241
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
242242
scope = var.hub_scope

‎modules/azure/azure-bastion/backplane/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
2626
resource "azurerm_role_assignment" "buildingblock_deploy" {
2727
for_each = var.principal_ids
2828

29+
principal_type = "ServicePrincipal"
2930
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
3031
principal_id = each.value
3132
scope = var.scope

‎modules/azure/azure-virtual-machine/backplane/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
9797
resource "azurerm_role_assignment" "existing_principals" {
9898
for_each = var.existing_principal_ids
9999

100+
principal_type = "ServicePrincipal"
100101
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
101102
principal_id = each.value
102103
scope = var.scope
@@ -106,6 +107,7 @@ resource "azurerm_role_assignment" "existing_principals" {
106107
resource "azurerm_role_assignment" "created_principal" {
107108
count = var.create_service_principal_name != null ? 1 : 0
108109

110+
principal_type = "ServicePrincipal"
109111
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
110112
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
111113
scope = var.scope

‎modules/azure/budget-alert/backplane/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ resource "azurerm_role_assignment" "existing_principals" {
5555
for_each = var.existing_principal_ids
5656

5757
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
58+
principal_type = "ServicePrincipal"
5859
principal_id = each.value
5960
scope = var.scope
6061
}
@@ -63,6 +64,7 @@ resource "azurerm_role_assignment" "created_principal" {
6364
count = var.create_service_principal_name != null ? 1 : 0
6465

6566
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
67+
principal_type = "ServicePrincipal"
6668
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
6769
scope = var.scope
6870
}

‎modules/azure/budget-alert/backplane/outputs.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@ output "application_password" {
5858
value = var.create_service_principal_name != null && var.workload_identity_federation == null ? {
5959
key_id = azuread_application_password.buildingblock_deploy[0].key_id
6060
display_name = azuread_application_password.buildingblock_deploy[0].display_name
61+
value = azuread_application_password.buildingblock_deploy[0].value
6162
} : null
62-
description = "Information about the created application password (excludes the actual password value for security)."
63+
description = "Information about the created application password including the password value."
6364
sensitive = true
6465
}
6566

‎modules/azure/container-registry/backplane/main.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
149149
resource "azurerm_role_assignment" "existing_principals" {
150150
for_each = var.existing_principal_ids
151151

152+
principal_type = "ServicePrincipal"
152153
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
153154
principal_id = each.value
154155
scope = var.scope
@@ -157,6 +158,7 @@ resource "azurerm_role_assignment" "existing_principals" {
157158
resource "azurerm_role_assignment" "created_principal" {
158159
count = var.create_service_principal_name != null ? 1 : 0
159160

161+
principal_type = "ServicePrincipal"
160162
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
161163
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
162164
scope = var.scope
@@ -209,6 +211,7 @@ resource "azurerm_role_definition" "buildingblock_landingzone_to_hub" {
209211
resource "azurerm_role_assignment" "existing_principals_hub" {
210212
for_each = var.existing_hub_principal_ids
211213

214+
principal_type = "ServicePrincipal"
212215
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
213216
description = azurerm_role_definition.buildingblock_deploy_hub.description
214217
principal_id = each.value
@@ -218,6 +221,7 @@ resource "azurerm_role_assignment" "existing_principals_hub" {
218221
resource "azurerm_role_assignment" "created_principal_hub" {
219222
count = var.create_hub_service_principal_name != null ? 1 : 0
220223

224+
principal_type = "ServicePrincipal"
221225
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
222226
description = azurerm_role_definition.buildingblock_deploy_hub.description
223227
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
@@ -227,6 +231,7 @@ resource "azurerm_role_assignment" "created_principal_hub" {
227231
resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
228232
for_each = var.existing_hub_principal_ids
229233

234+
principal_type = "ServicePrincipal"
230235
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
231236
principal_id = each.value
232237
scope = var.scope
@@ -235,6 +240,7 @@ resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
235240
resource "azurerm_role_assignment" "created_principal_hub_to_landingzone" {
236241
count = var.create_hub_service_principal_name != null ? 1 : 0
237242

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

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

261+
principal_type = "ServicePrincipal"
254262
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
255263
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
256264
scope = var.hub_scope

‎modules/azure/key-vault/backplane/main.tf‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
133133
}
134134

135135
resource "azurerm_role_assignment" "existing_principals" {
136-
for_each = var.existing_principal_ids
137-
136+
for_each = var.existing_principal_ids
137+
principal_type = "ServicePrincipal"
138138
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
139139
principal_id = each.value
140140
scope = var.scope
141141
}
142142

143143
resource "azurerm_role_assignment" "created_principal" {
144-
count = var.create_service_principal_name != null ? 1 : 0
145-
144+
count = var.create_service_principal_name != null ? 1 : 0
145+
principal_type = "ServicePrincipal"
146146
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
147147
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
148148
scope = var.scope
@@ -193,50 +193,50 @@ resource "azurerm_role_definition" "buildingblock_landingzone_to_hub" {
193193
}
194194

195195
resource "azurerm_role_assignment" "existing_principals_hub" {
196-
for_each = var.existing_hub_principal_ids
197-
196+
for_each = var.existing_hub_principal_ids
197+
principal_type = "ServicePrincipal"
198198
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
199199
description = azurerm_role_definition.buildingblock_deploy_hub.description
200200
principal_id = each.value
201201
scope = var.hub_scope
202202
}
203203

204204
resource "azurerm_role_assignment" "created_principal_hub" {
205-
count = var.create_hub_service_principal_name != null ? 1 : 0
206-
205+
count = var.create_hub_service_principal_name != null ? 1 : 0
206+
principal_type = "ServicePrincipal"
207207
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
208208
description = azurerm_role_definition.buildingblock_deploy_hub.description
209209
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
210210
scope = var.hub_scope
211211
}
212212

213213
resource "azurerm_role_assignment" "existing_principals_hub_to_landingzone" {
214-
for_each = var.existing_hub_principal_ids
215-
214+
for_each = var.existing_hub_principal_ids
215+
principal_type = "ServicePrincipal"
216216
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
217217
principal_id = each.value
218218
scope = var.scope
219219
}
220220

221221
resource "azurerm_role_assignment" "created_principal_hub_to_landingzone" {
222-
count = var.create_hub_service_principal_name != null ? 1 : 0
223-
222+
count = var.create_hub_service_principal_name != null ? 1 : 0
223+
principal_type = "ServicePrincipal"
224224
role_definition_id = azurerm_role_definition.buildingblock_hub_to_landingzone.role_definition_resource_id
225225
principal_id = azuread_service_principal.buildingblock_deploy_hub[0].object_id
226226
scope = var.scope
227227
}
228228

229229
resource "azurerm_role_assignment" "existing_principals_landingzone_to_hub" {
230-
for_each = var.existing_principal_ids
231-
230+
for_each = var.existing_principal_ids
231+
principal_type = "ServicePrincipal"
232232
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
233233
principal_id = each.value
234234
scope = var.hub_scope
235235
}
236236

237237
resource "azurerm_role_assignment" "created_principal_landingzone_to_hub" {
238-
count = var.create_service_principal_name != null ? 1 : 0
239-
238+
count = var.create_service_principal_name != null ? 1 : 0
239+
principal_type = "ServicePrincipal"
240240
role_definition_id = azurerm_role_definition.buildingblock_landingzone_to_hub.role_definition_resource_id
241241
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
242242
scope = var.hub_scope

‎modules/azure/postgresql/backplane/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
1818
resource "azurerm_role_assignment" "buildingblock_deploy" {
1919
for_each = var.principal_ids
2020

21+
principal_type = "ServicePrincipal"
2122
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
2223
principal_id = each.value
2324
scope = var.scope

‎modules/azure/spoke-network/backplane/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ resource "azurerm_role_definition" "buildingblock_deploy_hub" {
3131
resource "azurerm_role_assignment" "buildingblock_deploy_hub" {
3232
for_each = var.principal_ids
3333

34+
principal_type = "ServicePrincipal"
3435
role_definition_id = azurerm_role_definition.buildingblock_deploy_hub.role_definition_resource_id
3536
description = azurerm_role_definition.buildingblock_deploy_hub.description
3637
principal_id = each.key

‎modules/azure/storage-account/backplane/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ resource "azurerm_role_definition" "buildingblock_deploy" {
7272
resource "azurerm_role_assignment" "existing_principals" {
7373
for_each = var.existing_principal_ids
7474

75+
principal_type = "ServicePrincipal"
7576
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
7677
principal_id = each.value
7778
scope = var.scope
@@ -81,6 +82,7 @@ resource "azurerm_role_assignment" "existing_principals" {
8182
resource "azurerm_role_assignment" "created_principal" {
8283
count = var.create_service_principal_name != null ? 1 : 0
8384

85+
principal_type = "ServicePrincipal"
8486
role_definition_id = azurerm_role_definition.buildingblock_deploy.role_definition_resource_id
8587
principal_id = azuread_service_principal.buildingblock_deploy[0].object_id
8688
scope = var.scope

0 commit comments

Comments
 (0)