add star topology support for ncc hub and groups

Author: paulwilljones

modules/network-connectivity-center/main.tf

@@ -31,16 +31,31 @@ locals {
     for k, v in google_network_connectivity_spoke.producer_vpc_network_spoke :
     k => v
   }
+  groups = {
+    for k, v in google_network_connectivity_group.group :
+    k => v
+  }
 }
 
 resource "google_network_connectivity_hub" "hub" {
-  name        = var.ncc_hub_name
-  project     = var.project_id
-  description = var.ncc_hub_description
-  export_psc  = var.export_psc
-  labels      = var.ncc_hub_labels
+  name            = var.ncc_hub_name
+  project         = var.project_id
+  description     = var.ncc_hub_description
+  export_psc      = var.export_psc
+  labels          = var.ncc_hub_labels
+  policy_mode     = var.ncc_hub_policy_mode
+  preset_topology = var.ncc_hub_policy_mode == "PRESET" ? var.ncc_hub_preset_topology : (var.ncc_hub_policy_mode == "CUSTOM" ? "PRESET_TOPOLOGY_UNSPECIFIED" : "MESH")
 }
 
+resource "google_network_connectivity_group" "group" {
+  for_each = var.ncc_groups
+  name     = each.value.name
+  hub      = google_network_connectivity_hub.hub.name
+  project  = var.project_id
+  auto_accept {
+    auto_accept_projects = each.value.auto_accept_projects
+  }
+}
 
 resource "google_network_connectivity_spoke" "vpc_spoke" {
   for_each    = var.vpc_spokes
@@ -50,6 +65,7 @@ resource "google_network_connectivity_spoke" "vpc_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_vpc_network {
     uri                   = each.value.uri

modules/network-connectivity-center/outputs.tf

@@ -60,3 +60,7 @@ output "spokes" {
     },
   ])
 }
+
+output "groups" {
+  value = local.groups
+}

modules/network-connectivity-center/variables.tf

@@ -35,6 +35,26 @@ variable "ncc_hub_labels" {
   default     = {}
 }
 
+variable "ncc_hub_preset_topology" {
+  type    = string
+  default = ""
+}
+
+variable "ncc_hub_policy_mode" {
+  type    = string
+  default = "PRESET"
+}
+
+variable "ncc_groups" {
+  type = map(object({
+    name                 = string
+    labels               = optional(map(string))
+    description          = optional(string)
+    auto_accept_projects = optional(list(string), [])
+  }))
+  default = {}
+}
+
 variable "export_psc" {
   description = "Whether Private Service Connect transitivity is enabled for the hub"
   type        = bool
@@ -49,6 +69,7 @@ variable "vpc_spokes" {
     include_export_ranges = optional(set(string), [])
     description           = optional(string)
     labels                = optional(map(string))
+    group                 = optional(string)
 
     link_producer_vpc_network = optional(object({
       network_name          = string