Skip to content

Commit 44a03f6

Browse files
committed
chore: updated naming convention for internal managed fw rules
1 parent 5fc88e4 commit 44a03f6

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

examples/internal-lb-cloud-run/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ module "frontend-service-a" {
143143
project_id = var.project_id
144144
location = var.subnet_region_a
145145
service_name = "fs-a"
146-
containers = [{ "env_vars" : { "TARGET_IP" : module.internal-lb-http-frontend.ip_address_http_internal_managed[0] }, "ports" = { "container_port" = 80, "name" = "http1" }, "container_name" = "", "container_image" = "gcr.io/design-center-container-repo/redirect-traffic:latest-2002" }]
146+
containers = [{ "env_vars" : { "TARGET_IP" : module.internal-lb-http-frontend.ip_address_internal_managed_http[0] }, "ports" = { "container_port" = 80, "name" = "http1" }, "container_name" = "", "container_image" = "gcr.io/design-center-container-repo/redirect-traffic:latest-2002" }]
147147
members = ["allUsers"]
148148
vpc_access = {
149149
connector = google_vpc_access_connector.internal_lb_vpc_connector.id
@@ -161,7 +161,7 @@ module "frontend-service-b" {
161161
project_id = var.project_id
162162
location = var.subnet_region_a
163163
service_name = "fs-b"
164-
containers = [{ "env_vars" : { "TARGET_IP" : module.internal-lb-http-frontend.ip_address_http_internal_managed[1] }, "ports" = { "container_port" = 80, "name" = "http1" }, "container_name" = "", "container_image" = "gcr.io/design-center-container-repo/redirect-traffic:latest-2002" }]
164+
containers = [{ "env_vars" : { "TARGET_IP" : module.internal-lb-http-frontend.ip_address_internal_managed_http[1] }, "ports" = { "container_port" = 80, "name" = "http1" }, "container_name" = "", "container_image" = "gcr.io/design-center-container-repo/redirect-traffic:latest-2002" }]
165165
members = ["allUsers"]
166166
vpc_access = {
167167
connector = google_vpc_access_connector.internal_lb_vpc_connector.id

modules/frontend/main.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ resource "google_compute_global_forwarding_rule" "http" {
5757
network = local.internal_network
5858
}
5959

60-
resource "google_compute_global_forwarding_rule" "http_internal_managed" {
60+
resource "google_compute_global_forwarding_rule" "internal_managed_http" {
6161
count = local.create_http_forward && local.is_internal_managed ? length(var.internal_forwarding_rule_subnetworks) : 0
6262

6363
provider = google-beta
6464
project = var.project_id
65-
name = "${var.name}-http-internal-managed-${count.index}"
65+
name = "${var.name}-internal-managed-http-${count.index}"
6666
target = google_compute_target_http_proxy.default[0].self_link
6767
port_range = var.http_port
6868
labels = var.labels
@@ -84,12 +84,12 @@ resource "google_compute_global_forwarding_rule" "https" {
8484
network = local.internal_network
8585
}
8686

87-
resource "google_compute_global_forwarding_rule" "https_internal_managed" {
87+
resource "google_compute_global_forwarding_rule" "internal_managed_https" {
8888
count = var.ssl && local.is_internal_managed ? length(var.internal_forwarding_rule_subnetworks) : 0
8989

9090
provider = google-beta
9191
project = var.project_id
92-
name = "${var.name}-https-internal-managed-${count.index}"
92+
name = "${var.name}-internal-managed-https-${count.index}"
9393
target = google_compute_target_https_proxy.default[0].self_link
9494
port_range = var.https_port
9595
labels = var.labels
@@ -122,12 +122,12 @@ resource "google_compute_global_forwarding_rule" "http_ipv6" {
122122
network = local.internal_network
123123
}
124124

125-
resource "google_compute_global_forwarding_rule" "http_ipv6_internal_managed" {
125+
resource "google_compute_global_forwarding_rule" "internal_managed_http_ipv6" {
126126
count = var.enable_ipv6 && local.create_http_forward && local.is_internal_managed ? length(var.internal_forwarding_rule_subnetworks) : 0
127127

128128
provider = google-beta
129129
project = var.project_id
130-
name = "${var.name}-http-ipv6-internal-managed-${count.index}"
130+
name = "${var.name}-internal-managed-http-ipv6-${count.index}"
131131
target = google_compute_target_http_proxy.default[0].self_link
132132
port_range = "80"
133133
labels = var.labels
@@ -149,12 +149,12 @@ resource "google_compute_global_forwarding_rule" "https_ipv6" {
149149
network = local.internal_network
150150
}
151151

152-
resource "google_compute_global_forwarding_rule" "https_ipv6_internal)managed" {
152+
resource "google_compute_global_forwarding_rule" "internal_managed_https_ipv6" {
153153
count = var.enable_ipv6 && var.ssl && local.is_internal_managed ? length(var.internal_forwarding_rule_subnetworks) : 0
154154

155155
provider = google-beta
156156
project = var.project_id
157-
name = "${var.name}-https-ipv6-internal-managed-${count.index}"
157+
name = "${var.name}-internal-managed-https-ipv6-${count.index}"
158158
target = google_compute_target_https_proxy.default[0].self_link
159159
port_range = "443"
160160
labels = var.labels

modules/frontend/outputs.tf

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

17-
output "ip_address_http_internal_managed" {
17+
output "ip_address_internal_managed_http" {
1818
description = "The internal/external IP addresses assigned to the HTTP forwarding rules."
19-
value = [for rule in google_compute_global_forwarding_rule.http_internal_managed : rule.ip_address]
19+
value = [for rule in google_compute_global_forwarding_rule.internal_managed_http : rule.ip_address]
2020
}
2121

2222
output "external_ip" {

modules/frontend/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,4 +203,4 @@ variable "internal_forwarding_rule_subnetworks" {
203203
description = "Subnetworks for internal forwarding rules."
204204
type = list(string)
205205
default = []
206-
}
206+
}

0 commit comments

Comments
 (0)