feat: add depends_on service principal in role assignments

ishabakeh · ishabakeh · commit cf294801d3f8 · 2023-11-23T16:57:07.000+01:00
diff --git a/modules/meshcloud-metering-service-principal/module.tf b/modules/meshcloud-metering-service-principal/module.tf
@@ -53,7 +53,7 @@ resource "azurerm_role_assignment" "meshcloud_metering" {
   scope                = var.scope
   role_definition_name = "Cost Management Reader"
   principal_id         = azuread_service_principal.meshcloud_metering.id
-  depends_on           = [azuread_application.meshcloud_metering]
+  depends_on           = [azuread_service_principal.meshcloud_metering]
 }
 
 
diff --git a/modules/meshcloud-replicator-service-principal/module.tf b/modules/meshcloud-replicator-service-principal/module.tf
@@ -176,7 +176,7 @@ resource "azurerm_role_assignment" "meshcloud_replicator" {
   scope              = var.scope
   role_definition_id = azurerm_role_definition.meshcloud_replicator.role_definition_resource_id
   principal_id       = azuread_service_principal.meshcloud_replicator.id
-  depends_on         = [azuread_application.meshcloud_replicator]
+  depends_on         = [azuread_service_principal.meshcloud_replicator]
 }
 
 //---------------------------------------------------------------------------
diff --git a/modules/uami-blueprint-user-principal/module.tf b/modules/uami-blueprint-user-principal/module.tf
@@ -30,7 +30,7 @@ resource "azurerm_role_assignment" "service_principal_pw" {
   principal_id         = azuread_service_principal.uami_blueprint_principal.id
   scope                = "/subscriptions/${var.subscriptions[count.index]}"
   role_definition_name = "Contributor"
-  depends_on = [ azuread_application.uami_blueprint_principal ]
+  depends_on = [azuread_service_principal.uami_blueprint_principal]
 }
 
 # facilitate migration from v0.1.0 of the module

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ resource "azurerm_role_assignment" "meshcloud_metering" {`
`53`	`53`	`scope = var.scope`
`54`	`54`	`role_definition_name = "Cost Management Reader"`
`55`	`55`	`principal_id = azuread_service_principal.meshcloud_metering.id`
`56`		`- depends_on = [azuread_application.meshcloud_metering]`
	`56`	`+ depends_on = [azuread_service_principal.meshcloud_metering]`
`57`	`57`	`}`
`58`	`58`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ resource "azurerm_role_assignment" "meshcloud_replicator" {`
`176`	`176`	`scope = var.scope`
`177`	`177`	`role_definition_id = azurerm_role_definition.meshcloud_replicator.role_definition_resource_id`
`178`	`178`	`principal_id = azuread_service_principal.meshcloud_replicator.id`
`179`		`- depends_on = [azuread_application.meshcloud_replicator]`
	`179`	`+ depends_on = [azuread_service_principal.meshcloud_replicator]`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`//---------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ resource "azurerm_role_assignment" "service_principal_pw" {`
`30`	`30`	`principal_id = azuread_service_principal.uami_blueprint_principal.id`
`31`	`31`	`scope = "/subscriptions/${var.subscriptions[count.index]}"`
`32`	`32`	`role_definition_name = "Contributor"`
`33`		`- depends_on = [ azuread_application.uami_blueprint_principal ]`
	`33`	`+ depends_on = [azuread_service_principal.uami_blueprint_principal]`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`# facilitate migration from v0.1.0 of the module`