Update ncc example to use star topology

Author: paulwilljones

examples/network_connectivity_center/main.tf

@@ -23,16 +23,32 @@ module "network_connectivity_center" {
   ncc_hub_labels = {
     "module" = "ncc"
   }
+  ncc_hub_preset_topology = "STAR"
+  ncc_groups = {
+    "center" = {
+      name = "center"
+      labels = {
+        "module" = "ncc"
+      }
+    }
+    "edge" = {
+      name = "edge"
+      auto_accept_projects = [
+        "foo",
+        "bar"
+      ]
+    }
+  }
   spoke_labels = {
     "created-by" = "terraform-google-ncc-example"
   }
-
   vpc_spokes = {
     "vpc-1" = {
       uri = module.vpc_spoke_vpc.network_id
       labels = {
         "spoke-type" = "vpc"
       }
+      group = "edge"
     }
     "producer-conn" = {
       uri = google_compute_network.producer_connected_network.id
@@ -49,6 +65,7 @@ module "network_connectivity_center" {
           "198.51.100.0/24",
           "10.10.0.0/16"
         ]
+        group = "center"
       }
     }
   }
@@ -59,6 +76,7 @@ module "network_connectivity_center" {
       uris                       = [for k, v in module.local_to_remote_vpn.tunnel_self_links : v]
       site_to_site_data_transfer = true
       location                   = var.vpn_region
+      group = "center"
     }
   }
   router_appliance_spokes = {
@@ -72,6 +90,7 @@ module "network_connectivity_center" {
       ]
       location                   = var.instance_region
       site_to_site_data_transfer = false
+      group = "center"
     }
   }
 }

modules/network-connectivity-center/main.tf

@@ -50,7 +50,7 @@ resource "google_network_connectivity_hub" "hub" {
 resource "google_network_connectivity_group" "group" {
   for_each = var.ncc_groups
   name     = each.value.name
-  hub      = google_network_connectivity_hub.hub.name
+  hub      = google_network_connectivity_hub.hub.id
   project  = var.project_id
   auto_accept {
     auto_accept_projects = each.value.auto_accept_projects
@@ -82,6 +82,7 @@ resource "google_network_connectivity_spoke" "producer_vpc_network_spoke" {
   description = each.value.description
   hub         = google_network_connectivity_hub.hub.id
   labels      = merge(var.spoke_labels, each.value.labels)
+  group       = each.value.group
 
   linked_producer_vpc_network {
     network               = each.value.network_name
@@ -100,6 +101,7 @@ resource "google_network_connectivity_spoke" "hybrid_spoke" {
   description = each.value.description
   hub         = google_network_connectivity_hub.hub.id
   labels      = merge(var.spoke_labels, each.value.labels)
+  group       = each.value.group
 
   dynamic "linked_interconnect_attachments" {
     for_each = each.value.type == "interconnect" ? [1] : []
@@ -128,6 +130,7 @@ resource "google_network_connectivity_spoke" "router_appliance_spoke" {
   description = each.value.description
   hub         = google_network_connectivity_hub.hub.id
   labels      = merge(var.spoke_labels, each.value.labels)
+  group       = each.value.group
 
   linked_router_appliance_instances {
     dynamic "instances" {

modules/network-connectivity-center/variables.tf

@@ -78,6 +78,7 @@ variable "vpc_spokes" {
       exclude_export_ranges = optional(list(string))
       description           = optional(string)
       labels                = optional(map(string))
+      group                 = optional(string)
     }))
   }))
   default = {}
@@ -104,6 +105,7 @@ variable "hybrid_spokes" {
     description                = optional(string)
     labels                     = optional(map(string))
     include_import_ranges      = optional(list(string), [])
+    group                      = optional(string)
   }))
   default = {}
 }
@@ -120,6 +122,7 @@ variable "router_appliance_spokes" {
     description                = optional(string)
     labels                     = optional(map(string))
     include_import_ranges      = optional(list(string), [])
+    group                      = optional(string)
   }))
   default = {}
 }