Azure Terraform vWAN | Updated routing-intent deployment

terraform/azure/nva-into-existing-hub/main.tf

@@ -40,8 +40,8 @@ data "http" "image-versions" {
 }
 
 locals {
-      image_versions = tolist([for version in jsondecode(data.http.image-versions.response_body).properties.availableVersions : version if substr(version, 0, 4) == substr(lower(var.os-version), 1, 4)])
-      routing_intent-internet-policy = {
+    image_versions = tolist([for version in jsondecode(data.http.image-versions.response_body).properties.availableVersions : version if substr(version, 0, 4) == substr(lower(var.os-version), 1, 4)])
+    routing_intent-internet-policy = {
         "name": "InternetTraffic",
         "destinations": [
           "Internet"
@@ -55,9 +55,9 @@ locals {
         ],
         "nextHop": "/subscriptions/${var.subscription_id}/resourcegroups/${var.nva-rg-name}/providers/Microsoft.Network/networkVirtualAppliances/${var.nva-name}"
       }
-      routing-intent-policies = var.routing-intent-internet-traffic == "yes" ? (var.routing-intent-private-traffic == "yes" ? tolist([local.routing_intent-internet-policy, local.routing_intent-private-policy]) : tolist([local.routing_intent-internet-policy])) : (var.routing-intent-private-traffic == "yes" ? tolist([local.routing_intent-private-policy]) : [])
-      req_body = jsonencode({"properties": {"routingPolicies": local.routing-intent-policies}})
-      req_url = "https://management.azure.com/subscriptions/${var.subscription_id}/resourceGroups/${var.vwan-hub-resource-group}/providers/Microsoft.Network/virtualHubs/${var.vwan-hub-name}/routingIntent/hubRoutingIntent?api-version=2022-01-01"
+      routing-intent-policies = var.routing-intent-internet-traffic ? (var.routing-intent-private-traffic ? tolist([local.routing_intent-internet-policy, local.routing_intent-private-policy]) : tolist([local.routing_intent-internet-policy])) : (var.routing-intent-private-traffic ? tolist([local.routing_intent-private-policy]) : [])
+
+
 }
 
 //********************** Marketplace Terms & Solution Registration **************************//
@@ -182,14 +182,18 @@ resource "azurerm_managed_application" "nva" {
 
 //********************** Routing Intent **************************//
 
-
-data "external" "update-routing-intent" {
-  count = length(local.routing-intent-policies) != 0 ? 1 : 0
+resource "azurerm_virtual_hub_routing_intent" "routing-intent" {
+  count = (var.routing-intent-internet-traffic || var.routing-intent-private-traffic) ? 1 : 0
   depends_on = [azurerm_managed_application.nva]
-  program = ["python", "../modules/add-routing-intent.py", "${local.req_url}", "${local.req_body}", "${local.access_token}"]
-}
-
-output "api_request_result" {
-  value = length(local.routing-intent-policies) != 0 ? data.external.update-routing-intent[0].result : {routing-intent: "not changed"}
+  name           = "hubRoutingIntent"
+  virtual_hub_id = data.azurerm_virtual_hub.vwan-hub.id
+  dynamic "routing_policy" {
+    for_each = local.routing-intent-policies
+    content {
+      name         = routing_policy.value["name"]
+      destinations = routing_policy.value["destinations"]
+      next_hop     = routing_policy.value["nextHop"]
+    }
+  }
 }
 

terraform/azure/nva-into-existing-hub/terraform.tfvars

@@ -20,8 +20,8 @@ sic-key                             = "PLEASE ENTER SIC KEY"
 ssh-public-key                      = "PLEASE ENTER SSH PUBLIC KEY"                                                       # "ssh-rsa xxxxxxxxxxxxxxxxxxxxxxxx imported-openssh-key"
 bgp-asn                             = "PLEASE ENTER BGP AUTONOMOUS SYSTEM NUMBER"                                         # "64512"
 custom-metrics                      = "PLEASE ENTER yes or no"                                                            # "yes"
-routing-intent-internet-traffic     = "PLEASE ENTER yes or no"                                                            # "yes"
-routing-intent-private-traffic      = "PLEASE ENTER yes or no"                                                            # "yes"
+routing-intent-internet-traffic     = "PLEASE ENTER true or false"                                                        # true
+routing-intent-private-traffic      = "PLEASE ENTER true or false"                                                        # true
 smart1-cloud-token-a                = "PASTE TOKEN FROM SMART-1 CLOUD PORTAL FOR INSTANCE A OR LEAVE EMPTY DOUBLE QUOTES" # "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 smart1-cloud-token-b                = "PASTE TOKEN FROM SMART-1 CLOUD PORTAL FOR INSTANCE B OR LEAVE EMPTY DOUBLE QUOTES" # "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
 smart1-cloud-token-c                = "PASTE TOKEN FROM SMART-1 CLOUD PORTAL FOR INSTANCE C OR LEAVE EMPTY DOUBLE QUOTES" # "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

terraform/azure/nva-into-existing-hub/variables.tf

@@ -135,18 +135,20 @@ variable "custom-metrics" {
 }
 
 variable "routing-intent-internet-traffic" {
-  default = "yes"
+  type = bool
+  default = true
   validation {
-    condition     = contains(["yes", "no"], var.routing-intent-internet-traffic)
-    error_message = "Valid options are string('yes' or 'no')"
+    condition     = contains([true, false], var.routing-intent-internet-traffic)
+    error_message = "Valid options are true or false"
   }
 }
 
 variable "routing-intent-private-traffic" {
-  default = "yes"
+  type = bool
+  default = true
   validation {
-    condition     = contains(["yes", "no"], var.routing-intent-private-traffic)
-    error_message = "Valid options are string('yes' or 'no')"
+    condition     = contains([true, false], var.routing-intent-private-traffic)
+    error_message = "Valid options are true or false"
   }
 }