From a412af863f0e87828f430a78f19ef315c91b2052 Mon Sep 17 00:00:00 2001
From: ParthaI <47887552+ParthaI@users.noreply.github.com>
Date: Tue, 19 Jul 2022 11:13:16 +0530
Subject: [PATCH] Update integration test TF file to use latest version of
 azurerm provider closes #504 (#505)

---
 .../tests/azure_api_management/variables.tf   |  2 +-
 .../azure_app_configuration/variables.tf      |  2 +-
 .../variables.tf                              |  3 +-
 .../variables.tf                              |  3 +-
 .../tests/azure_app_service_plan/variables.tf |  3 +-
 .../azure_app_service_web_app/variables.tf    |  3 +-
 .../azure_application_gateway/variables.tf    |  2 +-
 .../variables.tf                              |  2 +-
 .../tests/azure_batch_account/variables.tf    |  2 +-
 .../azure_cognitive_account/variables.tf      |  2 +-
 .../test-get-expected.json                    |  1 -
 .../test-get-query.sql                        |  2 +-
 .../test-hydrate-expected.json                |  1 -
 .../test-hydrate-query.sql                    |  2 +-
 .../variables.tf                              |  2 +-
 .../tests/azure_compute_disk/variables.tf     |  2 +-
 .../azure_compute_disk_access/variables.tf    |  2 +-
 .../variables.tf                              | 60 +++++++++++--------
 .../tests/azure_compute_snapshot/variables.tf |  2 +-
 .../variables.tf                              |  4 +-
 .../varable.tf                                |  2 +-
 .../azure_container_registry/variables.tf     |  2 +-
 .../tests/azure_cosmosdb_account/variables.tf |  3 +-
 .../variables.tf                              |  3 +-
 .../azure_cosmosdb_sql_database/variables.tf  |  3 +-
 .../tests/azure_data_factory/variables.tf     |  2 +-
 .../azure_data_factory_dataset/variables.tf   |  8 +--
 .../azure_data_factory_pipeline/variables.tf  |  5 +-
 .../azure_databox_edge_device/variables.tf    |  2 +-
 .../azure_diagnostic_setting/variables.tf     |  2 +-
 .../tests/azure_eventgrid_domain/variable.tf  |  2 +-
 .../tests/azure_eventgrid_topic/variable.tf   |  2 +-
 .../azure_eventhub_namespace/variables.tf     |  2 +-
 .../azure_express_route_circuit/varibles.tf   |  3 +-
 azure-test/tests/azure_firewall/variables.tf  |  3 +-
 azure-test/tests/azure_frontdoor/variables.tf |  2 +-
 .../azure_hdinsight_cluster/variables.tf      |  2 +-
 .../azure_healthcare_service/variables.tf     |  3 +-
 azure-test/tests/azure_hpc_cache/variables.tf |  2 +-
 azure-test/tests/azure_iothub/variables.tf    |  3 +-
 .../tests/azure_iothub_dps/variables.tf       |  2 +-
 azure-test/tests/azure_key_vault/variables.tf |  2 +-
 .../variables.tf                              |  2 +-
 .../tests/azure_key_vault_key/variables.tf    |  2 +-
 .../variables.tf                              |  2 +-
 .../tests/azure_key_vault_secret/variables.tf | 15 ++---
 .../azure_kubernetes_cluster/variables.tf     |  4 +-
 .../tests/azure_kusto_cluster/variables.tf    |  3 +-
 azure-test/tests/azure_lb/variables.tf        |  2 +-
 .../variables.tf                              |  3 +-
 .../tests/azure_lb_nat_rule/variables.tf      |  3 +-
 .../tests/azure_lb_outbound_rule/variables.tf |  6 +-
 azure-test/tests/azure_lb_probe/variables.tf  |  3 +-
 azure-test/tests/azure_lb_rule/variables.tf   |  3 +-
 .../azure_logic_app_workflow/variables.tf     |  2 +-
 .../variables.tf                              |  1 -
 .../tests/azure_management_lock/variables.tf  |  2 +-
 .../tests/azure_mariadb_server/variables.tf   |  3 +-
 .../azure_mssql_elasticpool/variables.tf      |  2 +-
 .../azure_mssql_virtual_machine/variables.tf  |  2 +-
 .../azure_mysql_flexible_server/variables.tf  |  2 +-
 .../tests/azure_mysql_server/variables.tf     |  2 +-
 .../azure_network_interface/variables.tf      |  4 +-
 .../azure_network_security_group/variables.tf |  2 +-
 .../tests/azure_network_watcher/variables.tf  |  2 +-
 .../variables.tf                              |  3 +-
 .../azure_policy_assignment/variables.tf      |  3 +-
 .../azure_policy_definition/variables.tf      |  3 +-
 .../azure_postgresql_server/variables.tf      |  2 +-
 azure-test/tests/azure_public_ip/variables.tf |  2 +-
 .../variables.tf                              |  2 +-
 .../tests/azure_redis_cache/variables.tf      |  2 +-
 .../tests/azure_resource_group/variables.tf   |  2 +-
 .../tests/azure_role_assignment/variables.tf  |  6 +-
 .../tests/azure_role_definition/variables.tf  |  2 +-
 .../tests/azure_route_table/variables.tf      |  4 +-
 .../tests/azure_search_service/variables.tf   |  3 +-
 .../variables.tf                              |  3 +-
 .../variables.tf                              |  7 +--
 .../variables.tf                              |  3 +-
 .../variables.tf                              |  3 +-
 .../variables.tf                              |  3 +-
 .../azure_service_fabric_cluster/variables.tf |  4 +-
 .../test-get-expected.json                    |  3 +-
 .../azure_servicebus_namespace/variables.tf   |  3 +-
 .../test-hydrate-expected.json                | 22 +++----
 .../tests/azure_sql_server/variables.tf       | 10 +---
 .../tests/azure_storage_account/variables.tf  |  2 +-
 .../tests/azure_storage_blob/variables.tf     |  3 +-
 .../azure_storage_blob_service/variables.tf   |  2 +-
 .../azure_storage_container/variables.tf      |  2 +-
 .../tests/azure_storage_queue/variables.tf    |  2 +-
 .../azure_storage_share_file/variables.tf     |  1 -
 .../tests/azure_storage_sync/variables.tf     |  2 +-
 .../tests/azure_storage_table/variables.tf    |  2 +-
 .../azure_storage_table_service/variables.tf  |  2 +-
 .../azure_stream_analytics_job/variables.tf   |  2 +-
 azure-test/tests/azure_subnet/variables.tf    |  4 +-
 .../tests/azure_subscription/variables.tf     |  2 +-
 .../azure_synapse_workspace/variables.tf      |  2 +-
 .../azure_tenant/test-list-expected.json      |  4 +-
 .../tests/azure_tenant/test-list-query.sql    |  2 +-
 .../azure_tenant/test-turbot-expected.json    |  4 +-
 .../tests/azure_virtual_network/variables.tf  |  2 +-
 .../variables.tf                              |  2 +-
 105 files changed, 167 insertions(+), 204 deletions(-)

