From bc9dee14c37afb08df3c21d877cffb4b6ed65e2c Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Wed, 2 Jan 2019 08:49:28 -0800
Subject: [PATCH 1/4] Add support for allPorts at Beta to ForwardingRule.

---
 products/compute/api.yaml                                  | 7 +++++++
 .../tests/resource_compute_forwarding_rule_test.go.erb     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/products/compute/api.yaml b/products/compute/api.yaml
index 49ac46bb205f..0948686c2d4f 100644
--- a/products/compute/api.yaml
+++ b/products/compute/api.yaml
@@ -1009,6 +1009,13 @@ objects:
         update_url: 'projects/{{project}}/regions/{{region}}/forwardingRules/{{name}}/setLabels'
         update_verb: :POST
         min_version: beta
+      - !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..23568b03d412 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,7 @@ resource "google_compute_forwarding_rule" "foobar" {
   name                  = "%s"
   load_balancing_scheme = "INTERNAL"
   backend_service       = "${google_compute_region_backend_service.foobar-bs.self_link}"
-  ports                 = ["80"]
+  all_ports             = true
   network               = "${google_compute_network.foobar.name}"
   subnetwork            = "%s"
 }

From f2a3b9d62a97992c073ff72211fbf8bba58658b2 Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Wed, 2 Jan 2019 08:50:39 -0800
Subject: [PATCH 2/4] Add comment about docs disparity.

---
 products/compute/api.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/products/compute/api.yaml b/products/compute/api.yaml
index 0948686c2d4f..04d7d1143803 100644
--- a/products/compute/api.yaml
+++ b/products/compute/api.yaml
@@ -1009,6 +1009,8 @@ 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: |

From 0c9773d916665286db27975304d3e90807fe9c43 Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Wed, 2 Jan 2019 09:11:46 -0800
Subject: [PATCH 3/4] Emit correct values for tests in GA

---
 .../tests/resource_compute_forwarding_rule_test.go.erb        | 4 ++++
 1 file changed, 4 insertions(+)

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 23568b03d412..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"
 }

From 0029baa84c3f728d059b9ead017caf2b38acfafe Mon Sep 17 00:00:00 2001
From: Modular Magician <magic-modules@google.com>
Date: Wed, 2 Jan 2019 18:01:38 +0000
Subject: [PATCH 4/4] Update tracked submodules -> HEAD on Wed Jan  2 18:01:38
 UTC 2019

Tracked submodules are build/terraform-beta build/terraform build/ansible build/inspec.
---
 build/terraform      | 2 +-
 build/terraform-beta | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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