feat: upgrade minimum terraform provider versions

JohannesRudolph · JohannesRudolph · commit 79d597cba8d2 · 2024-12-02T13:38:34.000Z
one key change in azurerm is that service principals now need to be
referenced by object_id for assignment instead of by id because
the provider changed the internal format
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Upgraded minimum terraform provider versions
+
 ## [v0.10.0]
 
 ### Added
diff --git a/README.md b/README.md
@@ -172,15 +172,15 @@ Before opening a Pull Request, please do the following:
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.1 |
 | <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) | >=1.13.1 |
-| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=2.46.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.81.0 |
+| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=4.11.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 3.0.2 |
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.5.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.11.0 |
 
 ## Modules
 
diff --git a/main.tf b/main.tf
@@ -3,11 +3,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.81.0"
+      version = ">=4.11.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = ">=2.46.0"
+      version = ">=3.0.2"
     }
     azapi = {
       source  = "Azure/azapi"
diff --git a/modules/meshcloud-mca-service-principal/module.tf b/modules/meshcloud-mca-service-principal/module.tf
@@ -7,11 +7,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.81.0"
+      version = ">=4.11.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = ">=2.46.0"
+      version = ">=3.0.2"
     }
     azapi = {
       source  = "Azure/azapi"
diff --git a/modules/meshcloud-metering-service-principal/README.md b/modules/meshcloud-metering-service-principal/README.md
@@ -4,15 +4,15 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.0 |
-| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=2.46.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.81.0 |
+| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=4.11.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 3.0.2 |
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.5.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.11.0 |
 | <a name="provider_time"></a> [time](#provider\_time) | 0.12.1 |
 
 ## Modules
diff --git a/modules/meshcloud-metering-service-principal/module.tf b/modules/meshcloud-metering-service-principal/module.tf
@@ -6,11 +6,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.81.0"
+      version = ">=4.11.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = ">=2.46.0"
+      version = ">=3.0.2"
     }
   }
 }
@@ -22,7 +22,7 @@ resource "azurerm_role_assignment" "meshcloud_metering" {
   for_each             = toset(var.assignment_scopes)
   scope                = each.key
   role_definition_name = "Cost Management Reader"
-  principal_id         = azuread_service_principal.meshcloud_metering.id
+  principal_id         = azuread_service_principal.meshcloud_metering.object_id
   depends_on           = [azuread_service_principal.meshcloud_metering]
 }
 
diff --git a/modules/meshcloud-metering-service-principal/outputs.tf b/modules/meshcloud-metering-service-principal/outputs.tf
@@ -1,7 +1,7 @@
 output "credentials" {
   description = "Service Principal application id and object id"
   value = {
-    Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_metering.id
+    Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_metering.object_id
     Application_Client_ID            = azuread_application.meshcloud_metering.client_id
     Client_Secret                    = var.create_password ? "Execute `terraform output metering_service_principal_password` to see the password" : "No password was created"
   }
diff --git a/modules/meshcloud-replicator-service-principal/README.md b/modules/meshcloud-replicator-service-principal/README.md
@@ -4,15 +4,15 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.0 |
-| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=2.46.0 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=3.81.0 |
+| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=3.0.2 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=4.11.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 3.0.2 |
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.5.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.11.0 |
 | <a name="provider_terraform"></a> [terraform](#provider\_terraform) | n/a |
 | <a name="provider_time"></a> [time](#provider\_time) | 0.12.1 |
 
diff --git a/modules/meshcloud-replicator-service-principal/module.tf b/modules/meshcloud-replicator-service-principal/module.tf
@@ -6,11 +6,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.81.0"
+      version = ">=4.11.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = ">=2.46.0"
+      version = ">=3.0.2"
     }
   }
 }