diff --git a/azure-test/tests/azure_api_management/variables.tf b/azure-test/tests/azure_api_management/variables.tf
index 37a1d04b..f557bc1a 100644
--- a/azure-test/tests/azure_api_management/variables.tf
+++ b/azure-test/tests/azure_api_management/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_app_configuration/variables.tf b/azure-test/tests/azure_app_configuration/variables.tf
index f789d6c3..2480916d 100644
--- a/azure-test/tests/azure_app_configuration/variables.tf
+++ b/azure-test/tests/azure_app_configuration/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_app_service_environment/variables.tf b/azure-test/tests/azure_app_service_environment/variables.tf
index 37692305..e72fd61d 100644
--- a/azure-test/tests/azure_app_service_environment/variables.tf
+++ b/azure-test/tests/azure_app_service_environment/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_app_service_function_app/variables.tf b/azure-test/tests/azure_app_service_function_app/variables.tf
index 2019d63d..adeb9065 100644
--- a/azure-test/tests/azure_app_service_function_app/variables.tf
+++ b/azure-test/tests/azure_app_service_function_app/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_app_service_plan/variables.tf b/azure-test/tests/azure_app_service_plan/variables.tf
index 2961e016..1afbbb56 100644
--- a/azure-test/tests/azure_app_service_plan/variables.tf
+++ b/azure-test/tests/azure_app_service_plan/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_app_service_web_app/variables.tf b/azure-test/tests/azure_app_service_web_app/variables.tf
index 6432d582..1b338f03 100644
--- a/azure-test/tests/azure_app_service_web_app/variables.tf
+++ b/azure-test/tests/azure_app_service_web_app/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_application_gateway/variables.tf b/azure-test/tests/azure_application_gateway/variables.tf
index 820db5f0..dd7f4c03 100644
--- a/azure-test/tests/azure_application_gateway/variables.tf
+++ b/azure-test/tests/azure_application_gateway/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_application_security_group/variables.tf b/azure-test/tests/azure_application_security_group/variables.tf
index e6819940..564495ec 100644
--- a/azure-test/tests/azure_application_security_group/variables.tf
+++ b/azure-test/tests/azure_application_security_group/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
diff --git a/azure-test/tests/azure_batch_account/variables.tf b/azure-test/tests/azure_batch_account/variables.tf
index f66b53fe..1063c092 100644
--- a/azure-test/tests/azure_batch_account/variables.tf
+++ b/azure-test/tests/azure_batch_account/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_cognitive_account/variables.tf b/azure-test/tests/azure_cognitive_account/variables.tf
index 5196a9d9..45ddde8b 100644
--- a/azure-test/tests/azure_cognitive_account/variables.tf
+++ b/azure-test/tests/azure_cognitive_account/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_compute_availability_set/test-get-expected.json b/azure-test/tests/azure_compute_availability_set/test-get-expected.json
index aa56f5b6..2ac05756 100644
--- a/azure-test/tests/azure_compute_availability_set/test-get-expected.json
+++ b/azure-test/tests/azure_compute_availability_set/test-get-expected.json
@@ -6,7 +6,6 @@
     "platform_update_domain_count": 5,
     "region": "eastus",
     "resource_group": "{{resourceName}}",
-    "sku_name": "Classic",
     "subscription_id": "{{ output.subscription_id.value }}",
     "type": "Microsoft.Compute/availabilitySets"
   }
diff --git a/azure-test/tests/azure_compute_availability_set/test-get-query.sql b/azure-test/tests/azure_compute_availability_set/test-get-query.sql
index e9821f09..f1795c06 100644
--- a/azure-test/tests/azure_compute_availability_set/test-get-query.sql
+++ b/azure-test/tests/azure_compute_availability_set/test-get-query.sql
@@ -1,3 +1,3 @@
-select name, id, type, platform_update_domain_count, platform_fault_domain_count, sku_name, region, resource_group, subscription_id
+select name, id, type, platform_update_domain_count, platform_fault_domain_count, region, resource_group, subscription_id
 from azure.azure_compute_availability_set
 where name = '{{resourceName}}' and resource_group = '{{resourceName}}'
\ No newline at end of file
diff --git a/azure-test/tests/azure_compute_availability_set/test-hydrate-expected.json b/azure-test/tests/azure_compute_availability_set/test-hydrate-expected.json
index aa56f5b6..2ac05756 100644
--- a/azure-test/tests/azure_compute_availability_set/test-hydrate-expected.json
+++ b/azure-test/tests/azure_compute_availability_set/test-hydrate-expected.json
@@ -6,7 +6,6 @@
     "platform_update_domain_count": 5,
     "region": "eastus",
     "resource_group": "{{resourceName}}",
-    "sku_name": "Classic",
     "subscription_id": "{{ output.subscription_id.value }}",
     "type": "Microsoft.Compute/availabilitySets"
   }
diff --git a/azure-test/tests/azure_compute_availability_set/test-hydrate-query.sql b/azure-test/tests/azure_compute_availability_set/test-hydrate-query.sql
index e9821f09..f1795c06 100644
--- a/azure-test/tests/azure_compute_availability_set/test-hydrate-query.sql
+++ b/azure-test/tests/azure_compute_availability_set/test-hydrate-query.sql
@@ -1,3 +1,3 @@
-select name, id, type, platform_update_domain_count, platform_fault_domain_count, sku_name, region, resource_group, subscription_id
+select name, id, type, platform_update_domain_count, platform_fault_domain_count, region, resource_group, subscription_id
 from azure.azure_compute_availability_set
 where name = '{{resourceName}}' and resource_group = '{{resourceName}}'
