Updated TF providers: Merging into develop

.gitignore

@@ -31,4 +31,6 @@ override.tf.json
 .terraform.lock.hcl
 
 #IDE files
-.idea
+.idea
+
+.vs/

modules/azure/analysis_services/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/arm_managed_identity/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/custom_connector/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/event_hub_managed_identity/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/excel_online/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/key_vault_managed_identity/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/log_analytics/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/logic_app_custom_connector/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/office365/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/office365_set/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/service_bus_managed_identity/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/service_bus_managed_identity_set/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/sftp_ssh/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/sharepoint_online/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/storage_blob/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/storage_blob_managed_identity/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_connectors/storage_table/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_management/main.tf

@@ -1,14 +1,14 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "~> 2.36"
+      version = "~> 2.53"
     }
   }
 
@@ -204,13 +204,13 @@ resource "azuread_application" "application" {
 }
 
 resource "azuread_application_password" "password" {
-  application_object_id = azuread_application.application.object_id
+  application_id = azuread_application.application.id
 }
 
 resource "azurerm_api_management_identity_provider_aad" "identity_provider_aad" {
   resource_group_name = var.resource_group_name
   api_management_name = azurerm_api_management.api_management.name
-  client_id           = azuread_application.application.application_id
+  client_id           = azuread_application.application.client_id
   client_secret       = azuread_application_password.password.value
   allowed_tenants     = var.allowed_tenants
   signin_tenant       = var.signin_tenant

modules/azure/api_management_api/main.tf

@@ -1,14 +1,14 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "~> 2.36"
+      version = "~> 2.53"
     }
   }
 
@@ -125,7 +125,7 @@ resource "azurerm_api_management_api_policy" "api_policy" {
       <openid-config url="${var.aad_settings.openid_url}"/>
       <required-claims>
         <claim name="aud" match="any">
-          <value>${azuread_application.application.application_id}</value>
+          <value>${azuread_application.application.client_id}</value>
         </claim>
         <claim name="iss" match="any">
           <value>${var.aad_settings.issuer}</value>
@@ -316,7 +316,7 @@ resource "azurerm_api_management_authorization_server" "oauth2" {
   authorization_endpoint       = var.auth_endpoint != null ? var.auth_endpoint : "https://login.microsoftonline.com/${var.authorization_tenant}/oauth2/v2.0/authorize"
   token_endpoint               = var.token_endpoint != null ? var.token_endpoint : "https://login.microsoftonline.com/${var.authorization_tenant}/oauth2/v2.0/token"
   client_registration_endpoint = var.client_registration_endpoint
-  client_id                    = azuread_application.application.application_id
+  client_id                    = azuread_application.application.client_id
   client_secret                = azuread_application_password.password.value
   bearer_token_sending_methods = ["authorizationHeader"]
   client_authentication_method = ["Body"]
@@ -325,20 +325,20 @@ resource "azurerm_api_management_authorization_server" "oauth2" {
 }
 
 resource "azuread_service_principal" "application" {
-  count                        = local.should_assign_group ? 1 : 0
-  application_id               = azuread_application.application.application_id
+  client_id                    = azuread_application.application.client_id
   app_role_assignment_required = false
   owners                       = [data.azuread_client_config.current.object_id]
+  use_existing                 = true
 }
 
 resource "azuread_group_member" "registered_app_member" {
   count            = local.should_assign_group ? 1 : 0
   group_object_id  = var.group_id
-  member_object_id = azuread_service_principal.application[0].object_id
+  member_object_id = azuread_service_principal.application.object_id
 }
 
 resource "azuread_application_password" "password" {
-  application_object_id = azuread_application.application.object_id
+  application_id = azuread_application.application.id
 }
 
 resource "random_uuid" "oath2_uuid" {}

modules/azure/api_management_api/outputs.tf

@@ -6,8 +6,8 @@ output "api_management_api_diagnostic" {
   value = (var.api_diagnostic_settings != null && var.api_management_logger_id != null) ? azurerm_api_management_api_diagnostic.api_diagnostic[0].id : null
 }
 
-output "application_id" {
-  value = azuread_application.application.application_id
+output "client_id" {
+  value = azuread_application.application.client_id
 }
 
 output "default_role" {

modules/azure/api_management_api_operation/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_management_api_operation_policy/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }
 

modules/azure/api_management_api_schema/main.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = "~> 1.3"
+  required_version = "~> 1.12"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.48"
+      version = "~> 3.117"
     }
   }