Skip to content

Commit 9c320d8

Browse files
LuizSDCitbharathkkb
LuizSDCit
and
bharathkkb
authored
fix: hardcode the regions variables in the 3-networks/shared (terraform-google-modules#699)
* hardcode the regions variables * fix the variables in the readme file * remove the usage of the regions variable in the test * change the regions to be the same as the hardcodeone Co-authored-by: Bharath KKB <[email protected]>
1 parent 90f15f2 commit 9c320d8

File tree

8 files changed

+48
-58
lines changed

8 files changed

+48
-58
lines changed

‎3-networks/envs/shared/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ The purpose of this step is to set up the global [DNS Hub](https://cloud.google.
2222
| base\_hub\_nat\_num\_addresses\_region2 | Number of external IPs to reserve for second Cloud NAT in Base Hub. | `number` | `2` | no |
2323
| base\_hub\_windows\_activation\_enabled | Enable Windows license activation for Windows workloads in Base Hub | `bool` | `false` | no |
2424
| bgp\_asn\_dns | BGP Autonomous System Number (ASN). | `number` | `64667` | no |
25-
| default\_region1 | First subnet region for DNS Hub network. | `string` | n/a | yes |
26-
| default\_region2 | Second subnet region for DNS Hub network. | `string` | n/a | yes |
2725
| dns\_enable\_logging | Toggle DNS logging for VPC DNS. | `bool` | `true` | no |
2826
| domain | The DNS name of forwarding managed zone, for instance 'example.com'. Must end with a period. | `string` | n/a | yes |
2927
| enable\_hub\_and\_spoke | Enable Hub-and-Spoke architecture. | `bool` | `false` | no |

‎3-networks/envs/shared/dns-hub.tf

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ module "dns_hub_vpc" {
6060
delete_default_internet_gateway_routes = "true"
6161

6262
subnets = [{
63-
subnet_name = "sb-c-dns-hub-${var.default_region1}"
63+
subnet_name = "sb-c-dns-hub-${local.default_region1}"
6464
subnet_ip = "172.16.0.0/25"
65-
subnet_region = var.default_region1
65+
subnet_region = local.default_region1
6666
subnet_private_access = "true"
6767
subnet_flow_logs = var.subnetworks_enable_logging
6868
description = "DNS hub subnet for region 1."
6969
}, {
70-
subnet_name = "sb-c-dns-hub-${var.default_region2}"
70+
subnet_name = "sb-c-dns-hub-${local.default_region2}"
7171
subnet_ip = "172.16.0.128/25"
72-
subnet_region = var.default_region2
72+
subnet_region = local.default_region2
7373
subnet_private_access = "true"
7474
subnet_flow_logs = var.subnetworks_enable_logging
7575
description = "DNS hub subnet for region 2."
@@ -124,10 +124,10 @@ module "dns-forwarding-zone" {
124124
module "dns_hub_region1_router1" {
125125
source = "terraform-google-modules/cloud-router/google"
126126
version = "~> 0.4.0"
127-
name = "cr-c-dns-hub-${var.default_region1}-cr1"
127+
name = "cr-c-dns-hub-${local.default_region1}-cr1"
128128
project = local.dns_hub_project_id
129129
network = module.dns_hub_vpc.network_name
130-
region = var.default_region1
130+
region = local.default_region1
131131
bgp = {
132132
asn = var.bgp_asn_dns
133133
advertised_ip_ranges = [{ range = "35.199.192.0/19" }]
@@ -137,10 +137,10 @@ module "dns_hub_region1_router1" {
137137
module "dns_hub_region1_router2" {
138138
source = "terraform-google-modules/cloud-router/google"
139139
version = "~> 0.4.0"
140-
name = "cr-c-dns-hub-${var.default_region1}-cr2"
140+
name = "cr-c-dns-hub-${local.default_region1}-cr2"
141141
project = local.dns_hub_project_id
142142
network = module.dns_hub_vpc.network_name
143-
region = var.default_region1
143+
region = local.default_region1
144144
bgp = {
145145
asn = var.bgp_asn_dns
146146
advertised_ip_ranges = [{ range = "35.199.192.0/19" }]
@@ -150,10 +150,10 @@ module "dns_hub_region1_router2" {
150150
module "dns_hub_region2_router1" {
151151
source = "terraform-google-modules/cloud-router/google"
152152
version = "~> 0.4.0"
153-
name = "cr-c-dns-hub-${var.default_region2}-cr3"
153+
name = "cr-c-dns-hub-${local.default_region2}-cr3"
154154
project = local.dns_hub_project_id
155155
network = module.dns_hub_vpc.network_name
156-
region = var.default_region2
156+
region = local.default_region2
157157
bgp = {
158158
asn = var.bgp_asn_dns
159159
advertised_ip_ranges = [{ range = "35.199.192.0/19" }]
@@ -163,10 +163,10 @@ module "dns_hub_region2_router1" {
163163
module "dns_hub_region2_router2" {
164164
source = "terraform-google-modules/cloud-router/google"
165165
version = "~> 0.4.0"
166-
name = "cr-c-dns-hub-${var.default_region2}-cr4"
166+
name = "cr-c-dns-hub-${local.default_region2}-cr4"
167167
project = local.dns_hub_project_id
168168
network = module.dns_hub_vpc.network_name
169-
region = var.default_region2
169+
region = local.default_region2
170170
bgp = {
171171
asn = var.bgp_asn_dns
172172
advertised_ip_ranges = [{ range = "35.199.192.0/19" }]

‎3-networks/envs/shared/interconnect.tf.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module "dns_hub_interconnect" {
2121
parent_folder = var.parent_folder
2222
vpc_name = "c-dns-hub"
2323

24-
region1 = var.default_region1
24+
region1 = local.default_region1
2525
region1_router1_name = module.dns_hub_region1_router1.router.name
2626
region1_interconnect1_candidate_subnets = ["169.254.0.0/29"]
2727
region1_interconnect1_vlan_tag8021q = "3931"
@@ -33,7 +33,7 @@ module "dns_hub_interconnect" {
3333
region1_interconnect2 = "https://www.googleapis.com/compute/v1/projects/example-interconnect-project/global/interconnects/example-interconnect-2"
3434
region1_interconnect2_location = "las-zone1-770"
3535

36-
region2 = var.default_region2
36+
region2 = local.default_region2
3737
region2_router1_name = module.dns_hub_region2_router1.router.name
3838
region2_interconnect1_candidate_subnets = ["169.254.0.16/29"]
3939
region2_interconnect1_vlan_tag8021q = "3933"

‎3-networks/envs/shared/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ locals {
1919
env = "common"
2020
environment_code = "c"
2121
bgp_asn_number = var.enable_partner_interconnect ? "16550" : "64514"
22+
default_region1 = "us-west1"
23+
default_region2 = "us-central1"
2224
}
2325

2426
data "google_active_folder" "common" {

‎3-networks/envs/shared/net-hubs-transitivity.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
locals {
1818
enable_transitivity = var.enable_hub_and_spoke && var.enable_hub_and_spoke_transitivity
1919
base_regional_aggregates = {
20-
(var.default_region1) = [
20+
(local.default_region1) = [
2121
"10.0.0.0/16",
2222
"100.64.0.0/16"
2323
]
24-
(var.default_region2) = [
24+
(local.default_region2) = [
2525
"10.1.0.0/16",
2626
"100.65.0.0/16"
2727
]
2828
}
2929
restricted_regional_aggregates = {
30-
(var.default_region1) = [
30+
(local.default_region1) = [
3131
"10.8.0.0/16",
3232
"100.72.0.0/16"
3333
]
34-
(var.default_region2) = [
34+
(local.default_region2) = [
3535
"10.9.0.0/16",
3636
"100.73.0.0/16"
3737
]

‎3-networks/envs/shared/net-hubs.tf

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ locals {
2222
* Base network ranges
2323
*/
2424
base_subnet_primary_ranges = {
25-
(var.default_region1) = "10.0.0.0/24"
26-
(var.default_region2) = "10.1.0.0/24"
25+
(local.default_region1) = "10.0.0.0/24"
26+
(local.default_region2) = "10.1.0.0/24"
2727
}
2828
/*
2929
* Restricted network ranges
3030
*/
3131
restricted_subnet_primary_ranges = {
32-
(var.default_region1) = "10.8.0.0/24"
33-
(var.default_region2) = "10.9.0.0/24"
32+
(local.default_region1) = "10.8.0.0/24"
33+
(local.default_region2) = "10.9.0.0/24"
3434
}
3535
}
3636

@@ -64,8 +64,8 @@ module "base_shared_vpc" {
6464
org_id = var.org_id
6565
parent_folder = var.parent_folder
6666
bgp_asn_subnet = local.bgp_asn_number
67-
default_region1 = var.default_region1
68-
default_region2 = var.default_region2
67+
default_region1 = local.default_region1
68+
default_region2 = local.default_region2
6969
domain = var.domain
7070
dns_enable_inbound_forwarding = var.base_hub_dns_enable_inbound_forwarding
7171
dns_enable_logging = var.base_hub_dns_enable_logging
@@ -80,20 +80,20 @@ module "base_shared_vpc" {
8080

8181
subnets = [
8282
{
83-
subnet_name = "sb-c-shared-base-hub-${var.default_region1}"
84-
subnet_ip = local.base_subnet_primary_ranges[var.default_region1]
85-
subnet_region = var.default_region1
83+
subnet_name = "sb-c-shared-base-hub-${local.default_region1}"
84+
subnet_ip = local.base_subnet_primary_ranges[local.default_region1]
85+
subnet_region = local.default_region1
8686
subnet_private_access = "true"
8787
subnet_flow_logs = var.subnetworks_enable_logging
88-
description = "Base network hub subnet for ${var.default_region1}"
88+
description = "Base network hub subnet for ${local.default_region1}"
8989
},
9090
{
91-
subnet_name = "sb-c-shared-base-hub-${var.default_region2}"
92-
subnet_ip = local.base_subnet_primary_ranges[var.default_region2]
93-
subnet_region = var.default_region2
91+
subnet_name = "sb-c-shared-base-hub-${local.default_region2}"
92+
subnet_ip = local.base_subnet_primary_ranges[local.default_region2]
93+
subnet_region = local.default_region2
9494
subnet_private_access = "true"
9595
subnet_flow_logs = var.subnetworks_enable_logging
96-
description = "Base network hub subnet for ${var.default_region2}"
96+
description = "Base network hub subnet for ${local.default_region2}"
9797
}
9898
]
9999
secondary_ranges = {}
@@ -117,8 +117,8 @@ module "restricted_shared_vpc" {
117117
org_id = var.org_id
118118
parent_folder = var.parent_folder
119119
bgp_asn_subnet = local.bgp_asn_number
120-
default_region1 = var.default_region1
121-
default_region2 = var.default_region2
120+
default_region1 = local.default_region1
121+
default_region2 = local.default_region2
122122
domain = var.domain
123123
dns_enable_inbound_forwarding = var.restricted_hub_dns_enable_inbound_forwarding
124124
dns_enable_logging = var.restricted_hub_dns_enable_logging
@@ -133,20 +133,20 @@ module "restricted_shared_vpc" {
133133

134134
subnets = [
135135
{
136-
subnet_name = "sb-c-shared-restricted-hub-${var.default_region1}"
137-
subnet_ip = local.restricted_subnet_primary_ranges[var.default_region1]
138-
subnet_region = var.default_region1
136+
subnet_name = "sb-c-shared-restricted-hub-${local.default_region1}"
137+
subnet_ip = local.restricted_subnet_primary_ranges[local.default_region1]
138+
subnet_region = local.default_region1
139139
subnet_private_access = "true"
140140
subnet_flow_logs = var.subnetworks_enable_logging
141-
description = "Restricted network hub subnet for ${var.default_region1}"
141+
description = "Restricted network hub subnet for ${local.default_region1}"
142142
},
143143
{
144-
subnet_name = "sb-c-shared-restricted-hub-${var.default_region2}"
145-
subnet_ip = local.restricted_subnet_primary_ranges[var.default_region2]
146-
subnet_region = var.default_region2
144+
subnet_name = "sb-c-shared-restricted-hub-${local.default_region2}"
145+
subnet_ip = local.restricted_subnet_primary_ranges[local.default_region2]
146+
subnet_region = local.default_region2
147147
subnet_private_access = "true"
148148
subnet_flow_logs = var.subnetworks_enable_logging
149-
description = "Restricted network hub subnet for ${var.default_region2}"
149+
description = "Restricted network hub subnet for ${local.default_region2}"
150150
}
151151
]
152152
secondary_ranges = {}

‎3-networks/envs/shared/partner_interconnect.tf.example

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ module "shared_restricted_interconnect" {
2525
vpc_type = "restricted"
2626
preactivate = var.preactivate_partner_interconnect
2727

28-
region1 = var.default_region1
28+
region1 = local.default_region1
2929
region1_router1_name = module.restricted_shared_vpc[0].region1_router1.router.name
3030
region1_interconnect1_location = "las-zone1-770"
3131
region1_router2_name = module.restricted_shared_vpc[0].region1_router2.router.name
3232
region1_interconnect2_location = "las-zone1-770"
3333

34-
region2 = var.default_region2
34+
region2 = local.default_region2
3535
region2_router1_name = module.restricted_shared_vpc[0].region2_router1.router.name
3636
region2_interconnect1_location = "lax-zone2-19"
3737
region2_router2_name = module.restricted_shared_vpc[0].region2_router2.router.name
@@ -58,13 +58,13 @@ module "shared_base_interconnect" {
5858
vpc_type = "base"
5959
preactivate = var.preactivate_partner_interconnect
6060

61-
region1 = var.default_region1
61+
region1 = local.default_region1
6262
region1_router1_name = module.base_shared_vpc[0].region1_router1.router.name
6363
region1_interconnect1_location = "las-zone1-770"
6464
region1_router2_name = module.base_shared_vpc[0].region1_router2.router.name
6565
region1_interconnect2_location = "las-zone1-770"
6666

67-
region2 = var.default_region2
67+
region2 = local.default_region2
6868
region2_router1_name = module.base_shared_vpc[0].region2_router1.router.name
6969
region2_interconnect1_location = "lax-zone2-19"
7070
region2_router2_name = module.base_shared_vpc[0].region2_router2.router.name

‎3-networks/envs/shared/variables.tf

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,6 @@ variable "access_context_manager_policy_id" {
4141
description = "The id of the default Access Context Manager policy created in step `1-org`. Can be obtained by running `gcloud access-context-manager policies list --organization YOUR_ORGANIZATION_ID --format=\"value(name)\"`."
4242
}
4343

44-
variable "default_region1" {
45-
type = string
46-
description = "First subnet region for DNS Hub network."
47-
}
48-
49-
variable "default_region2" {
50-
type = string
51-
description = "Second subnet region for DNS Hub network."
52-
}
53-
5444
variable "dns_enable_logging" {
5545
type = bool
5646
description = "Toggle DNS logging for VPC DNS."

0 commit comments

Comments
 (0)