\ No newline at end of file
diff --git a/azure-test/tests/azure_compute_availability_set/variables.tf b/azure-test/tests/azure_compute_availability_set/variables.tf
index d20aa345..3b2959bf 100644
--- a/azure-test/tests/azure_compute_availability_set/variables.tf
+++ b/azure-test/tests/azure_compute_availability_set/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_compute_disk/variables.tf b/azure-test/tests/azure_compute_disk/variables.tf
index 10ef6e6f..94364e78 100644
--- a/azure-test/tests/azure_compute_disk/variables.tf
+++ b/azure-test/tests/azure_compute_disk/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_compute_disk_access/variables.tf b/azure-test/tests/azure_compute_disk_access/variables.tf
index d9e7035e..cd6e36d7 100644
--- a/azure-test/tests/azure_compute_disk_access/variables.tf
+++ b/azure-test/tests/azure_compute_disk_access/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_compute_disk_encryption_set/variables.tf b/azure-test/tests/azure_compute_disk_encryption_set/variables.tf
index 4b9d0ee4..c265f0cc 100644
--- a/azure-test/tests/azure_compute_disk_encryption_set/variables.tf
+++ b/azure-test/tests/azure_compute_disk_encryption_set/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -43,11 +42,10 @@ resource "azurerm_key_vault" "named_test_resource" {
   location                    = azurerm_resource_group.named_test_resource.location
   resource_group_name         = azurerm_resource_group.named_test_resource.name
   tenant_id                   = data.azurerm_client_config.current.tenant_id
+  sku_name                    = "premium"
   enabled_for_disk_encryption = true
-  soft_delete_enabled         = true
-  soft_delete_retention_days  = 7
   purge_protection_enabled    = true
-  sku_name                    = "standard"
+  soft_delete_retention_days  = 7
 }
 
 resource "azurerm_key_vault_key" "named_test_resource" {
@@ -57,8 +55,9 @@ resource "azurerm_key_vault_key" "named_test_resource" {
   key_size     = 2048
 
   depends_on = [
-    azurerm_key_vault_access_policy.local_user,
+    azurerm_key_vault_access_policy.named_test_resource
   ]
+
   key_opts = [
     "decrypt",
     "encrypt",
@@ -69,33 +68,46 @@ resource "azurerm_key_vault_key" "named_test_resource" {
   ]
 }
 
-resource "azurerm_key_vault_access_policy" "local_user" {
-  key_vault_id = azurerm_key_vault.named_test_resource.id
-  tenant_id = data.azurerm_client_config.current.tenant_id
-  object_id = data.azurerm_client_config.current.object_id
-  key_permissions = [
-    "create",
-    "get",
-    "list",
-    "delete",
-  ]
-}
-
 resource "azurerm_disk_encryption_set" "named_test_resource" {
-  name = var.resource_name
-  location            = azurerm_resource_group.named_test_resource.location
+  name                = var.resource_name
   resource_group_name = azurerm_resource_group.named_test_resource.name
-  key_vault_key_id = azurerm_key_vault_key.named_test_resource.id
-  
+  location            = azurerm_resource_group.named_test_resource.location
+  key_vault_key_id    = azurerm_key_vault_key.named_test_resource.id
+
   identity {
     type = "SystemAssigned"
   }
-  
+
   tags = {
-    name = var.resource_name
+    "name" = var.resource_name
   }
 }
 
+resource "azurerm_key_vault_access_policy" "named_test_resource" {
+  key_vault_id = azurerm_key_vault.named_test_resource.id
+
+  tenant_id = data.azurerm_client_config.current.tenant_id
+  object_id = data.azurerm_client_config.current.object_id
+
+  key_permissions = [
+    "Create",
+    "Delete",
+    "Get",
+    "Purge",
+    "Recover",
+    "Update",
+    "List",
+    "Decrypt",
+    "Sign"
+  ]
+}
+
+resource "azurerm_role_assignment" "example-disk" {
+  scope                = azurerm_key_vault.named_test_resource.id
+  role_definition_name = "Key Vault Crypto Service Encryption User"
+  principal_id         = azurerm_disk_encryption_set.named_test_resource.identity.0.principal_id
+}
+
 output "resource_aka" {
   value = "azure://${azurerm_disk_encryption_set.named_test_resource.id}"
 }
diff --git a/azure-test/tests/azure_compute_snapshot/variables.tf b/azure-test/tests/azure_compute_snapshot/variables.tf
index 0ad35a63..13e49755 100644
--- a/azure-test/tests/azure_compute_snapshot/variables.tf
+++ b/azure-test/tests/azure_compute_snapshot/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_compute_virtual_machine/variables.tf b/azure-test/tests/azure_compute_virtual_machine/variables.tf
index 765fe2ca..92a373d8 100644
--- a/azure-test/tests/azure_compute_virtual_machine/variables.tf
+++ b/azure-test/tests/azure_compute_virtual_machine/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -48,7 +48,7 @@ resource "azurerm_subnet" "named_test_resource" {
   name                 = var.resource_name
   resource_group_name  = azurerm_resource_group.named_test_resource.name
   virtual_network_name = azurerm_virtual_network.named_test_resource.name
-  address_prefix       = "10.0.2.0/24"
+  address_prefixes      = ["10.0.2.0/24"]
 }
 
 resource "azurerm_network_interface" "named_test_resource" {
diff --git a/azure-test/tests/azure_compute_virtual_machine_scale_set/varable.tf b/azure-test/tests/azure_compute_virtual_machine_scale_set/varable.tf
index 95df9028..e061fbb0 100644
--- a/azure-test/tests/azure_compute_virtual_machine_scale_set/varable.tf
+++ b/azure-test/tests/azure_compute_virtual_machine_scale_set/varable.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_container_registry/variables.tf b/azure-test/tests/azure_container_registry/variables.tf
index 7b393df4..f43c030c 100644
--- a/azure-test/tests/azure_container_registry/variables.tf
+++ b/azure-test/tests/azure_container_registry/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_cosmosdb_account/variables.tf b/azure-test/tests/azure_cosmosdb_account/variables.tf
index 8fd70d24..8a33150a 100644
--- a/azure-test/tests/azure_cosmosdb_account/variables.tf
+++ b/azure-test/tests/azure_cosmosdb_account/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -52,7 +52,6 @@ resource "azurerm_cosmosdb_account" "named_test_resource" {
   }
 
   geo_location {
-    prefix = "turbot-cosmos-db"
     location = azurerm_resource_group.named_test_resource.location
     failover_priority = 0
   }
diff --git a/azure-test/tests/azure_cosmosdb_mongo_database/variables.tf b/azure-test/tests/azure_cosmosdb_mongo_database/variables.tf
index 0e455ff6..2ba4eef8 100644
--- a/azure-test/tests/azure_cosmosdb_mongo_database/variables.tf
+++ b/azure-test/tests/azure_cosmosdb_mongo_database/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_cosmosdb_sql_database/variables.tf b/azure-test/tests/azure_cosmosdb_sql_database/variables.tf
index 6722f302..fde09427 100644
--- a/azure-test/tests/azure_cosmosdb_sql_database/variables.tf
+++ b/azure-test/tests/azure_cosmosdb_sql_database/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_data_factory/variables.tf b/azure-test/tests/azure_data_factory/variables.tf
index 7608c275..850d2c35 100644
--- a/azure-test/tests/azure_data_factory/variables.tf
+++ b/azure-test/tests/azure_data_factory/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_data_factory_dataset/variables.tf b/azure-test/tests/azure_data_factory_dataset/variables.tf
index eed86cf6..14c53876 100644
--- a/azure-test/tests/azure_data_factory_dataset/variables.tf
+++ b/azure-test/tests/azure_data_factory_dataset/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -48,15 +48,13 @@ resource "azurerm_data_factory" "named_test_resource" {
 
 resource "azurerm_data_factory_linked_service_mysql" "named_test_resource" {
   name                = var.resource_name
-  resource_group_name = azurerm_resource_group.named_test_resource.name
-  data_factory_name   = azurerm_data_factory.named_test_resource.name
+  data_factory_id = azurerm_data_factory.named_test_resource.id
   connection_string   = "Server=test;Port=3306;Database=test;User=test;SSLMode=1;UseSystemTrustStore=0;Password=test"
 }
 
 resource "azurerm_data_factory_dataset_mysql" "named_test_resource" {
   name                = var.resource_name
-  resource_group_name = azurerm_resource_group.named_test_resource.name
-  data_factory_name   = azurerm_data_factory.named_test_resource.name
+  data_factory_id = azurerm_data_factory.named_test_resource.id
   linked_service_name = azurerm_data_factory_linked_service_mysql.named_test_resource.name
 }
 
diff --git a/azure-test/tests/azure_data_factory_pipeline/variables.tf b/azure-test/tests/azure_data_factory_pipeline/variables.tf
index 52c4b804..284145a3 100644
--- a/azure-test/tests/azure_data_factory_pipeline/variables.tf
+++ b/azure-test/tests/azure_data_factory_pipeline/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -45,8 +45,7 @@ resource "azurerm_data_factory" "named_test_resource" {
 
 resource "azurerm_data_factory_pipeline" "named_test_resource" {
   name                = var.resource_name
-  resource_group_name = azurerm_resource_group.named_test_resource.name
-  data_factory_name   = azurerm_data_factory.named_test_resource.name
+  data_factory_id = azurerm_data_factory.named_test_resource.id
   variables = {
     "bob" = "item1"
   }
diff --git a/azure-test/tests/azure_databox_edge_device/variables.tf b/azure-test/tests/azure_databox_edge_device/variables.tf
index 3926951b..73dca45d 100644
--- a/azure-test/tests/azure_databox_edge_device/variables.tf
+++ b/azure-test/tests/azure_databox_edge_device/variables.tf
@@ -17,9 +17,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_diagnostic_setting/variables.tf b/azure-test/tests/azure_diagnostic_setting/variables.tf
index 09b17365..e1b9835e 100644
--- a/azure-test/tests/azure_diagnostic_setting/variables.tf
+++ b/azure-test/tests/azure_diagnostic_setting/variables.tf
@@ -17,9 +17,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_eventgrid_domain/variable.tf b/azure-test/tests/azure_eventgrid_domain/variable.tf
index cd10d90b..96b5c364 100644
--- a/azure-test/tests/azure_eventgrid_domain/variable.tf
+++ b/azure-test/tests/azure_eventgrid_domain/variable.tf
@@ -17,9 +17,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_eventgrid_topic/variable.tf b/azure-test/tests/azure_eventgrid_topic/variable.tf
index d1e8d2b3..8406af12 100644
--- a/azure-test/tests/azure_eventgrid_topic/variable.tf
+++ b/azure-test/tests/azure_eventgrid_topic/variable.tf
@@ -17,9 +17,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_eventhub_namespace/variables.tf b/azure-test/tests/azure_eventhub_namespace/variables.tf
index 063618d6..bc3333a1 100644
--- a/azure-test/tests/azure_eventhub_namespace/variables.tf
+++ b/azure-test/tests/azure_eventhub_namespace/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_express_route_circuit/varibles.tf b/azure-test/tests/azure_express_route_circuit/varibles.tf
index 8ac8a57f..c36dc6c2 100644
--- a/azure-test/tests/azure_express_route_circuit/varibles.tf
+++ b/azure-test/tests/azure_express_route_circuit/varibles.tf
@@ -18,10 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_firewall/variables.tf b/azure-test/tests/azure_firewall/variables.tf
index 953e452b..af891579 100644
--- a/azure-test/tests/azure_firewall/variables.tf
+++ b/azure-test/tests/azure_firewall/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_frontdoor/variables.tf b/azure-test/tests/azure_frontdoor/variables.tf
index ba53c3fa..9d2a1544 100644
--- a/azure-test/tests/azure_frontdoor/variables.tf
+++ b/azure-test/tests/azure_frontdoor/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_hdinsight_cluster/variables.tf b/azure-test/tests/azure_hdinsight_cluster/variables.tf
index 7c50a372..d9b6c44a 100644
--- a/azure-test/tests/azure_hdinsight_cluster/variables.tf
+++ b/azure-test/tests/azure_hdinsight_cluster/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_healthcare_service/variables.tf b/azure-test/tests/azure_healthcare_service/variables.tf
index 95d7f155..28c26934 100644
--- a/azure-test/tests/azure_healthcare_service/variables.tf
+++ b/azure-test/tests/azure_healthcare_service/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_hpc_cache/variables.tf b/azure-test/tests/azure_hpc_cache/variables.tf
index 341f4209..787f3bab 100644
--- a/azure-test/tests/azure_hpc_cache/variables.tf
+++ b/azure-test/tests/azure_hpc_cache/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_iothub/variables.tf b/azure-test/tests/azure_iothub/variables.tf
index 6420c515..e435da55 100644
--- a/azure-test/tests/azure_iothub/variables.tf
+++ b/azure-test/tests/azure_iothub/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -81,7 +81,6 @@ resource "azurerm_iothub" "named_test_resource" {
   sku {
     name     = "S1"
     capacity = "1"
-    tier     = "Basic"
   }
 
   endpoint {
diff --git a/azure-test/tests/azure_iothub_dps/variables.tf b/azure-test/tests/azure_iothub_dps/variables.tf
index 604cdf7d..789ec3b1 100644
--- a/azure-test/tests/azure_iothub_dps/variables.tf
+++ b/azure-test/tests/azure_iothub_dps/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_key_vault/variables.tf b/azure-test/tests/azure_key_vault/variables.tf
index d6e836fd..1775b878 100644
--- a/azure-test/tests/azure_key_vault/variables.tf
+++ b/azure-test/tests/azure_key_vault/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_key_vault_deleted_vault/variables.tf b/azure-test/tests/azure_key_vault_deleted_vault/variables.tf
index 969672ec..f9c6fd8c 100644
--- a/azure-test/tests/azure_key_vault_deleted_vault/variables.tf
+++ b/azure-test/tests/azure_key_vault_deleted_vault/variables.tf
@@ -17,9 +17,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_key_vault_key/variables.tf b/azure-test/tests/azure_key_vault_key/variables.tf
index 9b36d02f..b0064d7a 100644
--- a/azure-test/tests/azure_key_vault_key/variables.tf
+++ b/azure-test/tests/azure_key_vault_key/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_key_vault_managed_hardware_security_module/variables.tf b/azure-test/tests/azure_key_vault_managed_hardware_security_module/variables.tf
index 9f28c4d2..3397b8ea 100644
--- a/azure-test/tests/azure_key_vault_managed_hardware_security_module/variables.tf
+++ b/azure-test/tests/azure_key_vault_managed_hardware_security_module/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_key_vault_secret/variables.tf b/azure-test/tests/azure_key_vault_secret/variables.tf
index 1875e765..40fa2b4d 100644
--- a/azure-test/tests/azure_key_vault_secret/variables.tf
+++ b/azure-test/tests/azure_key_vault_secret/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -49,12 +49,13 @@ resource "azurerm_key_vault" "named_test_resource" {
     object_id = data.azurerm_client_config.current.object_id
 
     secret_permissions = [
-      "set",
-      "get",
-      "list",
-      "delete",
-      "purge",
-      "recover"
+      "Delete",
+      "Get",
+      "List",
+      "Purge",
+      "Recover",
+      "Restore",
+      "Set"
     ]
   }
 }
diff --git a/azure-test/tests/azure_kubernetes_cluster/variables.tf b/azure-test/tests/azure_kubernetes_cluster/variables.tf
index bf435431..4554b231 100644
--- a/azure-test/tests/azure_kubernetes_cluster/variables.tf
+++ b/azure-test/tests/azure_kubernetes_cluster/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -59,7 +59,7 @@ resource "azurerm_kubernetes_cluster" "named_test_resource" {
 }
 
 output "resource_aka" {
-  value = "azure://${azurerm_kubernetes_cluster.named_test_resource.id}"
+  value = replace("azure://${azurerm_kubernetes_cluster.named_test_resource.id}", "resourceGroups", "resourcegroups")
 }
 
 output "resource_aka_lower" {
diff --git a/azure-test/tests/azure_kusto_cluster/variables.tf b/azure-test/tests/azure_kusto_cluster/variables.tf
index 00538b2d..86f86559 100644
--- a/azure-test/tests/azure_kusto_cluster/variables.tf
+++ b/azure-test/tests/azure_kusto_cluster/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.50.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_lb/variables.tf b/azure-test/tests/azure_lb/variables.tf
index 509f6c05..a578e795 100644
--- a/azure-test/tests/azure_lb/variables.tf
+++ b/azure-test/tests/azure_lb/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
diff --git a/azure-test/tests/azure_lb_backend_address_pool/variables.tf b/azure-test/tests/azure_lb_backend_address_pool/variables.tf
index 12ac8c27..cff9082e 100644
--- a/azure-test/tests/azure_lb_backend_address_pool/variables.tf
+++ b/azure-test/tests/azure_lb_backend_address_pool/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
@@ -49,7 +49,6 @@ resource "azurerm_lb" "named_test_resource" {
 }
 
 resource "azurerm_lb_backend_address_pool" "named_test_resource" {
-  resource_group_name = azurerm_resource_group.named_test_resource.name
   loadbalancer_id = azurerm_lb.named_test_resource.id
   name            = var.resource_name
 }
diff --git a/azure-test/tests/azure_lb_nat_rule/variables.tf b/azure-test/tests/azure_lb_nat_rule/variables.tf
index 17aad7c9..1be7d1db 100644
--- a/azure-test/tests/azure_lb_nat_rule/variables.tf
+++ b/azure-test/tests/azure_lb_nat_rule/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
@@ -51,7 +51,6 @@ resource "azurerm_lb" "named_test_resource" {
 }
 
 resource "azurerm_lb_backend_address_pool" "named_test_resource" {
-  resource_group_name = azurerm_resource_group.named_test_resource.name
   loadbalancer_id     = azurerm_lb.named_test_resource.id
   name                = var.resource_name
 }
diff --git a/azure-test/tests/azure_lb_outbound_rule/variables.tf b/azure-test/tests/azure_lb_outbound_rule/variables.tf
index a5e89b42..f9a6775b 100644
--- a/azure-test/tests/azure_lb_outbound_rule/variables.tf
+++ b/azure-test/tests/azure_lb_outbound_rule/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
@@ -51,13 +51,11 @@ resource "azurerm_lb" "named_test_resource" {
 }
 
 resource "azurerm_lb_backend_address_pool" "named_test_resource" {
-  resource_group_name = azurerm_resource_group.named_test_resource.name
   loadbalancer_id     = azurerm_lb.named_test_resource.id
   name                = var.resource_name
 }
 
 resource "azurerm_lb_outbound_rule" "named_test_resource" {
-  resource_group_name     = azurerm_resource_group.named_test_resource.name
   loadbalancer_id         = azurerm_lb.named_test_resource.id
   name                    = var.resource_name
   protocol                = "Tcp"
@@ -69,7 +67,7 @@ resource "azurerm_lb_outbound_rule" "named_test_resource" {
 }
 
 output "resource_aka" {
-  depends_on = [azurerm_lb_rule.named_test_resource]
+  depends_on = [azurerm_lb_outbound_rule.named_test_resource]
   value      = "azure://${azurerm_lb_outbound_rule.named_test_resource.id}"
 }
 
diff --git a/azure-test/tests/azure_lb_probe/variables.tf b/azure-test/tests/azure_lb_probe/variables.tf
index 0acf118c..881fc76a 100644
--- a/azure-test/tests/azure_lb_probe/variables.tf
+++ b/azure-test/tests/azure_lb_probe/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
@@ -49,7 +49,6 @@ resource "azurerm_lb" "named_test_resource" {
 }
 
 resource "azurerm_lb_probe" "named_test_resource" {
-  resource_group_name = azurerm_resource_group.named_test_resource.name
   loadbalancer_id     = azurerm_lb.named_test_resource.id
   name                = var.resource_name
   port                = 22
diff --git a/azure-test/tests/azure_lb_rule/variables.tf b/azure-test/tests/azure_lb_rule/variables.tf
index 36280509..5c34b462 100644
--- a/azure-test/tests/azure_lb_rule/variables.tf
+++ b/azure-test/tests/azure_lb_rule/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
@@ -49,7 +49,6 @@ resource "azurerm_lb" "named_test_resource" {
 }
 
 resource "azurerm_lb_rule" "named_test_resource" {
-  resource_group_name            = azurerm_resource_group.named_test_resource.name
   loadbalancer_id                = azurerm_lb.named_test_resource.id
   name                           = var.resource_name
   protocol                       = "Tcp"
diff --git a/azure-test/tests/azure_logic_app_workflow/variables.tf b/azure-test/tests/azure_logic_app_workflow/variables.tf
index e63dcafb..9c8b5bf5 100644
--- a/azure-test/tests/azure_logic_app_workflow/variables.tf
+++ b/azure-test/tests/azure_logic_app_workflow/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_machine_learning_workspace/variables.tf b/azure-test/tests/azure_machine_learning_workspace/variables.tf
index c26d6cd1..34740ba2 100644
--- a/azure-test/tests/azure_machine_learning_workspace/variables.tf
+++ b/azure-test/tests/azure_machine_learning_workspace/variables.tf
@@ -18,7 +18,6 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=2.41.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
   features {}
diff --git a/azure-test/tests/azure_management_lock/variables.tf b/azure-test/tests/azure_management_lock/variables.tf
index 3dbd875c..0ca70bf2 100644
--- a/azure-test/tests/azure_management_lock/variables.tf
+++ b/azure-test/tests/azure_management_lock/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_mariadb_server/variables.tf b/azure-test/tests/azure_mariadb_server/variables.tf
index e4965379..1039ccfb 100644
--- a/azure-test/tests/azure_mariadb_server/variables.tf
+++ b/azure-test/tests/azure_mariadb_server/variables.tf
@@ -18,10 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_mssql_elasticpool/variables.tf b/azure-test/tests/azure_mssql_elasticpool/variables.tf
index 00813c24..53f2ad96 100644
--- a/azure-test/tests/azure_mssql_elasticpool/variables.tf
+++ b/azure-test/tests/azure_mssql_elasticpool/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_mssql_virtual_machine/variables.tf b/azure-test/tests/azure_mssql_virtual_machine/variables.tf
index b96f2873..ec6b1b17 100644
--- a/azure-test/tests/azure_mssql_virtual_machine/variables.tf
+++ b/azure-test/tests/azure_mssql_virtual_machine/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_mysql_flexible_server/variables.tf b/azure-test/tests/azure_mysql_flexible_server/variables.tf
index 7a9e8e70..6167ed77 100644
--- a/azure-test/tests/azure_mysql_flexible_server/variables.tf
+++ b/azure-test/tests/azure_mysql_flexible_server/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_mysql_server/variables.tf b/azure-test/tests/azure_mysql_server/variables.tf
index 6b897b99..7686e72c 100644
--- a/azure-test/tests/azure_mysql_server/variables.tf
+++ b/azure-test/tests/azure_mysql_server/variables.tf
@@ -28,9 +28,9 @@ terraform {
 
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_network_interface/variables.tf b/azure-test/tests/azure_network_interface/variables.tf
index 82afcea4..32f80251 100644
--- a/azure-test/tests/azure_network_interface/variables.tf
+++ b/azure-test/tests/azure_network_interface/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -48,7 +48,7 @@ resource "azurerm_subnet" "named_test_resource" {
   name                 = var.resource_name
   resource_group_name  = azurerm_resource_group.named_test_resource.name
   virtual_network_name = azurerm_virtual_network.named_test_resource.name
-  address_prefix       = "10.0.2.0/24"
+  address_prefixes     = ["10.0.2.0/24"]
 }
 
 resource "azurerm_network_interface" "named_test_resource" {
diff --git a/azure-test/tests/azure_network_security_group/variables.tf b/azure-test/tests/azure_network_security_group/variables.tf
index 414db0f1..771d87f7 100644
--- a/azure-test/tests/azure_network_security_group/variables.tf
+++ b/azure-test/tests/azure_network_security_group/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
diff --git a/azure-test/tests/azure_network_watcher/variables.tf b/azure-test/tests/azure_network_watcher/variables.tf
index e90df6cc..ed5d518f 100644
--- a/azure-test/tests/azure_network_watcher/variables.tf
+++ b/azure-test/tests/azure_network_watcher/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_network_watcher_flow_log/variables.tf b/azure-test/tests/azure_network_watcher_flow_log/variables.tf
index 6d6d953f..32fa9dd8 100644
--- a/azure-test/tests/azure_network_watcher_flow_log/variables.tf
+++ b/azure-test/tests/azure_network_watcher_flow_log/variables.tf
@@ -18,10 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.52.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_policy_assignment/variables.tf b/azure-test/tests/azure_policy_assignment/variables.tf
index 83e8e0f0..2c70c19b 100644
--- a/azure-test/tests/azure_policy_assignment/variables.tf
+++ b/azure-test/tests/azure_policy_assignment/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_policy_definition/variables.tf b/azure-test/tests/azure_policy_definition/variables.tf
index ff9cdb63..d4ef75b5 100644
--- a/azure-test/tests/azure_policy_definition/variables.tf
+++ b/azure-test/tests/azure_policy_definition/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_postgresql_server/variables.tf b/azure-test/tests/azure_postgresql_server/variables.tf
index e290c577..6dadbc58 100644
--- a/azure-test/tests/azure_postgresql_server/variables.tf
+++ b/azure-test/tests/azure_postgresql_server/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_public_ip/variables.tf b/azure-test/tests/azure_public_ip/variables.tf
index 52d0008c..82e7e585 100644
--- a/azure-test/tests/azure_public_ip/variables.tf
+++ b/azure-test/tests/azure_public_ip/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_recovery_services_vault/variables.tf b/azure-test/tests/azure_recovery_services_vault/variables.tf
index 171e85fa..2e06a77a 100644
--- a/azure-test/tests/azure_recovery_services_vault/variables.tf
+++ b/azure-test/tests/azure_recovery_services_vault/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_redis_cache/variables.tf b/azure-test/tests/azure_redis_cache/variables.tf
index 6e3268b0..9d533d83 100644
--- a/azure-test/tests/azure_redis_cache/variables.tf
+++ b/azure-test/tests/azure_redis_cache/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_resource_group/variables.tf b/azure-test/tests/azure_resource_group/variables.tf
index 731f6beb..270b6d17 100644
--- a/azure-test/tests/azure_resource_group/variables.tf
+++ b/azure-test/tests/azure_resource_group/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_role_assignment/variables.tf b/azure-test/tests/azure_role_assignment/variables.tf
index ea255b75..1417b245 100644
--- a/azure-test/tests/azure_role_assignment/variables.tf
+++ b/azure-test/tests/azure_role_assignment/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -51,7 +51,7 @@ resource "azurerm_role_definition" "named_test_resource" {
 
 resource "azurerm_role_assignment" "named_test_resource" {
   scope              = data.azurerm_subscription.primary.id
-  role_definition_id = azurerm_role_definition.named_test_resource.id
+  role_definition_id = azurerm_role_definition.named_test_resource.role_definition_resource_id
   principal_id       = data.azurerm_client_config.current.object_id
 }
 
@@ -76,7 +76,7 @@ output "subscription_id" {
 }
 
 output "role_definition_id" {
-  value = azurerm_role_definition.named_test_resource.id
+  value = azurerm_role_definition.named_test_resource.role_definition_resource_id
 }
 
 output "principal_id" {
diff --git a/azure-test/tests/azure_role_definition/variables.tf b/azure-test/tests/azure_role_definition/variables.tf
index 88927c7f..f21987d6 100644
--- a/azure-test/tests/azure_role_definition/variables.tf
+++ b/azure-test/tests/azure_role_definition/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_route_table/variables.tf b/azure-test/tests/azure_route_table/variables.tf
index 31423cc1..2f632118 100644
--- a/azure-test/tests/azure_route_table/variables.tf
+++ b/azure-test/tests/azure_route_table/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -46,7 +46,7 @@ resource "azurerm_route_table" "named_test_resource" {
   route {
     name           = var.resource_name
     address_prefix = "10.1.0.0/16"
-    next_hop_type  = "vnetlocal"
+    next_hop_type  = "VnetLocal"
   }
 
   tags = {
diff --git a/azure-test/tests/azure_search_service/variables.tf b/azure-test/tests/azure_search_service/variables.tf
index f84fa594..c1272251 100644
--- a/azure-test/tests/azure_search_service/variables.tf
+++ b/azure-test/tests/azure_search_service/variables.tf
@@ -18,10 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.50.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_security_center_auto_provisioning/variables.tf b/azure-test/tests/azure_security_center_auto_provisioning/variables.tf
index 5853173f..3d3b84ce 100644
--- a/azure-test/tests/azure_security_center_auto_provisioning/variables.tf
+++ b/azure-test/tests/azure_security_center_auto_provisioning/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_security_center_automation/variables.tf b/azure-test/tests/azure_security_center_automation/variables.tf
index b7a8c9ad..940d470f 100644
--- a/azure-test/tests/azure_security_center_automation/variables.tf
+++ b/azure-test/tests/azure_security_center_automation/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -70,7 +69,7 @@ resource "azurerm_security_center_automation" "named_test_resource" {
   resource_group_name = azurerm_resource_group.named_test_resource.name
 
   action {
-    type              = "EventHub"
+    type              = "eventhub"
     resource_id       = azurerm_eventhub.named_test_resource.id
     connection_string = azurerm_eventhub_authorization_rule.named_test_resource.primary_connection_string
   }
@@ -91,7 +90,7 @@ resource "azurerm_security_center_automation" "named_test_resource" {
 }
 
 output "resource_aka" {
-  value = "azure://${azurerm_security_center_automation.named_test_resource.id}"
+  value = replace("azure://${azurerm_security_center_automation.named_test_resource.id}", "resourceGroups", "resourcegroups")
 }
 
 output "resource_aka_lower" {
diff --git a/azure-test/tests/azure_security_center_contact/variables.tf b/azure-test/tests/azure_security_center_contact/variables.tf
index 8865fecb..28ec56fe 100644
--- a/azure-test/tests/azure_security_center_contact/variables.tf
+++ b/azure-test/tests/azure_security_center_contact/variables.tf
@@ -18,10 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_security_center_setting/variables.tf b/azure-test/tests/azure_security_center_setting/variables.tf
index b83bef3d..22036497 100644
--- a/azure-test/tests/azure_security_center_setting/variables.tf
+++ b/azure-test/tests/azure_security_center_setting/variables.tf
@@ -24,10 +24,9 @@ variable "setting_name" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_security_center_subscription_pricing/variables.tf b/azure-test/tests/azure_security_center_subscription_pricing/variables.tf
index 0285aa7b..b8f306ee 100644
--- a/azure-test/tests/azure_security_center_subscription_pricing/variables.tf
+++ b/azure-test/tests/azure_security_center_subscription_pricing/variables.tf
@@ -18,10 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.43.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_service_fabric_cluster/variables.tf b/azure-test/tests/azure_service_fabric_cluster/variables.tf
index a7dfa7a9..c2a9f2a3 100644
--- a/azure-test/tests/azure_service_fabric_cluster/variables.tf
+++ b/azure-test/tests/azure_service_fabric_cluster/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 # Configure the Microsoft Azure Provider
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
@@ -43,7 +43,7 @@ resource "azurerm_service_fabric_cluster" "named_test_resource" {
   location             = azurerm_resource_group.named_test_resource.location
   reliability_level    = "Bronze"
   upgrade_mode         = "Manual"
-  cluster_code_version = "7.2.413.9590"
+  cluster_code_version = "8.1.316.9590"
   vm_image             = "Windows"
   management_endpoint  = "https://example:80"
 
diff --git a/azure-test/tests/azure_servicebus_namespace/test-get-expected.json b/azure-test/tests/azure_servicebus_namespace/test-get-expected.json
index 0b832329..9ea28ed2 100644
--- a/azure-test/tests/azure_servicebus_namespace/test-get-expected.json
+++ b/azure-test/tests/azure_servicebus_namespace/test-get-expected.json
@@ -5,8 +5,9 @@
     "name": "{{ resourceName }}",
     "network_rule_set": {
       "properties": {
-        "defaultAction": "Deny",
+        "defaultAction": "Allow",
         "ipRules": [],
+        "publicNetworkAccess": "Enabled",
         "virtualNetworkRules": []
       }
     },
diff --git a/azure-test/tests/azure_servicebus_namespace/variables.tf b/azure-test/tests/azure_servicebus_namespace/variables.tf
index 519d8571..1cc15fa6 100644
--- a/azure-test/tests/azure_servicebus_namespace/variables.tf
+++ b/azure-test/tests/azure_servicebus_namespace/variables.tf
@@ -18,10 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.41.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_sql_server/test-hydrate-expected.json b/azure-test/tests/azure_sql_server/test-hydrate-expected.json
index e42d337a..9c0d1cfe 100644
--- a/azure-test/tests/azure_sql_server/test-hydrate-expected.json
+++ b/azure-test/tests/azure_sql_server/test-hydrate-expected.json
@@ -5,10 +5,8 @@
 				"id": "/subscriptions/{{ output.subscription_id.value }}/resourceGroups/{{ resourceName }}/providers/Microsoft.Sql/servers/{{ resourceName }}/encryptionProtector/current",
 				"kind": "servicemanaged",
 				"name": "current",
-				"properties": {
-					"serverKeyName": "ServiceManaged",
-					"serverKeyType": "ServiceManaged"
-				},
+				"serverKeyName": "ServiceManaged",
+        		"serverKeyType": "ServiceManaged",
 				"type": "Microsoft.Sql/servers/encryptionProtector"
 			}
 		],
@@ -29,17 +27,13 @@
 				"id": "/subscriptions/{{ output.subscription_id.value }}/resourceGroups/{{ resourceName }}/providers/Microsoft.Sql/servers/{{ resourceName }}/auditingSettings/Default",
 				"name": "Default",
 				"properties": {
-					"auditActionsAndGroups": [
-						"SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP",
-						"FAILED_DATABASE_AUTHENTICATION_GROUP",
-						"BATCH_COMPLETED_GROUP"
-					],
-					"isAzureMonitorTargetEnabled": true,
-					"isStorageSecondaryKeyInUse": true,
-					"retentionDays": 6,
-					"state": "Enabled",
+					"auditActionsAndGroups": [],
+					"isAzureMonitorTargetEnabled": false,
+					"isStorageSecondaryKeyInUse": false,
+					"retentionDays": 0,
+					"state": "Disabled",
 					"storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000",
-					"storageEndpoint": "https://{{ resourceName }}.blob.core.windows.net/"
+					"storageEndpoint": ""
 				},
 				"type": "Microsoft.Sql/servers/auditingSettings"
 			}
diff --git a/azure-test/tests/azure_sql_server/variables.tf b/azure-test/tests/azure_sql_server/variables.tf
index 0dab4a47..79176405 100644
--- a/azure-test/tests/azure_sql_server/variables.tf
+++ b/azure-test/tests/azure_sql_server/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.50.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -54,13 +53,6 @@ resource "azurerm_sql_server" "named_test_resource" {
   administrator_login          = "mradministrator"
   administrator_login_password = "thisIsDog11"
 
-  extended_auditing_policy {
-    storage_endpoint                        = azurerm_storage_account.named_test_resource.primary_blob_endpoint
-    storage_account_access_key              = azurerm_storage_account.named_test_resource.primary_access_key
-    storage_account_access_key_is_secondary = true
-    retention_in_days                       = 6
-  }
-
   tags = {
     name = var.resource_name
   }
diff --git a/azure-test/tests/azure_storage_account/variables.tf b/azure-test/tests/azure_storage_account/variables.tf
index 37ec104c..ca2c9d8e 100644
--- a/azure-test/tests/azure_storage_account/variables.tf
+++ b/azure-test/tests/azure_storage_account/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_storage_blob/variables.tf b/azure-test/tests/azure_storage_blob/variables.tf
index c8428d3a..050fe345 100644
--- a/azure-test/tests/azure_storage_blob/variables.tf
+++ b/azure-test/tests/azure_storage_blob/variables.tf
@@ -19,10 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version = "=2.44.0"
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_storage_blob_service/variables.tf b/azure-test/tests/azure_storage_blob_service/variables.tf
index c28304c5..24f88410 100644
--- a/azure-test/tests/azure_storage_blob_service/variables.tf
+++ b/azure-test/tests/azure_storage_blob_service/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_storage_container/variables.tf b/azure-test/tests/azure_storage_container/variables.tf
index fae92b65..a2e3e285 100644
--- a/azure-test/tests/azure_storage_container/variables.tf
+++ b/azure-test/tests/azure_storage_container/variables.tf
@@ -17,9 +17,9 @@ variable "azure_subscription" {
 }
 
 provider "azurerm" {
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_storage_queue/variables.tf b/azure-test/tests/azure_storage_queue/variables.tf
index d8a3d271..5b030b22 100644
--- a/azure-test/tests/azure_storage_queue/variables.tf
+++ b/azure-test/tests/azure_storage_queue/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_storage_share_file/variables.tf b/azure-test/tests/azure_storage_share_file/variables.tf
index 85ea11dd..6ed1099d 100644
--- a/azure-test/tests/azure_storage_share_file/variables.tf
+++ b/azure-test/tests/azure_storage_share_file/variables.tf
@@ -19,7 +19,6 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=3.0.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
   features{}
diff --git a/azure-test/tests/azure_storage_sync/variables.tf b/azure-test/tests/azure_storage_sync/variables.tf
index 89b4ca2d..512c0753 100644
--- a/azure-test/tests/azure_storage_sync/variables.tf
+++ b/azure-test/tests/azure_storage_sync/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
diff --git a/azure-test/tests/azure_storage_table/variables.tf b/azure-test/tests/azure_storage_table/variables.tf
index 91240ea4..e6f42e88 100644
--- a/azure-test/tests/azure_storage_table/variables.tf
+++ b/azure-test/tests/azure_storage_table/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_storage_table_service/variables.tf b/azure-test/tests/azure_storage_table_service/variables.tf
index e312097f..3f926714 100644
--- a/azure-test/tests/azure_storage_table_service/variables.tf
+++ b/azure-test/tests/azure_storage_table_service/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_stream_analytics_job/variables.tf b/azure-test/tests/azure_stream_analytics_job/variables.tf
index 7be1119a..bae24514 100644
--- a/azure-test/tests/azure_stream_analytics_job/variables.tf
+++ b/azure-test/tests/azure_stream_analytics_job/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_subnet/variables.tf b/azure-test/tests/azure_subnet/variables.tf
index f379d684..cb7d8083 100644
--- a/azure-test/tests/azure_subnet/variables.tf
+++ b/azure-test/tests/azure_subnet/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
@@ -48,7 +48,7 @@ resource "azurerm_subnet" "named_test_resource" {
   name                 = var.resource_name
   resource_group_name  = azurerm_resource_group.named_test_resource.name
   virtual_network_name = azurerm_virtual_network.named_test_resource.name
-  address_prefix       = "10.0.1.0/24"
+  address_prefixes       = ["10.0.1.0/24"]
 
   delegation {
     name = "delegation"
diff --git a/azure-test/tests/azure_subscription/variables.tf b/azure-test/tests/azure_subscription/variables.tf
index d20d6b5e..5fafb5b7 100644
--- a/azure-test/tests/azure_subscription/variables.tf
+++ b/azure-test/tests/azure_subscription/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azuread" {
   # Cannot be passed as a variable
-  version         = "=0.10.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azuread_client_config" "current" {}
diff --git a/azure-test/tests/azure_synapse_workspace/variables.tf b/azure-test/tests/azure_synapse_workspace/variables.tf
index 9989f77d..6dddc246 100644
--- a/azure-test/tests/azure_synapse_workspace/variables.tf
+++ b/azure-test/tests/azure_synapse_workspace/variables.tf
@@ -27,9 +27,9 @@ terraform {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  features {}
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 resource "azurerm_resource_group" "named_test_resource" {
diff --git a/azure-test/tests/azure_tenant/test-list-expected.json b/azure-test/tests/azure_tenant/test-list-expected.json
index 10abdf6f..934b9efc 100644
--- a/azure-test/tests/azure_tenant/test-list-expected.json
+++ b/azure-test/tests/azure_tenant/test-list-expected.json
@@ -1,7 +1,7 @@
 [
   {
-    "display_name": null,
-    "name": "{{ output.current_tenant_display_name.value }}",
+    "display_name": "turbot",
+    "name": "turbot",
     "tenant_id": "{{ output.tenant_id.value }}"
   }
 ]
\ No newline at end of file
diff --git a/azure-test/tests/azure_tenant/test-list-query.sql b/azure-test/tests/azure_tenant/test-list-query.sql
index 0b4119cf..74c04c6c 100644
--- a/azure-test/tests/azure_tenant/test-list-query.sql
+++ b/azure-test/tests/azure_tenant/test-list-query.sql
@@ -1,3 +1,3 @@
 select name, display_name, tenant_id
 from azure.azure_tenant
-where tenant_id = '{{ output.tenant_id.value }}'
+where tenant_id = '{{ output.tenant_id.value }}';
diff --git a/azure-test/tests/azure_tenant/test-turbot-expected.json b/azure-test/tests/azure_tenant/test-turbot-expected.json
index b68eb249..fc1c435a 100644
--- a/azure-test/tests/azure_tenant/test-turbot-expected.json
+++ b/azure-test/tests/azure_tenant/test-turbot-expected.json
@@ -1,6 +1,6 @@
 [
   {
-    "name": "{{ output.current_tenant_display_name.value }}",
-    "title": "{{ output.current_tenant_display_name.value }}"
+    "name": "turbot",
+    "title": "turbot"
   }
 ]
\ No newline at end of file
diff --git a/azure-test/tests/azure_virtual_network/variables.tf b/azure-test/tests/azure_virtual_network/variables.tf
index 527a8a04..1f2e5262 100644
--- a/azure-test/tests/azure_virtual_network/variables.tf
+++ b/azure-test/tests/azure_virtual_network/variables.tf
@@ -19,9 +19,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/azure-test/tests/azure_virtual_network_gateway/variables.tf b/azure-test/tests/azure_virtual_network_gateway/variables.tf
index fb5d7c82..33f4a5ce 100644
--- a/azure-test/tests/azure_virtual_network_gateway/variables.tf
+++ b/azure-test/tests/azure_virtual_network_gateway/variables.tf
@@ -18,9 +18,9 @@ variable "azure_subscription" {
 
 provider "azurerm" {
   # Cannot be passed as a variable
-  version         = "=1.36.0"
   environment     = var.azure_environment
   subscription_id = var.azure_subscription
+  features {}
 }
 
 data "azurerm_client_config" "current" {}