From 7bf3d67960657c154d14db0ebebf9415520099fd Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 14 Jan 2021 09:38:13 +0000 Subject: [PATCH 1/2] Revert "Upgrade to azurerm 2.42" This reverts commit 6cae711ef9c027722c15f6309d646e818e94163e. --- examples/README.md | 1 + .../100-simple-app-gateway/standalone/main.tf | 2 +- .../101-private-public/standalone/main.tf | 2 +- .../100-all-attributes/standalone/main.tf | 2 +- .../100-simple/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../configuration.tfvars | 8 ++--- .../standalone/main.tf | 2 +- .../configuration.tfvars | 8 ++--- .../standalone/main.tf | 2 +- .../201-groups-and-roles/configuration.tfvars | 8 ++--- .../201-groups-and-roles/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-simple-acr/standalone/main.tf | 2 +- .../200-acr-private-link/standalone/main.tf | 2 +- .../101-single-cluster/standalone/main.tf | 2 +- .../102-multi-nodepools/standalone/main.tf | 2 +- .../103-multi-clusters/standalone/main.tf | 2 +- .../104-private-cluster/keyvault.tfvars | 8 ++--- .../104-private-cluster/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../210-vm-bastion-winrm/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-simple-databricks/standalone/main.tf | 2 +- .../101-datalake-storage/standalone/main.tf | 2 +- .../100-simple-evh/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../101-keyvault-policies/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-aml/configuration.tfvars | 8 ++--- .../100-aml/standalone/main.tf | 2 +- .../101-aml-vnet/configuration.tfvars | 8 ++--- .../101-aml-vnet/standalone/main.tf | 2 +- examples/main.tf | 3 +- .../100-simple-mariadb/standalone/main.tf | 2 +- .../101-vnet-rule-mariadb/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- examples/mssql_mi/200-mi/standalone/main.tf | 2 +- .../elastic_pools/standalone/main.tf | 2 +- .../failover_groups/standalone/main.tf | 2 +- .../100-simple-mysql/standalone/main.tf | 2 +- .../101-vnet-rule-mysql/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-simple-dns_zone/standalone/main.tf | 2 +- .../express_routes/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-simple-front_door/standalone/main.tf | 2 +- .../101-front_door_waf/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../endpoints/centralized/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-subnet-delegation/standalone/main.tf | 2 +- .../101-vnet-peering-nsg/standalone/main.tf | 2 +- .../200-nsg-flow-logs/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../101-vpn-site-to-site/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-vwan-multi-hubs/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../102-vwan-multi-hubs-gw/standalone/main.tf | 2 +- .../100-simple-postgresql/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../101-simple-asrv/standalone/main.tf | 2 +- .../102-asr-protection/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- .../100-redis-standard/standalone/main.tf | 2 +- .../100-synapse/configuration.tfvars | 8 ++--- .../100-synapse/standalone/main.tf | 2 +- .../configuration.tfvars | 8 ++--- .../101-synapse-sparkpool/standalone/main.tf | 2 +- .../101-appservice-simple/standalone/main.tf | 2 +- .../102-appservice-slots/standalone/main.tf | 2 +- .../103-appservice-extend/standalone/main.tf | 2 +- .../standalone/main.tf | 2 +- main.tf | 2 +- .../analytics/machine_learning/workspace.tf | 2 +- modules/compute/aks/README.md | 11 ++----- .../104-private-cluster/keyvault.tfvars | 33 +++++++++++++++++++ modules/security/keyvault/keyvault.tf | 7 ++-- 93 files changed, 153 insertions(+), 126 deletions(-) create mode 100644 modules/compute/aks/examples/104-private-cluster/keyvault.tfvars diff --git a/examples/README.md b/examples/README.md index c50999fc10..0cd68555a5 100755 --- a/examples/README.md +++ b/examples/README.md @@ -84,6 +84,7 @@ You can customize the examples execution by modifying the variables as follow: | terraform | >= 0.13 | | azuread | ~> 1.0.0 | | azurecaf | ~> 1.1.0 | +| azurerm | ~> 2.40.0 | | external | ~> 1.2.0 | | null | ~> 2.1.0 | | random | ~> 2.2.1 | diff --git a/examples/app_gateway/100-simple-app-gateway/standalone/main.tf b/examples/app_gateway/100-simple-app-gateway/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/app_gateway/100-simple-app-gateway/standalone/main.tf +++ b/examples/app_gateway/100-simple-app-gateway/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/app_gateway/101-private-public/standalone/main.tf b/examples/app_gateway/101-private-public/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/app_gateway/101-private-public/standalone/main.tf +++ b/examples/app_gateway/101-private-public/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/app_insights/100-all-attributes/standalone/main.tf b/examples/app_insights/100-all-attributes/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/app_insights/100-all-attributes/standalone/main.tf +++ b/examples/app_insights/100-all-attributes/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/app_insights/100-simple/standalone/main.tf b/examples/app_insights/100-simple/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/app_insights/100-simple/standalone/main.tf +++ b/examples/app_insights/100-simple/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/automation/100-simple-automation-account/standalone/main.tf b/examples/automation/100-simple-automation-account/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/automation/100-simple-automation-account/standalone/main.tf +++ b/examples/automation/100-simple-automation-account/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/azure_ad/100-sevice-principle-with-builtin-roles/configuration.tfvars b/examples/azure_ad/100-sevice-principle-with-builtin-roles/configuration.tfvars index c8e734ebf4..fd5f0da520 100644 --- a/examples/azure_ad/100-sevice-principle-with-builtin-roles/configuration.tfvars +++ b/examples/azure_ad/100-sevice-principle-with-builtin-roles/configuration.tfvars @@ -13,10 +13,10 @@ resource_groups = { keyvaults = { test_client = { - name = "testkv" - resource_group_key = "test" - sku_name = "standard" - #soft_delete_enabled = true + name = "testkv" + resource_group_key = "test" + sku_name = "standard" + soft_delete_enabled = true creation_policies = { logged_in_user = { # if the key is set to "logged_in_user" add the user running terraform in the keyvault policy diff --git a/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf b/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf +++ b/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/azure_ad/101-service-principle-with-custom-roles/configuration.tfvars b/examples/azure_ad/101-service-principle-with-custom-roles/configuration.tfvars index b3f7f0f580..e1de8e3070 100644 --- a/examples/azure_ad/101-service-principle-with-custom-roles/configuration.tfvars +++ b/examples/azure_ad/101-service-principle-with-custom-roles/configuration.tfvars @@ -13,10 +13,10 @@ resource_groups = { keyvaults = { test_client = { #KeyVault Key - name = "testkv" - resource_group_key = "test" - sku_name = "standard" - #soft_delete_enabled = true + name = "testkv" + resource_group_key = "test" + sku_name = "standard" + soft_delete_enabled = true creation_policies = { logged_in_user = { # if the key is set to "logged_in_user" add the user running terraform in the keyvault policy diff --git a/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf b/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf +++ b/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/azure_ad/201-groups-and-roles/configuration.tfvars b/examples/azure_ad/201-groups-and-roles/configuration.tfvars index 21b04feeb3..9e2f5568ef 100644 --- a/examples/azure_ad/201-groups-and-roles/configuration.tfvars +++ b/examples/azure_ad/201-groups-and-roles/configuration.tfvars @@ -13,10 +13,10 @@ resource_groups = { keyvaults = { test_kv = { - name = "testkv" - resource_group_key = "test" - sku_name = "standard" - #soft_delete_enabled = true + name = "testkv" + resource_group_key = "test" + sku_name = "standard" + soft_delete_enabled = true creation_policies = { logged_in_user = { # if the key is set to "logged_in_user" add the user running terraform in the keyvault policy diff --git a/examples/azure_ad/201-groups-and-roles/standalone/main.tf b/examples/azure_ad/201-groups-and-roles/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/azure_ad/201-groups-and-roles/standalone/main.tf +++ b/examples/azure_ad/201-groups-and-roles/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf b/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf +++ b/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf b/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf +++ b/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/container_registry/100-simple-acr/standalone/main.tf b/examples/compute/container_registry/100-simple-acr/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/container_registry/100-simple-acr/standalone/main.tf +++ b/examples/compute/container_registry/100-simple-acr/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/container_registry/200-acr-private-link/standalone/main.tf b/examples/compute/container_registry/200-acr-private-link/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/container_registry/200-acr-private-link/standalone/main.tf +++ b/examples/compute/container_registry/200-acr-private-link/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf b/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf +++ b/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf +++ b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf b/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf +++ b/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/kubernetes_services/104-private-cluster/keyvault.tfvars b/examples/compute/kubernetes_services/104-private-cluster/keyvault.tfvars index 1596c874d7..bfd2c67cdf 100644 --- a/examples/compute/kubernetes_services/104-private-cluster/keyvault.tfvars +++ b/examples/compute/kubernetes_services/104-private-cluster/keyvault.tfvars @@ -1,9 +1,9 @@ keyvaults = { jumpbox = { - name = "jumpbox_akv" - resource_group_key = "aks_jumpbox_re1" - sku_name = "premium" - #soft_delete_enabled = true + name = "jumpbox_akv" + resource_group_key = "aks_jumpbox_re1" + sku_name = "premium" + soft_delete_enabled = true creation_policies = { logged_in_user = { diff --git a/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf b/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf +++ b/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/proximity_placement_group/standalone/main.tf b/examples/compute/proximity_placement_group/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/proximity_placement_group/standalone/main.tf +++ b/examples/compute/proximity_placement_group/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf +++ b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf b/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf index 9c5f8cf3ea..d7afb3a1d2 100644 --- a/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf +++ b/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf b/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf +++ b/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/databricks/100-simple-databricks/standalone/main.tf b/examples/databricks/100-simple-databricks/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/databricks/100-simple-databricks/standalone/main.tf +++ b/examples/databricks/100-simple-databricks/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/datalake/101-datalake-storage/standalone/main.tf b/examples/datalake/101-datalake-storage/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/datalake/101-datalake-storage/standalone/main.tf +++ b/examples/datalake/101-datalake-storage/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/eventhub_namespace/100-simple-evh/standalone/main.tf b/examples/eventhub_namespace/100-simple-evh/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/eventhub_namespace/100-simple-evh/standalone/main.tf +++ b/examples/eventhub_namespace/100-simple-evh/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf b/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf +++ b/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/keyvault/101-keyvault-policies/standalone/main.tf b/examples/keyvault/101-keyvault-policies/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/keyvault/101-keyvault-policies/standalone/main.tf +++ b/examples/keyvault/101-keyvault-policies/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf b/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf index f89c6e2115..915b932951 100644 --- a/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf +++ b/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/machine_learning/100-aml/configuration.tfvars b/examples/machine_learning/100-aml/configuration.tfvars index 285d4ad19f..be4a7550f4 100644 --- a/examples/machine_learning/100-aml/configuration.tfvars +++ b/examples/machine_learning/100-aml/configuration.tfvars @@ -58,9 +58,9 @@ storage_accounts = { # keyvaults = { aml_secrets = { - name = "amlsecrets" - resource_group_key = "dap_azure_ml_re1" - sku_name = "premium" - #soft_delete_enabled = true + name = "amlsecrets" + resource_group_key = "dap_azure_ml_re1" + sku_name = "premium" + soft_delete_enabled = true } } diff --git a/examples/machine_learning/100-aml/standalone/main.tf b/examples/machine_learning/100-aml/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/machine_learning/100-aml/standalone/main.tf +++ b/examples/machine_learning/100-aml/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/machine_learning/101-aml-vnet/configuration.tfvars b/examples/machine_learning/101-aml-vnet/configuration.tfvars index a5eb8b6d65..9919989282 100644 --- a/examples/machine_learning/101-aml-vnet/configuration.tfvars +++ b/examples/machine_learning/101-aml-vnet/configuration.tfvars @@ -70,9 +70,9 @@ storage_accounts = { # keyvaults = { aml_secrets = { - name = "amlsecrets" - resource_group_key = "dap_azure_ml_re1" - sku_name = "premium" - #soft_delete_enabled = true + name = "amlsecrets" + resource_group_key = "dap_azure_ml_re1" + sku_name = "premium" + soft_delete_enabled = true } } \ No newline at end of file diff --git a/examples/machine_learning/101-aml-vnet/standalone/main.tf b/examples/machine_learning/101-aml-vnet/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/machine_learning/101-aml-vnet/standalone/main.tf +++ b/examples/machine_learning/101-aml-vnet/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/main.tf b/examples/main.tf index aa8a3e7244..32e45b17e3 100644 --- a/examples/main.tf +++ b/examples/main.tf @@ -1,7 +1,8 @@ terraform { required_providers { azurerm = { - source = "hashicorp/azurerm" + source = "hashicorp/azurerm" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mariadb_server/100-simple-mariadb/standalone/main.tf b/examples/mariadb_server/100-simple-mariadb/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mariadb_server/100-simple-mariadb/standalone/main.tf +++ b/examples/mariadb_server/100-simple-mariadb/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf b/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf +++ b/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf b/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf +++ b/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf b/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf +++ b/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/monitoring/100-service-health-alerts/standalone/main.tf b/examples/monitoring/100-service-health-alerts/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/monitoring/100-service-health-alerts/standalone/main.tf +++ b/examples/monitoring/100-service-health-alerts/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mssql_mi/200-mi/standalone/main.tf b/examples/mssql_mi/200-mi/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mssql_mi/200-mi/standalone/main.tf +++ b/examples/mssql_mi/200-mi/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mssql_server/elastic_pools/standalone/main.tf b/examples/mssql_server/elastic_pools/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mssql_server/elastic_pools/standalone/main.tf +++ b/examples/mssql_server/elastic_pools/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mssql_server/failover_groups/standalone/main.tf b/examples/mssql_server/failover_groups/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mssql_server/failover_groups/standalone/main.tf +++ b/examples/mssql_server/failover_groups/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mysql_server/100-simple-mysql/standalone/main.tf b/examples/mysql_server/100-simple-mysql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mysql_server/100-simple-mysql/standalone/main.tf +++ b/examples/mysql_server/100-simple-mysql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf b/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf +++ b/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf b/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf +++ b/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf b/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf +++ b/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf b/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf +++ b/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/express_routes/standalone/main.tf b/examples/networking/express_routes/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/express_routes/standalone/main.tf +++ b/examples/networking/express_routes/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf b/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf +++ b/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/front_door/100-simple-front_door/standalone/main.tf b/examples/networking/front_door/100-simple-front_door/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/front_door/100-simple-front_door/standalone/main.tf +++ b/examples/networking/front_door/100-simple-front_door/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/front_door/101-front_door_waf/standalone/main.tf b/examples/networking/front_door/101-front_door_waf/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/front_door/101-front_door_waf/standalone/main.tf +++ b/examples/networking/front_door/101-front_door_waf/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf b/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf +++ b/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/private_links/endpoints/centralized/standalone/main.tf b/examples/networking/private_links/endpoints/centralized/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/private_links/endpoints/centralized/standalone/main.tf +++ b/examples/networking/private_links/endpoints/centralized/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf b/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf +++ b/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf b/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf +++ b/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf b/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf +++ b/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf b/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf +++ b/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf b/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf +++ b/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf b/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf +++ b/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf b/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf +++ b/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf b/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf +++ b/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf b/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf +++ b/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf b/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf +++ b/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf b/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf +++ b/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf b/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf +++ b/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/postgresql_server/100-simple-postgresql/standalone/main.tf b/examples/postgresql_server/100-simple-postgresql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/postgresql_server/100-simple-postgresql/standalone/main.tf +++ b/examples/postgresql_server/100-simple-postgresql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf b/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf +++ b/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf b/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf +++ b/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf b/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf +++ b/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/recovery_vault/101-simple-asrv/standalone/main.tf b/examples/recovery_vault/101-simple-asrv/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/recovery_vault/101-simple-asrv/standalone/main.tf +++ b/examples/recovery_vault/101-simple-asrv/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/recovery_vault/102-asr-protection/standalone/main.tf b/examples/recovery_vault/102-asr-protection/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/recovery_vault/102-asr-protection/standalone/main.tf +++ b/examples/recovery_vault/102-asr-protection/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf b/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf +++ b/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/redis_cache/100-redis-standard/standalone/main.tf b/examples/redis_cache/100-redis-standard/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/redis_cache/100-redis-standard/standalone/main.tf +++ b/examples/redis_cache/100-redis-standard/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/synapse_analytics/100-synapse/configuration.tfvars b/examples/synapse_analytics/100-synapse/configuration.tfvars index b78854beeb..04aac7fd80 100644 --- a/examples/synapse_analytics/100-synapse/configuration.tfvars +++ b/examples/synapse_analytics/100-synapse/configuration.tfvars @@ -66,10 +66,10 @@ storage_accounts = { # keyvaults = { synapse_secrets = { - name = "synapsesecrets" - resource_group_key = "dap_synapse_re1" - sku_name = "premium" - #soft_delete_enabled = true + name = "synapsesecrets" + resource_group_key = "dap_synapse_re1" + sku_name = "premium" + soft_delete_enabled = true creation_policies = { logged_in_user = { diff --git a/examples/synapse_analytics/100-synapse/standalone/main.tf b/examples/synapse_analytics/100-synapse/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/synapse_analytics/100-synapse/standalone/main.tf +++ b/examples/synapse_analytics/100-synapse/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/synapse_analytics/101-synapse-sparkpool/configuration.tfvars b/examples/synapse_analytics/101-synapse-sparkpool/configuration.tfvars index c1e16c1eb0..03cb60f979 100644 --- a/examples/synapse_analytics/101-synapse-sparkpool/configuration.tfvars +++ b/examples/synapse_analytics/101-synapse-sparkpool/configuration.tfvars @@ -97,10 +97,10 @@ storage_accounts = { # keyvaults = { synapse_secrets = { - name = "synapsesecrets" - resource_group_key = "dap_synapse_re1" - sku_name = "premium" - #soft_delete_enabled = true + name = "synapsesecrets" + resource_group_key = "dap_synapse_re1" + sku_name = "premium" + soft_delete_enabled = true creation_policies = { logged_in_user = { diff --git a/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf b/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf +++ b/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/webapps/appservice/101-appservice-simple/standalone/main.tf b/examples/webapps/appservice/101-appservice-simple/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/webapps/appservice/101-appservice-simple/standalone/main.tf +++ b/examples/webapps/appservice/101-appservice-simple/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/webapps/appservice/102-appservice-slots/standalone/main.tf b/examples/webapps/appservice/102-appservice-slots/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/webapps/appservice/102-appservice-slots/standalone/main.tf +++ b/examples/webapps/appservice/102-appservice-slots/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/webapps/appservice/103-appservice-extend/standalone/main.tf b/examples/webapps/appservice/103-appservice-extend/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/webapps/appservice/103-appservice-extend/standalone/main.tf +++ b/examples/webapps/appservice/103-appservice-extend/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf b/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf index e19dd20cd3..84ff4f9784 100644 --- a/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf +++ b/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42.0" + version = "~> 2.40.0" } azuread = { source = "hashicorp/azuread" diff --git a/main.tf b/main.tf index 09b30af5e2..aca1534e4d 100755 --- a/main.tf +++ b/main.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "~> 2.42" + version = "~> 2.40" } azurecaf = { source = "aztfmod/azurecaf" diff --git a/modules/analytics/machine_learning/workspace.tf b/modules/analytics/machine_learning/workspace.tf index 85c831e168..f0028e8ce3 100644 --- a/modules/analytics/machine_learning/workspace.tf +++ b/modules/analytics/machine_learning/workspace.tf @@ -21,7 +21,7 @@ resource "azurerm_machine_learning_workspace" "ws" { sku_name = try(var.settings.sku_name, "basic") identity { - #Hardcoded as the only supported value is SystemAssigned as per azurerm 2.42 + #Hardcoded as the only supported value is SystemAssigned as per azurerm 2.40 type = "SystemAssigned" } } diff --git a/modules/compute/aks/README.md b/modules/compute/aks/README.md index 72e51a175d..c1ddf9e475 100755 --- a/modules/compute/aks/README.md +++ b/modules/compute/aks/README.md @@ -1,16 +1,9 @@ # Azure Kubernetes Services -This sub module is part of Cloud Adoption Framework landing zones for Azure on Terraform. +This submodule is part of Cloud Adoption Framework landing zones for Azure on Terraform. -You can instantiate this module inside your Terraform code either as a module or as a sub module directly from the [Terraform Registry](https://registry.terraform.io/modules/aztfmod/caf/azurerm/latest) using the following calls: +You can instantiate this submodule directly using the following parameters: -Complete module: -```hcl -module "caf" { - source = "aztfmod/caf/azurerm" - version = "4.21.2" - # insert the 6 required variables here -} ``` ## Example scenarios diff --git a/modules/compute/aks/examples/104-private-cluster/keyvault.tfvars b/modules/compute/aks/examples/104-private-cluster/keyvault.tfvars new file mode 100644 index 0000000000..bfd2c67cdf --- /dev/null +++ b/modules/compute/aks/examples/104-private-cluster/keyvault.tfvars @@ -0,0 +1,33 @@ +keyvaults = { + jumpbox = { + name = "jumpbox_akv" + resource_group_key = "aks_jumpbox_re1" + sku_name = "premium" + soft_delete_enabled = true + + creation_policies = { + logged_in_user = { + # if the key is set to "logged_in_user" add the user running terraform in the keyvault policy + # More examples in /examples/keyvault + secret_permissions = ["Set", "Get", "List", "Delete", "Purge", "Recover"] + } + logged_in_aad_app = { + secret_permissions = ["Set", "Get", "List", "Delete", "Purge", "Recover"] + } + # aks_admins = { + # azuread_group_key = "aks_admins" + # secret_permissions = ["Get", "List"] + # } + } + + # # you can setup up to 5 profiles + diagnostic_profiles = { + operations = { + definition_key = "default_all" + destination_type = "log_analytics" + destination_key = "central_logs" + } + } + + } +} \ No newline at end of file diff --git a/modules/security/keyvault/keyvault.tf b/modules/security/keyvault/keyvault.tf index a0d1299f2b..302fbff2c6 100755 --- a/modules/security/keyvault/keyvault.tf +++ b/modules/security/keyvault/keyvault.tf @@ -26,10 +26,9 @@ resource "azurerm_key_vault" "keyvault" { enabled_for_disk_encryption = try(var.settings.enabled_for_disk_encryption, false) enabled_for_template_deployment = try(var.settings.enabled_for_template_deployment, false) purge_protection_enabled = try(var.settings.purge_protection_enabled, false) - # soft_delete_enabled deprecated started in azurerm 2.42 https://github.com/terraform-providers/terraform-provider-azurerm/releases/tag/v2.42.0 - #soft_delete_enabled = try(var.settings.soft_delete_enabled, true) - soft_delete_retention_days = try(var.settings.soft_delete_retention_days, 7) - enable_rbac_authorization = try(var.settings.enable_rbac_authorization, false) + soft_delete_enabled = try(var.settings.soft_delete_enabled, true) + soft_delete_retention_days = try(var.settings.soft_delete_retention_days, 7) + enable_rbac_authorization = try(var.settings.enable_rbac_authorization, false) timeouts { delete = "60m" From 86783ed2855cb4b1ef2ad7840db5df98e46b9621 Mon Sep 17 00:00:00 2001 From: Arnaud Lheureux Date: Thu, 14 Jan 2021 09:40:37 +0000 Subject: [PATCH 2/2] Revert "Remove purge function for azurerm 2.42" This reverts commit 136e5093eee904f7ffdaed963a68a307f8c4e52d. --- .../dynamic_keyvault_secrets/README.md | 4 +- .../dynamic_keyvault_secrets/keyvault.tf | 15 +++--- .../dynamic_keyvault_secrets/secret_purge.tf | 50 +++++++++---------- .../dynamic_keyvault_secrets/variables.tf | 6 +-- 4 files changed, 39 insertions(+), 36 deletions(-) diff --git a/modules/security/dynamic_keyvault_secrets/README.md b/modules/security/dynamic_keyvault_secrets/README.md index 8d071d5be4..16cbaf68c1 100755 --- a/modules/security/dynamic_keyvault_secrets/README.md +++ b/modules/security/dynamic_keyvault_secrets/README.md @@ -19,7 +19,9 @@ No requirements. ## Providers -No provider. +| Name | Version | +|------|---------| +| external | n/a | ## Inputs diff --git a/modules/security/dynamic_keyvault_secrets/keyvault.tf b/modules/security/dynamic_keyvault_secrets/keyvault.tf index 1dbbcd3f16..b3f5ca4692 100644 --- a/modules/security/dynamic_keyvault_secrets/keyvault.tf +++ b/modules/security/dynamic_keyvault_secrets/keyvault.tf @@ -1,5 +1,6 @@ -module "secret" { - source = "./secret" +module secret { + source = "./secret" + depends_on = [data.external.purge_secret] for_each = { for key, value in var.settings : key => value if try(value.value, null) == null @@ -10,8 +11,9 @@ module "secret" { keyvault_id = var.keyvault.id } -module "secret_value" { - source = "./secret" +module secret_value { + source = "./secret" + depends_on = [data.external.purge_secret] for_each = { for key, value in var.settings : key => value if try(value.value, null) != null && try(value.value, null) != "" @@ -22,8 +24,9 @@ module "secret_value" { keyvault_id = var.keyvault.id } -module "secret_immutable" { - source = "./secret_immutable" +module secret_immutable { + source = "./secret_immutable" + depends_on = [data.external.purge_secret] for_each = { for key, value in var.settings : key => value if try(value.value, null) == "" diff --git a/modules/security/dynamic_keyvault_secrets/secret_purge.tf b/modules/security/dynamic_keyvault_secrets/secret_purge.tf index ae094b3ca0..e466fe406e 100644 --- a/modules/security/dynamic_keyvault_secrets/secret_purge.tf +++ b/modules/security/dynamic_keyvault_secrets/secret_purge.tf @@ -2,33 +2,31 @@ # Workaround until # -# Commenting for azurerm 2.42 as secrets purge part of the provider. +data external deleted_secrets { + for_each = var.settings -# data external deleted_secrets { -# for_each = var.settings + program = [ + "bash", + "-c", + format( + "az keyvault secret list-deleted --vault-name '%s' --query \"[?name=='%s'].{recoveryId: recoveryId}\" -o json | jq -rce '.[0] // {}'", + var.keyvault.name, + each.value.secret_name + ) + ] +} -# program = [ -# "bash", -# "-c", -# format( -# "az keyvault secret list-deleted --vault-name '%s' --query \"[?name=='%s'].{recoveryId: recoveryId}\" -o json | jq -rce '.[0] // {}'", -# var.keyvault.name, -# each.value.secret_name -# ) -# ] -# } +locals { + deleted_secrets = data.external.deleted_secrets +} -# locals { -# deleted_secrets = data.external.deleted_secrets -# } +data external purge_secret { + depends_on = [data.external.deleted_secrets] + for_each = var.settings -# data external purge_secret { -# depends_on = [data.external.deleted_secrets] -# for_each = var.settings - -# program = [ -# "bash", -# "-c", -# try(format("az keyvault secret purge --id %s -o json | jq -rce '. // {}'", local.deleted_secrets[each.key].result.recovery), "jq -nr '{}'") -# ] -# } + program = [ + "bash", + "-c", + try(format("az keyvault secret purge --id %s -o json | jq -rce '. // {}'", local.deleted_secrets[each.key].result.recovery), "jq -nr '{}'") + ] +} diff --git a/modules/security/dynamic_keyvault_secrets/variables.tf b/modules/security/dynamic_keyvault_secrets/variables.tf index 8e01f81793..25c141854c 100644 --- a/modules/security/dynamic_keyvault_secrets/variables.tf +++ b/modules/security/dynamic_keyvault_secrets/variables.tf @@ -1,5 +1,5 @@ -variable "settings" {} -variable "keyvault" {} -variable "objects" { +variable settings {} +variable keyvault {} +variable objects { default = {} } \ No newline at end of file