Skip to content

Commit 8306009

Browse files
renato-rudnickirenato-rudnicki
committed
fix shared network
1 parent e39a508 commit 8306009

File tree

5 files changed

+26
-56
lines changed

5 files changed

+26
-56
lines changed

‎3-networks-hub-and-spoke/modules/base_shared_vpc/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
| firewall\_policy | Policy created for firewall policy rules. |
3535
| network\_name | The name of the VPC being created |
3636
| network\_self\_link | The URI of the VPC being created |
37-
| project | Project name |
3837
| region1\_router1 | Router 1 for Region 1 |
3938
| region1\_router2 | Router 2 for Region 1 |
4039
| region2\_router1 | Router 1 for Region 2 |

‎3-networks-hub-and-spoke/modules/base_shared_vpc/dns.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module "peering_zone" {
4242
source = "terraform-google-modules/cloud-dns/google"
4343
version = "~> 5.0"
4444

45-
count = local.mode == "spoke" ? 1 : 0
45+
count = var.mode == "spoke" ? 1 : 0
4646

4747
project_id = var.project_id
4848
type = "peering"

‎3-networks-hub-and-spoke/modules/base_shared_vpc/main.tf‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
locals {
18-
mode = var.mode == "hub" ? "-hub" : "-spoke"
18+
mode = var.mode == null ? "" : var.mode == "hub" ? "-hub" : "-spoke"
1919
vpc_name = "${var.environment_code}-shared-base${local.mode}"
2020
network_name = "vpc-${local.vpc_name}"
2121
private_googleapis_cidr = module.private_service_connect.private_service_connect_ip
@@ -125,12 +125,9 @@ module "region1_router1" {
125125
network = module.main.network_name
126126
region = var.default_region1
127127
bgp = {
128-
asn = var.bgp_asn_subnet
129-
advertised_groups = ["ALL_SUBNETS"]
130-
advertised_ip_ranges = concat(
131-
[{ range = local.private_googleapis_cidr }],
132-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
133-
)
128+
asn = var.bgp_asn_subnet
129+
advertised_groups = ["ALL_SUBNETS"]
130+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
134131
}
135132
}
136133

@@ -144,12 +141,9 @@ module "region1_router2" {
144141
network = module.main.network_name
145142
region = var.default_region1
146143
bgp = {
147-
asn = var.bgp_asn_subnet
148-
advertised_groups = ["ALL_SUBNETS"]
149-
advertised_ip_ranges = concat(
150-
[{ range = local.private_googleapis_cidr }],
151-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
152-
)
144+
asn = var.bgp_asn_subnet
145+
advertised_groups = ["ALL_SUBNETS"]
146+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
153147
}
154148
}
155149

@@ -163,12 +157,9 @@ module "region2_router1" {
163157
network = module.main.network_name
164158
region = var.default_region2
165159
bgp = {
166-
asn = var.bgp_asn_subnet
167-
advertised_groups = ["ALL_SUBNETS"]
168-
advertised_ip_ranges = concat(
169-
[{ range = local.private_googleapis_cidr }],
170-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
171-
)
160+
asn = var.bgp_asn_subnet
161+
advertised_groups = ["ALL_SUBNETS"]
162+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
172163
}
173164
}
174165

@@ -182,11 +173,8 @@ module "region2_router2" {
182173
network = module.main.network_name
183174
region = var.default_region2
184175
bgp = {
185-
asn = var.bgp_asn_subnet
186-
advertised_groups = ["ALL_SUBNETS"]
187-
advertised_ip_ranges = concat(
188-
[{ range = local.private_googleapis_cidr }],
189-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
190-
)
176+
asn = var.bgp_asn_subnet
177+
advertised_groups = ["ALL_SUBNETS"]
178+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
191179
}
192180
}

‎3-networks-hub-and-spoke/modules/base_shared_vpc/outputs.tf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
output "project" {
18-
value = var.project_id
19-
description = "Project name"
20-
}
21-
2217
output "network_name" {
2318
value = module.main.network_name
2419
description = "The name of the VPC being created"

‎3-networks-hub-and-spoke/modules/restricted_shared_vpc/main.tf‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,9 @@ module "region1_router1" {
129129
network = module.main.network_name
130130
region = var.default_region1
131131
bgp = {
132-
asn = var.bgp_asn_subnet
133-
advertised_groups = ["ALL_SUBNETS"]
134-
advertised_ip_ranges = concat(
135-
[{ range = local.restricted_googleapis_cidr }],
136-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
137-
)
132+
asn = var.bgp_asn_subnet
133+
advertised_groups = ["ALL_SUBNETS"]
134+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
138135
}
139136
}
140137

@@ -148,12 +145,9 @@ module "region1_router2" {
148145
network = module.main.network_name
149146
region = var.default_region1
150147
bgp = {
151-
asn = var.bgp_asn_subnet
152-
advertised_groups = ["ALL_SUBNETS"]
153-
advertised_ip_ranges = concat(
154-
[{ range = local.restricted_googleapis_cidr }],
155-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
156-
)
148+
asn = var.bgp_asn_subnet
149+
advertised_groups = ["ALL_SUBNETS"]
150+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
157151
}
158152
}
159153

@@ -167,12 +161,9 @@ module "region2_router1" {
167161
network = module.main.network_name
168162
region = var.default_region2
169163
bgp = {
170-
asn = var.bgp_asn_subnet
171-
advertised_groups = ["ALL_SUBNETS"]
172-
advertised_ip_ranges = concat(
173-
[{ range = local.restricted_googleapis_cidr }],
174-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
175-
)
164+
asn = var.bgp_asn_subnet
165+
advertised_groups = ["ALL_SUBNETS"]
166+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
176167
}
177168
}
178169

@@ -186,11 +177,8 @@ module "region2_router2" {
186177
network = module.main.network_name
187178
region = var.default_region2
188179
bgp = {
189-
asn = var.bgp_asn_subnet
190-
advertised_groups = ["ALL_SUBNETS"]
191-
advertised_ip_ranges = concat(
192-
[{ range = local.restricted_googleapis_cidr }],
193-
var.private_service_cidr != null ? [{ range = local.google_private_service_range }] : []
194-
)
180+
asn = var.bgp_asn_subnet
181+
advertised_groups = ["ALL_SUBNETS"]
182+
advertised_ip_ranges = var.private_service_cidr == null ? [{ range = local.google_private_service_range }] : [{ range = local.private_googleapis_cidr }]
195183
}
196184
}

0 commit comments

Comments
 (0)