From f703fb0aa8722692293012d39c55b8cb82e19f6f Mon Sep 17 00:00:00 2001
From: The Magician <magic-modules@google.com>
Date: Wed, 2 Jan 2019 17:53:22 -0800
Subject: [PATCH] Cleanup from two overlapping magic modules PRs. (#2787)

---
 ...urce_appengine_firewall_rule_generated_test.go |  6 +++++-
 google/resource_compute_image_generated_test.go   | 15 +++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/google/resource_appengine_firewall_rule_generated_test.go b/google/resource_appengine_firewall_rule_generated_test.go
index 4bb0ee6e..af45f401 100644
--- a/google/resource_appengine_firewall_rule_generated_test.go
+++ b/google/resource_appengine_firewall_rule_generated_test.go
@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -71,10 +72,13 @@ resource "google_appengine_firewall_rule" "rule" {
 }
 
 func testAccCheckAppengineFirewallRuleDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
+	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_appengine_firewall_rule" {
 			continue
 		}
+		if strings.HasPrefix(name, "data.") {
+			continue
+		}
 
 		config := testAccProvider.Meta().(*Config)
 
diff --git a/google/resource_compute_image_generated_test.go b/google/resource_compute_image_generated_test.go
index 7c66e914..eb567d3e 100644
--- a/google/resource_compute_image_generated_test.go
+++ b/google/resource_compute_image_generated_test.go
@@ -27,13 +27,17 @@ import (
 func TestAccComputeImage_imageBasicExample(t *testing.T) {
 	t.Parallel()
 
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(10),
+	}
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckComputeImageDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccComputeImage_imageBasicExample(acctest.RandString(10)),
+				Config: testAccComputeImage_imageBasicExample(context),
 			},
 			{
 				ResourceName:            "google_compute_image.example",
@@ -45,17 +49,16 @@ func TestAccComputeImage_imageBasicExample(t *testing.T) {
 	})
 }
 
-func testAccComputeImage_imageBasicExample(val string) string {
-	return fmt.Sprintf(`
+func testAccComputeImage_imageBasicExample(context map[string]interface{}) string {
+	return Nprintf(`
 resource "google_compute_image" "example" {
-  name = "example-image-%s"
+  name = "example-image-%{random_suffix}"
 
   raw_disk {
     source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz"
   }
 }
-`, val,
-	)
+`, context)
 }
 
 func testAccCheckComputeImageDestroy(s *terraform.State) error {