Release/v2.0.2 (#377)

* Update module version to 2.0.2 * Add enable_bgp condition for Basic VPNGW SKU (#376) * Fix incorrect object lookup (#375) * Remove module version from base_module_tags/deployedBy (#374)
Azure · May 13, 2022 · 0db9482 · 0db9482
1 parent 9a1b66e
commit 0db9482
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 22 deletions.
diff --git a/docs/wiki/[Examples]-Deploy-Connectivity-Resources-With-Custom-Settings.md b/docs/wiki/[Examples]-Deploy-Connectivity-Resources-With-Custom-Settings.md
@@ -142,7 +142,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Connectivity-Resources.md b/docs/wiki/[Examples]-Deploy-Connectivity-Resources.md
@@ -65,7 +65,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Custom-Landing-Zone-Archetypes.md b/docs/wiki/[Examples]-Deploy-Custom-Landing-Zone-Archetypes.md
@@ -94,7 +94,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Default-Configuration.md b/docs/wiki/[Examples]-Deploy-Default-Configuration.md
@@ -44,7 +44,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Demo-Landing-Zone-Archetypes.md b/docs/wiki/[Examples]-Deploy-Demo-Landing-Zone-Archetypes.md
@@ -51,7 +51,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Identity-Resources-With-Custom-Settings.md b/docs/wiki/[Examples]-Deploy-Identity-Resources-With-Custom-Settings.md
@@ -100,7 +100,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Identity-Resources.md b/docs/wiki/[Examples]-Deploy-Identity-Resources.md
@@ -58,7 +58,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Management-Resources-With-Custom-Settings.md b/docs/wiki/[Examples]-Deploy-Management-Resources-With-Custom-Settings.md
@@ -130,7 +130,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Management-Resources.md b/docs/wiki/[Examples]-Deploy-Management-Resources.md
@@ -59,7 +59,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Deploy-Using-Module-Nesting.md b/docs/wiki/[Examples]-Deploy-Using-Module-Nesting.md
@@ -12,7 +12,7 @@ The extra code needed to extend your configuration, is the following:
 
 module "enterprise_scale_nested_landing_zone" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm
@@ -134,7 +134,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm
@@ -183,7 +183,7 @@ module "enterprise_scale" {
 
 module "enterprise_scale_nested_landing_zone" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Expand-built-in-archetype-definitions.md b/docs/wiki/[Examples]-Expand-built-in-archetype-definitions.md
@@ -96,7 +96,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[Examples]-Override-Module-Role-Assignments.md b/docs/wiki/[Examples]-Override-Module-Role-Assignments.md
@@ -102,7 +102,7 @@ data "azurerm_client_config" "core" {}
 
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[User-Guide]-Getting-Started.md b/docs/wiki/[User-Guide]-Getting-Started.md
@@ -71,7 +71,7 @@ Copy and paste the following 'module' block into your Terraform configuration, i
 ```hcl
 module "caf-enterprise-scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/docs/wiki/[User-Guide]-Provider-Configuration.md b/docs/wiki/[User-Guide]-Provider-Configuration.md
@@ -69,7 +69,7 @@ provider "azurerm" {
 
 module "caf-enterprise-scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm
@@ -149,7 +149,7 @@ provider "azurerm" {
 
 module "caf-enterprise-scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm
@@ -207,7 +207,7 @@ data "azurerm_client_config" "connectivity" {
 # Map each module provider to their corresponding `azurerm` provider using the providers input object
 module "enterprise_scale" {
   source  = "Azure/caf-enterprise-scale/azurerm"
-  version = "2.0.1"
+  version = "2.0.2"
 
   providers = {
     azurerm              = azurerm

diff --git a/locals.tf b/locals.tf
@@ -85,7 +85,7 @@ locals {
 # tag blocks for each sub-module
 locals {
   base_module_tags = {
-    deployedBy = "terraform/azure/caf-enterprise-scale/${local.module_version}"
+    deployedBy = "terraform/azure/caf-enterprise-scale"
   }
   connectivity_resources_tags = merge(
     local.disable_base_module_tags ? local.empty_map : local.base_module_tags,

diff --git a/locals.version.tf b/locals.version.tf
@@ -1,3 +1,3 @@
 locals {
-  module_version = "v2.0.1"
+  module_version = "v2.0.2"
 }
diff --git a/modules/connectivity/locals.tf b/modules/connectivity/locals.tf
@@ -657,7 +657,7 @@ locals {
         )
       )
       vpn_type      = try(local.custom_settings.azurerm_virtual_network_gateway["connectivity_vpn"][location].vpn_type, "RouteBased")
-      enable_bgp    = coalesce(hub_network.config.virtual_network_gateway.config.advanced_vpn_settings.enable_bgp, false)
+      enable_bgp    = lower(hub_network.config.virtual_network_gateway.config.gateway_sku_vpn) == "basic" ? null : coalesce(hub_network.config.virtual_network_gateway.config.advanced_vpn_settings.enable_bgp, false)
       active_active = coalesce(hub_network.config.virtual_network_gateway.config.advanced_vpn_settings.active_active, false)
       private_ip_address_enabled = (
         contains(

diff --git a/resources.connectivity.tf b/resources.connectivity.tf
@@ -206,7 +206,7 @@ resource "azurerm_virtual_network_gateway" "connectivity" {
     content {
       # Optional attributes
       asn         = try(bgp_settings.value["asn"], null)
-      peer_weight = try(bgp_settings.value["private_ip_address_allocation"], null)
+      peer_weight = try(bgp_settings.value["peer_weight"], null)
 
       dynamic "peering_addresses" {
         for_each = try(bgp_settings.value["peering_addresses"], null)