Skip to content

Commit f10a323

Browse files
imrannayerapeabody
andauthored
feat(TPG>=6.49)!: added include_import_ranges in network connectivity center sub-module (#633)
Co-authored-by: Andrew Peabody <[email protected]>
1 parent 34ae6ad commit f10a323

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

modules/network-connectivity-center/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ An extensive example that also contains the creation and attachment of multiple
2323
| Name | Description | Type | Default | Required |
2424
|------|-------------|------|---------|:--------:|
2525
| export\_psc | Whether Private Service Connect transitivity is enabled for the hub | `bool` | `false` | no |
26-
| hybrid\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |
26+
| hybrid\_spokes | VLAN attachments and VPN Tunnels that are associated with the spoke. Type must be one of `interconnect` and `vpn`. | <pre>map(object({<br> location = string<br> uris = set(string)<br> site_to_site_data_transfer = optional(bool, false)<br> type = string<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |
2727
| ncc\_hub\_description | The description of the NCC Hub | `string` | `null` | no |
2828
| ncc\_hub\_labels | These labels will be added the NCC hub | `map(string)` | `{}` | no |
2929
| ncc\_hub\_name | The Name of the NCC Hub | `string` | n/a | yes |
3030
| project\_id | Project ID of the project that holds the network. | `string` | n/a | yes |
31-
| router\_appliance\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |
31+
| router\_appliance\_spokes | Router appliance instances that are associated with the spoke. | <pre>map(object({<br> instances = set(object({<br> virtual_machine = string<br> ip_address = string<br> }))<br> location = string<br> site_to_site_data_transfer = optional(bool, false)<br> description = optional(string)<br> labels = optional(map(string))<br> include_import_ranges = optional(list(string), [])<br> }))</pre> | `{}` | no |
3232
| spoke\_labels | These labels will be added to all NCC spokes | `map(string)` | `{}` | no |
3333
| vpc\_spokes | VPC network that is associated with the spoke | <pre>map(object({<br> uri = string<br> exclude_export_ranges = optional(set(string), [])<br> include_export_ranges = optional(set(string), [])<br> description = optional(string)<br> labels = optional(map(string))<br> }))</pre> | `{}` | no |
3434

modules/network-connectivity-center/main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ resource "google_network_connectivity_spoke" "hybrid_spoke" {
6868
content {
6969
uris = each.value.uris
7070
site_to_site_data_transfer = each.value.site_to_site_data_transfer
71+
include_import_ranges = each.value.include_import_ranges
7172
}
7273
}
7374

@@ -76,6 +77,7 @@ resource "google_network_connectivity_spoke" "hybrid_spoke" {
7677
content {
7778
uris = each.value.uris
7879
site_to_site_data_transfer = each.value.site_to_site_data_transfer
80+
include_import_ranges = each.value.include_import_ranges
7981
}
8082
}
8183
}
@@ -99,6 +101,7 @@ resource "google_network_connectivity_spoke" "router_appliance_spoke" {
99101
}
100102
}
101103
site_to_site_data_transfer = each.value.site_to_site_data_transfer
104+
include_import_ranges = each.value.include_import_ranges
102105

103106
}
104107
}

modules/network-connectivity-center/variables.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ variable "hybrid_spokes" {
6262
type = string
6363
description = optional(string)
6464
labels = optional(map(string))
65+
include_import_ranges = optional(list(string), [])
6566
}))
6667
default = {}
6768
}
@@ -77,6 +78,7 @@ variable "router_appliance_spokes" {
7778
site_to_site_data_transfer = optional(bool, false)
7879
description = optional(string)
7980
labels = optional(map(string))
81+
include_import_ranges = optional(list(string), [])
8082
}))
8183
default = {}
8284
}

modules/network-connectivity-center/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ terraform {
2020
required_providers {
2121
google = {
2222
source = "hashicorp/google"
23-
version = ">= 6.2, < 8"
23+
version = ">= 6.49, < 8"
2424

2525
}
2626
}

0 commit comments

Comments
 (0)