@@ -187,20 +187,20 @@ resource "azurerm_role_assignment" "meshcloud_replicator" {
   for_each           = toset(var.assignment_scopes)
   scope              = each.key
   role_definition_id = azurerm_role_definition.meshcloud_replicator.role_definition_resource_id
-  principal_id       = azuread_service_principal.meshcloud_replicator.id
+  principal_id       = azuread_service_principal.meshcloud_replicator.object_id
 }
 
 resource "azurerm_role_assignment" "meshcloud_replicator_subscription_canceler" {
   for_each           = toset(var.can_cancel_subscriptions_in_scopes)
   scope              = each.key
   role_definition_id = azurerm_role_definition.meshcloud_replicator_subscription_canceler.role_definition_resource_id
-  principal_id       = azuread_service_principal.meshcloud_replicator.id
+  principal_id       = azuread_service_principal.meshcloud_replicator.object_id
 }
 
 resource "azurerm_role_assignment" "meshcloud_replicator_rg_deleter" {
   for_each     = toset(var.can_delete_rgs_in_scopes)
   scope        = each.key
-  principal_id = azuread_service_principal.meshcloud_replicator.id
+  principal_id = azuread_service_principal.meshcloud_replicator.object_id
 
   # The azurerm provider requires this must be a scoped id, so unfortuantely we need to construct the id of the role
   # definition at the assignment scope in order to make this stable for subsequent terraform apply's.
diff --git a/modules/meshcloud-replicator-service-principal/outputs.tf b/modules/meshcloud-replicator-service-principal/outputs.tf
@@ -1,7 +1,7 @@
 output "credentials" {
   description = "Service Principal application id and object id"
   value = {
-    Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_replicator.id
+    Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_replicator.object_id
     Application_Client_ID            = azuread_application.meshcloud_replicator.client_id
     Client_Secret                    = var.create_password ? "Execute `terraform output replicator_service_principal_password` to see the password" : "No password was created"
   }
diff --git a/modules/meshcloud-sso/README.md b/modules/meshcloud-sso/README.md
@@ -4,7 +4,7 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | > 1.0 |
-| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=2.46.0 |
+| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | >=3.0.2 |
 
 ## Providers
 
diff --git a/modules/meshcloud-sso/module.tf b/modules/meshcloud-sso/module.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azuread = {
       source  = "hashicorp/azuread"
-      version = ">=2.46.0"
+      version = ">=3.0.2"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`azurerm = {`
`5`	`5`	`source = "hashicorp/azurerm"`
`6`		`- version = ">=3.81.0"`
	`6`	`+ version = ">=4.11.0"`
`7`	`7`	`}`
`8`	`8`	`azuread = {`
`9`	`9`	`source = "hashicorp/azuread"`
`10`		`- version = ">=2.46.0"`
	`10`	`+ version = ">=3.0.2"`
`11`	`11`	`}`
`12`	`12`	`azapi = {`
`13`	`13`	`source = "Azure/azapi"`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ terraform {`
`7`	`7`	`required_providers {`
`8`	`8`	`azurerm = {`
`9`	`9`	`source = "hashicorp/azurerm"`
`10`		`- version = ">=3.81.0"`
	`10`	`+ version = ">=4.11.0"`
`11`	`11`	`}`
`12`	`12`	`azuread = {`
`13`	`13`	`source = "hashicorp/azuread"`
`14`		`- version = ">=2.46.0"`
	`14`	`+ version = ">=3.0.2"`
`15`	`15`	`}`
`16`	`16`	`azapi = {`
`17`	`17`	`source = "Azure/azapi"`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ terraform {`
`6`	`6`	`required_providers {`
`7`	`7`	`azurerm = {`
`8`	`8`	`source = "hashicorp/azurerm"`
`9`		`- version = ">=3.81.0"`
	`9`	`+ version = ">=4.11.0"`
`10`	`10`	`}`
`11`	`11`	`azuread = {`
`12`	`12`	`source = "hashicorp/azuread"`
`13`		`- version = ">=2.46.0"`
	`13`	`+ version = ">=3.0.2"`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`}`
`@@ -22,7 +22,7 @@ resource "azurerm_role_assignment" "meshcloud_metering" {`
`22`	`22`	`for_each = toset(var.assignment_scopes)`
`23`	`23`	`scope = each.key`
`24`	`24`	`role_definition_name = "Cost Management Reader"`
`25`		`- principal_id = azuread_service_principal.meshcloud_metering.id`
	`25`	`+ principal_id = azuread_service_principal.meshcloud_metering.object_id`
`26`	`26`	`depends_on = [azuread_service_principal.meshcloud_metering]`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`output "credentials" {`
`2`	`2`	`description = "Service Principal application id and object id"`
`3`	`3`	`value = {`
`4`		`- Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_metering.id`
	`4`	`+ Enterprise_Application_Object_ID = azuread_service_principal.meshcloud_metering.object_id`
`5`	`5`	`Application_Client_ID = azuread_application.meshcloud_metering.client_id`
`6`	`6`	Client_Secret = var.create_password ? "Execute `terraform output metering_service_principal_password` to see the password" : "No password was created"
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`azuread = {`
`5`	`5`	`source = "hashicorp/azuread"`
`6`		`- version = ">=2.46.0"`
	`6`	`+ version = ">=3.0.2"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`	`}`