From 335ccae604b25a4603d32a7f5c8c7e402cdf04db Mon Sep 17 00:00:00 2001
From: Dana Hoffman <danahoffman@google.com>
Date: Mon, 16 Jul 2018 18:46:05 -0700
Subject: [PATCH] force send a bunch more fields in firewall

---
 google/resource_compute_firewall.go      |  2 +-
 google/resource_compute_firewall_test.go | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/google/resource_compute_firewall.go b/google/resource_compute_firewall.go
index c587bda9..2700e72e 100644
--- a/google/resource_compute_firewall.go
+++ b/google/resource_compute_firewall.go
@@ -418,6 +418,6 @@ func resourceFirewall(d *schema.ResourceData, meta interface{}) (*computeBeta.Fi
 		SourceServiceAccounts: convertStringSet(d.Get("source_service_accounts").(*schema.Set)),
 		TargetServiceAccounts: convertStringSet(d.Get("target_service_accounts").(*schema.Set)),
 		Disabled:              d.Get("disabled").(bool),
-		ForceSendFields:       []string{"Disabled"},
+		ForceSendFields:       []string{"Disabled", "Allowed", "Denied", "SourceRanges", "SourceTags", "DestinationRanges", "TargetTags"},
 	}, nil
 }
diff --git a/google/resource_compute_firewall_test.go b/google/resource_compute_firewall_test.go
index 31015536..40a3932b 100644
--- a/google/resource_compute_firewall_test.go
+++ b/google/resource_compute_firewall_test.go
@@ -63,6 +63,11 @@ func TestAccComputeFirewall_update(t *testing.T) {
 					testAccCheckComputeFirewallApiVersion(&firewall),
 				),
 			},
+			{
+				ResourceName:      "google_compute_firewall.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			resource.TestStep{
 				Config: testAccComputeFirewall_update(networkName, firewallName),
 				Check: resource.ComposeTestCheckFunc(
@@ -73,6 +78,24 @@ func TestAccComputeFirewall_update(t *testing.T) {
 					testAccCheckComputeFirewallApiVersion(&firewall),
 				),
 			},
+			{
+				ResourceName:      "google_compute_firewall.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			resource.TestStep{
+				Config: testAccComputeFirewall_basic(networkName, firewallName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeFirewallExists(
+						"google_compute_firewall.foobar", &firewall),
+					testAccCheckComputeFirewallApiVersion(&firewall),
+				),
+			},
+			{
+				ResourceName:      "google_compute_firewall.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -454,6 +477,7 @@ func testAccComputeFirewall_update(network, firewall string) string {
 		description = "Resource created for Terraform acceptance testing"
 		network = "${google_compute_network.foobar.self_link}"
 		source_tags = ["foo"]
+		target_tags = ["bar"]
 
 		allow {
 			protocol = "tcp"