feat: update azurem and azuread version, add depends_on to the role assignments

Author: ishabakeh

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

@@ -6,11 +6,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.3.0"
+      version = ">=3.3.0, <4.0.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "2.18.0"
+      version = ">=2.18.0, <3.0.0"
     }
   }
 }
@@ -53,6 +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]
 }
 
 
@@ -78,7 +79,7 @@ resource "azuread_application" "meshcloud_metering" {
 // Create New Enterprise application and associate it with the previously created app
 //---------------------------------------------------------------------------
 resource "azuread_service_principal" "meshcloud_metering" {
-  application_id = azuread_application.meshcloud_metering.application_id
+  client_id = azuread_application.meshcloud_metering.client_id
   feature_tags {
     enterprise = true
   }

modules/meshcloud-metering-service-principal/outputs.tf

@@ -2,7 +2,7 @@ output "credentials" {
   description = "Service Principal application id and object id"
   value = {
     Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_metering.id
-    Application_Client_ID            = azuread_application.meshcloud_metering.application_id
+    Application_Client_ID            = azuread_application.meshcloud_metering.client_id
     Client_Secret                    = "Execute `terraform output metering_client_secret` to see the password"
   }
 }

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

@@ -6,11 +6,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.3.0"
+      version = ">=3.3.0, <4.0.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "2.18.0"
+      version = ">=2.18.0, <3.0.0"
     }
   }
 }
@@ -148,7 +148,7 @@ resource "time_rotating" "replicator_secret_rotation" {
   rotation_days = 365
 }
 resource "azuread_application_password" "application_pw" {
-  application_object_id = azuread_application.meshcloud_replicator.object_id
+  application_id = azuread_application.meshcloud_replicator.client_id
   rotate_when_changed = {
     rotation = time_rotating.replicator_secret_rotation.id
   }
@@ -158,7 +158,7 @@ resource "azuread_application_password" "application_pw" {
 // Create new Enterprise Application and associate it with the previous application
 //---------------------------------------------------------------------------
 resource "azuread_service_principal" "meshcloud_replicator" {
-  application_id = azuread_application.meshcloud_replicator.application_id
+  client_id = azuread_application.meshcloud_replicator.client_id
   feature_tags {
     enterprise = true
   }
@@ -176,6 +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 ]
 }
 
 //---------------------------------------------------------------------------
@@ -185,18 +186,21 @@ resource "azuread_app_role_assignment" "meshcloud_replicator-directory" {
   app_role_id         = data.azuread_service_principal.msgraph.app_role_ids["Directory.Read.All"]
   principal_object_id = azuread_service_principal.meshcloud_replicator.object_id
   resource_object_id  = data.azuread_service_principal.msgraph.object_id
+   depends_on = [ azuread_application.meshcloud_replicator ]
 }
 
 resource "azuread_app_role_assignment" "meshcloud_replicator-group" {
   app_role_id         = data.azuread_service_principal.msgraph.app_role_ids["Group.ReadWrite.All"]
   principal_object_id = azuread_service_principal.meshcloud_replicator.object_id
   resource_object_id  = data.azuread_service_principal.msgraph.object_id
+   depends_on = [ azuread_application.meshcloud_replicator ]
 }
 
 resource "azuread_app_role_assignment" "meshcloud_replicator-user" {
   app_role_id         = data.azuread_service_principal.msgraph.app_role_ids["User.Invite.All"]
   principal_object_id = azuread_service_principal.meshcloud_replicator.object_id
   resource_object_id  = data.azuread_service_principal.msgraph.object_id
+   depends_on = [ azuread_application.meshcloud_replicator ]
 }
 
 

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

@@ -2,7 +2,7 @@ output "credentials" {
   description = "Service Principal application id and object id"
   value = {
     Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_replicator.id
-    Application_Client_ID            = azuread_application.meshcloud_replicator.application_id
+    Application_Client_ID            = azuread_application.meshcloud_replicator.client_id
     Client_Secret                    = "Execute `terraform output replicator_client_secret` to see the password"
   }
 }