diff --git a/build/terraform b/build/terraform index d17b31582e29..e9cb61859bea 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit d17b31582e29aca261c55cf618feda43c8a46224 +Subproject commit e9cb61859beab1202f0cd353e52c08cc0a137588 diff --git a/build/terraform-beta b/build/terraform-beta index 115c62cf1ba7..8684ac7566c3 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 115c62cf1ba7d2afa161a9f70df7145cab13b529 +Subproject commit 8684ac7566c326790f4618c7ea7fbb6973a20db6 diff --git a/products/compute/api.yaml b/products/compute/api.yaml index 49ac46bb205f..04d7d1143803 100644 --- a/products/compute/api.yaml +++ b/products/compute/api.yaml @@ -1009,6 +1009,15 @@ objects: update_url: 'projects/{{project}}/regions/{{region}}/forwardingRules/{{name}}/setLabels' update_verb: :POST min_version: beta + # While this field doesn't appear in the resource definition in the docs, + # it's present in Get and Insert, and the resource has no Update/Patch call. + - !ruby/object:Api::Type::Boolean + name: 'allPorts' + description: | + When the load balancing scheme is INTERNAL and protocol is TCP/UDP, omit + `port`/`port_range` and specify this field as `true` to allow packets addressed + to any ports to be forwarded to the backends configured with this forwarding rule. + min_version: beta - !ruby/object:Api::Type::Enum name: 'networkTier' description: | diff --git a/third_party/terraform/tests/resource_compute_forwarding_rule_test.go.erb b/third_party/terraform/tests/resource_compute_forwarding_rule_test.go.erb index 06e1208399be..1224f9ef9161 100644 --- a/third_party/terraform/tests/resource_compute_forwarding_rule_test.go.erb +++ b/third_party/terraform/tests/resource_compute_forwarding_rule_test.go.erb @@ -252,7 +252,11 @@ resource "google_compute_forwarding_rule" "foobar" { name = "%s" load_balancing_scheme = "INTERNAL" backend_service = "${google_compute_region_backend_service.foobar-bs.self_link}" +<% unless version == 'ga' -%> + all_ports = true +<% else -%> ports = ["80"] +<% end -%> network = "${google_compute_network.foobar.name}" subnetwork = "%s" }