From a1c5c764f40e12daa1012ad19b3eb3c827469b3a Mon Sep 17 00:00:00 2001 From: Imran Nayer Date: Tue, 2 Sep 2025 17:46:35 +0000 Subject: [PATCH 1/2] added include_import_ranges in ncc hub --- modules/network-connectivity-center/README.md | 4 ++-- modules/network-connectivity-center/main.tf | 3 +++ modules/network-connectivity-center/variables.tf | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/network-connectivity-center/README.md b/modules/network-connectivity-center/README.md index 332fbc8d4..83c19f412 100644 --- a/modules/network-connectivity-center/README.md +++ b/modules/network-connectivity-center/README.md @@ -23,12 +23,12 @@ An extensive example that also contains the creation and attachment of multiple | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | export\_psc | Whether Private Service Connect transitivity is enabled for the hub | `bool` | `false` | no | -| hybrid\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | 
map(object({
    location                   = string
    uris                       = set(string)
    site_to_site_data_transfer = optional(bool, false)
    type                       = string
    description                = optional(string)
    labels                     = optional(map(string))
  }))
| `{}` | no | +| hybrid\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | 
map(object({
    location                   = string
    uris                       = set(string)
    site_to_site_data_transfer = optional(bool, false)
    type                       = string
    description                = optional(string)
    labels                     = optional(map(string))
    include_import_ranges      = optional(list(string), [])
  }))
| `{}` | no | | ncc\_hub\_description | The description of the NCC Hub | `string` | `null` | no | | ncc\_hub\_labels | These labels will be added the NCC hub | `map(string)` | `{}` | no | | ncc\_hub\_name | The Name of the NCC Hub | `string` | n/a | yes | | project\_id | Project ID of the project that holds the network. | `string` | n/a | yes | -| router\_appliance\_spokes | Router appliance instances that are associated with the spoke. | 
map(object({
    instances = set(object({
      virtual_machine = string
      ip_address      = string
    }))
    location                   = string
    site_to_site_data_transfer = optional(bool, false)
    description                = optional(string)
    labels                     = optional(map(string))
  }))
| `{}` | no | +| router\_appliance\_spokes | Router appliance instances that are associated with the spoke. | 
map(object({
    instances = set(object({
      virtual_machine = string
      ip_address      = string
    }))
    location                   = string
    site_to_site_data_transfer = optional(bool, false)
    description                = optional(string)
    labels                     = optional(map(string))
    include_import_ranges      = optional(list(string), [])
  }))
| `{}` | no | | spoke\_labels | These labels will be added to all NCC spokes | `map(string)` | `{}` | no | | vpc\_spokes | VPC network that is associated with the spoke | 
map(object({
    uri                   = string
    exclude_export_ranges = optional(set(string), [])
    include_export_ranges = optional(set(string), [])
    description           = optional(string)
    labels                = optional(map(string))
  }))
| `{}` | no | diff --git a/modules/network-connectivity-center/main.tf b/modules/network-connectivity-center/main.tf index 158fcdb93..a5bf784b6 100644 --- a/modules/network-connectivity-center/main.tf +++ b/modules/network-connectivity-center/main.tf @@ -68,6 +68,7 @@ resource "google_network_connectivity_spoke" "hybrid_spoke" { content { uris = each.value.uris site_to_site_data_transfer = each.value.site_to_site_data_transfer + include_import_ranges = each.value.include_import_ranges } } @@ -76,6 +77,7 @@ resource "google_network_connectivity_spoke" "hybrid_spoke" { content { uris = each.value.uris site_to_site_data_transfer = each.value.site_to_site_data_transfer + include_import_ranges = each.value.include_import_ranges } } } @@ -99,6 +101,7 @@ resource "google_network_connectivity_spoke" "router_appliance_spoke" { } } site_to_site_data_transfer = each.value.site_to_site_data_transfer + include_import_ranges = each.value.include_import_ranges } } diff --git a/modules/network-connectivity-center/variables.tf b/modules/network-connectivity-center/variables.tf index 26612b3b6..fc1a0e3ad 100644 --- a/modules/network-connectivity-center/variables.tf +++ b/modules/network-connectivity-center/variables.tf @@ -62,6 +62,7 @@ variable "hybrid_spokes" { type = string description = optional(string) labels = optional(map(string)) + include_import_ranges = optional(list(string), []) })) default = {} } @@ -77,6 +78,7 @@ variable "router_appliance_spokes" { site_to_site_data_transfer = optional(bool, false) description = optional(string) labels = optional(map(string)) + include_import_ranges = optional(list(string), []) })) default = {} } From 4e6a5b279c8a37e5725b3a38c463ca8377266e0e Mon Sep 17 00:00:00 2001 From: Imran Nayer Date: Tue, 2 Sep 2025 17:55:24 +0000 Subject: [PATCH 2/2] updated version --- modules/network-connectivity-center/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/network-connectivity-center/versions.tf b/modules/network-connectivity-center/versions.tf index 0dedb41b3..f3b71441a 100644 --- a/modules/network-connectivity-center/versions.tf +++ b/modules/network-connectivity-center/versions.tf @@ -20,7 +20,7 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.2, < 8" + version = ">= 6.49, < 8" } }