feat: update azurem and azuread version

ishabakeh · ishabakeh · commit 4c420bebc424 · 2023-11-23T16:14:14.000+01:00
diff --git a/modules/meshcloud-idp-lookup-service-principal/module.tf b/modules/meshcloud-idp-lookup-service-principal/module.tf
@@ -1,21 +1,21 @@
 terraform {
-  required_version = ">= 1.0"
+  required_version = "> 1.0"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.3.0"
+      version = "3.81.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "2.18.0"
+      version = "2.46.0"
     }
   }
 }
 
 data "azuread_application_published_app_ids" "well_known" {}
 
 data "azuread_service_principal" "msgraph" {
-  application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph
+  client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph
 }
 
 resource "azuread_application" "meshcloud_idp_lookup" {
@@ -50,7 +50,7 @@ resource "azuread_application" "meshcloud_idp_lookup" {
 }
 
 resource "azuread_service_principal" "meshcloud_idp_lookup" {
-  application_id = azuread_application.meshcloud_idp_lookup.application_id
+  client_id = azuread_application.meshcloud_idp_lookup.client_id
 }
 
 resource "azuread_app_role_assignment" "meshcloud_idp_lookup" {
diff --git a/modules/meshcloud-metering-service-principal/module.tf b/modules/meshcloud-metering-service-principal/module.tf
@@ -93,7 +93,7 @@ resource "time_rotating" "replicator_secret_rotation" {
 }
 
 resource "azuread_application_password" "application_pw" {
-  application_object_id = azuread_application.meshcloud_metering.object_id
+  application_id = azuread_application.meshcloud_metering.client_id
   rotate_when_changed = {
     rotation = time_rotating.replicator_secret_rotation.id
   }
diff --git a/modules/meshcloud-replicator-service-principal/module.tf b/modules/meshcloud-replicator-service-principal/module.tf
@@ -71,7 +71,7 @@ resource "azurerm_role_definition" "meshcloud_replicator" {
 data "azuread_application_published_app_ids" "well_known" {}
 
 data "azuread_service_principal" "msgraph" {
-  application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph
+  client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph
 }
 
 //---------------------------------------------------------------------------
diff --git a/modules/meshcloud-sso/module.tf b/modules/meshcloud-sso/module.tf
@@ -1,21 +1,21 @@
 terraform {
-  required_version = ">= 1.0"
+  required_version = "> 1.0"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.3.0"
+      version = "3.81.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "2.18.0"
+      version = "2.46.0"
     }
   }
 }
 
 data "azuread_application_published_app_ids" "well_known" {}
 
 data "azuread_service_principal" "msgraph" {
-  application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph
+  client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph
 }
 
 resource "azuread_application" "meshcloud_sso" {
@@ -44,5 +44,5 @@ resource "azuread_application" "meshcloud_sso" {
 }
 
 resource "azuread_application_password" "meshcloud_sso" {
-  application_object_id = azuread_application.meshcloud_sso.object_id
+  application_id = azuread_application.meshcloud_sso.client_id
 }
diff --git a/modules/uami-blueprint-user-principal/module.tf b/modules/uami-blueprint-user-principal/module.tf
@@ -1,13 +1,13 @@
 terraform {
-  required_version = ">= 1.0"
+  required_version = "> 1.0"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.3.0"
+      version = "3.81.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "2.18.0"
+      version = "2.46.0"
     }
   }
 }
@@ -17,7 +17,7 @@ resource "azuread_application" "uami_blueprint_principal" {
 }
 
 resource "azuread_service_principal" "uami_blueprint_principal" {
-  application_id = azuread_application.uami_blueprint_principal.application_id
+  client_id = azuread_application.uami_blueprint_principal.application_id
 }
 
 resource "azuread_service_principal_password" "service_principal_pw" {

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,21 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = ">= 1.0"`
	`2`	`+ required_version = "> 1.0"`
`3`	`3`	`required_providers {`
`4`	`4`	`azurerm = {`
`5`	`5`	`source = "hashicorp/azurerm"`
`6`		`- version = "3.3.0"`
	`6`	`+ version = "3.81.0"`
`7`	`7`	`}`
`8`	`8`	`azuread = {`
`9`	`9`	`source = "hashicorp/azuread"`
`10`		`- version = "2.18.0"`
	`10`	`+ version = "2.46.0"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`data "azuread_application_published_app_ids" "well_known" {}`
`16`	`16`
`17`	`17`	`data "azuread_service_principal" "msgraph" {`
`18`		`- application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph`
	`18`	`+ client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`resource "azuread_application" "meshcloud_idp_lookup" {`
`@@ -50,7 +50,7 @@ resource "azuread_application" "meshcloud_idp_lookup" {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`resource "azuread_service_principal" "meshcloud_idp_lookup" {`
`53`		`- application_id = azuread_application.meshcloud_idp_lookup.application_id`
	`53`	`+ client_id = azuread_application.meshcloud_idp_lookup.client_id`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`resource "azuread_app_role_assignment" "meshcloud_idp_lookup" {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ resource "time_rotating" "replicator_secret_rotation" {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`resource "azuread_application_password" "application_pw" {`
`96`		`- application_object_id = azuread_application.meshcloud_metering.object_id`
	`96`	`+ application_id = azuread_application.meshcloud_metering.client_id`
`97`	`97`	`rotate_when_changed = {`
`98`	`98`	`rotation = time_rotating.replicator_secret_rotation.id`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ resource "azurerm_role_definition" "meshcloud_replicator" {`
`71`	`71`	`data "azuread_application_published_app_ids" "well_known" {}`
`72`	`72`
`73`	`73`	`data "azuread_service_principal" "msgraph" {`
`74`		`- application_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph`
	`74`	`+ client_id = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`//---------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`terraform {`
`2`		`- required_version = ">= 1.0"`
	`2`	`+ required_version = "> 1.0"`
`3`	`3`	`required_providers {`
`4`	`4`	`azurerm = {`
`5`	`5`	`source = "hashicorp/azurerm"`
`6`		`- version = "3.3.0"`
	`6`	`+ version = "3.81.0"`
`7`	`7`	`}`
`8`	`8`	`azuread = {`
`9`	`9`	`source = "hashicorp/azuread"`
`10`		`- version = "2.18.0"`
	`10`	`+ version = "2.46.0"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
`@@ -17,7 +17,7 @@ resource "azuread_application" "uami_blueprint_principal" {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`resource "azuread_service_principal" "uami_blueprint_principal" {`
`20`		`- application_id = azuread_application.uami_blueprint_principal.application_id`
	`20`	`+ client_id = azuread_application.uami_blueprint_principal.application_id`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`resource "azuread_service_principal_password" "service_principal_pw" {`