From ad1265c901157d6638e2e6dad34039db3b2ff18a Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Thu, 26 Sep 2019 12:37:57 -0700
Subject: [PATCH] Exclude new file, remove unused code from tpg (#2383)

Merged PR #2383.
---
 .ci/magic-modules/generate-terraform.sh                  | 2 +-
 build/terraform                                          | 2 +-
 .../tests/resource_compute_backend_service_test.go.erb   | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.ci/magic-modules/generate-terraform.sh b/.ci/magic-modules/generate-terraform.sh
index f1ae089e81b6..948d338c9694 100755
--- a/.ci/magic-modules/generate-terraform.sh
+++ b/.ci/magic-modules/generate-terraform.sh
@@ -32,7 +32,7 @@ if [ "$GITHUB_ORG" = "terraform-providers" ]; then
     # "-wholename": entire relative path - including directory names - matches following wildcard.
     # "-name": filename alone matches following string.  e.g. -name README.md matches ./README.md *and* ./foo/bar/README.md
     # "-exec": for each file found, execute the command following until the literal ';'
-    find . -type f -not -wholename "./.git*" -not -wholename "./vendor*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name GNUmakefile -not -name LICENSE -not -name README.md -not -wholename "./examples*" -not -name "go.mod" -not -name "go.sum" -not -name "staticcheck.conf" -not -name ".go-version" -not -name ".hashibot.hcl"  -exec git rm {} \;
+    find . -type f -not -wholename "./.git*" -not -wholename "./vendor*" -not -name ".travis.yml" -not -name ".golangci.yml" -not -name "CHANGELOG.md" -not -name "GNUmakefile" -not -name "LICENSE" -not -name "README.md" -not -wholename "./examples*" -not -name "go.mod" -not -name "go.sum" -not -name "staticcheck.conf" -not -name ".go-version" -not -name ".hashibot.hcl" -not -name "tools.go"  -exec git rm {} \;
 fi
 
 popd
diff --git a/build/terraform b/build/terraform
index 4255487e3d7a..c3d1376ba29b 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit 4255487e3d7a19a68bae9f04f17486e6ceef4b32
+Subproject commit c3d1376ba29b3c406985eb1031188bb9c9c59f3d
diff --git a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb
index ecc74590b0e1..d28b241d1dfc 100644
--- a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb
+++ b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb
@@ -851,6 +851,7 @@ func TestAccComputeBackendService_trafficDirectorUpdateFull(t *testing.T) {
 }
 <% end -%>
 
+<% unless version == 'ga' -%>
 func testAccComputeBackendService_trafficDirectorBasic(serviceName, checkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
@@ -885,7 +886,9 @@ resource "google_compute_health_check" "health_check" {
 }
 `, serviceName, checkName)
 }
+<% end -%>
 
+<% unless version == 'ga' -%>
 func testAccComputeBackendService_trafficDirectorUpdateBasic(serviceName, checkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
@@ -911,8 +914,9 @@ resource "google_compute_health_check" "health_check" {
 }
 `, serviceName, checkName)
 }
+<% end -%>
 
-
+<% unless version == 'ga' -%>
 func testAccComputeBackendService_trafficDirectorFull(serviceName, checkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
@@ -947,7 +951,9 @@ resource "google_compute_health_check" "health_check" {
 }
 `, serviceName, checkName)
 }
+<% end -%>
 
+<% unless version == 'ga' -%>
 func testAccComputeBackendService_trafficDirectorUpdateFull(serviceName, checkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
@@ -1006,6 +1012,7 @@ resource "google_compute_health_check" "health_check" {
 }
 `, serviceName, checkName)
 }
+<% end -%>
 
 func testAccComputeBackendService_basic(serviceName, checkName string) string {
 	return fmt.Sprintf(`