From 4c6c5f57986c2ee6883a7076f06ffc30b798ed9a Mon Sep 17 00:00:00 2001
From: Paul Hinze <phinze@phinze.com>
Date: Mon, 4 Jan 2016 18:04:55 -0600
Subject: [PATCH] provider/google: Fix collisions in SQL instance acctests

---
 .../resource_sql_database_instance_test.go    | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/builtin/providers/google/resource_sql_database_instance_test.go b/builtin/providers/google/resource_sql_database_instance_test.go
index c8c32fc6b..e31d43192 100644
--- a/builtin/providers/google/resource_sql_database_instance_test.go
+++ b/builtin/providers/google/resource_sql_database_instance_test.go
@@ -20,6 +20,7 @@ import (
 
 func TestAccGoogleSqlDatabaseInstance_basic(t *testing.T) {
 	var instance sqladmin.DatabaseInstance
+	databaseID := genRandInt()
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -27,7 +28,8 @@ func TestAccGoogleSqlDatabaseInstance_basic(t *testing.T) {
 		CheckDestroy: testAccGoogleSqlDatabaseInstanceDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testGoogleSqlDatabaseInstance_basic,
+				Config: fmt.Sprintf(
+					testGoogleSqlDatabaseInstance_basic, databaseID),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleSqlDatabaseInstanceExists(
 						"google_sql_database_instance.instance", &instance),
@@ -41,6 +43,7 @@ func TestAccGoogleSqlDatabaseInstance_basic(t *testing.T) {
 
 func TestAccGoogleSqlDatabaseInstance_settings_basic(t *testing.T) {
 	var instance sqladmin.DatabaseInstance
+	databaseID := genRandInt()
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -48,7 +51,8 @@ func TestAccGoogleSqlDatabaseInstance_settings_basic(t *testing.T) {
 		CheckDestroy: testAccGoogleSqlDatabaseInstanceDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testGoogleSqlDatabaseInstance_settings,
+				Config: fmt.Sprintf(
+					testGoogleSqlDatabaseInstance_settings, databaseID),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleSqlDatabaseInstanceExists(
 						"google_sql_database_instance.instance", &instance),
@@ -62,6 +66,7 @@ func TestAccGoogleSqlDatabaseInstance_settings_basic(t *testing.T) {
 
 func TestAccGoogleSqlDatabaseInstance_settings_upgrade(t *testing.T) {
 	var instance sqladmin.DatabaseInstance
+	databaseID := genRandInt()
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -69,7 +74,8 @@ func TestAccGoogleSqlDatabaseInstance_settings_upgrade(t *testing.T) {
 		CheckDestroy: testAccGoogleSqlDatabaseInstanceDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testGoogleSqlDatabaseInstance_basic,
+				Config: fmt.Sprintf(
+					testGoogleSqlDatabaseInstance_basic, databaseID),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleSqlDatabaseInstanceExists(
 						"google_sql_database_instance.instance", &instance),
@@ -78,7 +84,8 @@ func TestAccGoogleSqlDatabaseInstance_settings_upgrade(t *testing.T) {
 				),
 			},
 			resource.TestStep{
-				Config: testGoogleSqlDatabaseInstance_settings,
+				Config: fmt.Sprintf(
+					testGoogleSqlDatabaseInstance_settings, databaseID),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleSqlDatabaseInstanceExists(
 						"google_sql_database_instance.instance", &instance),
@@ -92,6 +99,7 @@ func TestAccGoogleSqlDatabaseInstance_settings_upgrade(t *testing.T) {
 
 func TestAccGoogleSqlDatabaseInstance_settings_downgrade(t *testing.T) {
 	var instance sqladmin.DatabaseInstance
+	databaseID := genRandInt()
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -99,7 +107,8 @@ func TestAccGoogleSqlDatabaseInstance_settings_downgrade(t *testing.T) {
 		CheckDestroy: testAccGoogleSqlDatabaseInstanceDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testGoogleSqlDatabaseInstance_settings,
+				Config: fmt.Sprintf(
+					testGoogleSqlDatabaseInstance_settings, databaseID),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleSqlDatabaseInstanceExists(
 						"google_sql_database_instance.instance", &instance),
@@ -108,7 +117,8 @@ func TestAccGoogleSqlDatabaseInstance_settings_downgrade(t *testing.T) {
 				),
 			},
 			resource.TestStep{
-				Config: testGoogleSqlDatabaseInstance_basic,
+				Config: fmt.Sprintf(
+					testGoogleSqlDatabaseInstance_basic, databaseID),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleSqlDatabaseInstanceExists(
 						"google_sql_database_instance.instance", &instance),
@@ -319,9 +329,7 @@ func testAccGoogleSqlDatabaseInstanceDestroy(s *terraform.State) error {
 	return nil
 }
 
-var databaseId = genRandInt()
-
-var testGoogleSqlDatabaseInstance_basic = fmt.Sprintf(`
+var testGoogleSqlDatabaseInstance_basic = `
 resource "google_sql_database_instance" "instance" {
 	name = "tf-lw-%d"
 	region = "us-central"
@@ -330,9 +338,9 @@ resource "google_sql_database_instance" "instance" {
 		crash_safe_replication = false
 	}
 }
-`, databaseId)
+`
 
-var testGoogleSqlDatabaseInstance_settings = fmt.Sprintf(`
+var testGoogleSqlDatabaseInstance_settings = `
 resource "google_sql_database_instance" "instance" {
 	name = "tf-lw-%d"
 	region = "us-central"
@@ -361,11 +369,11 @@ resource "google_sql_database_instance" "instance" {
 		activation_policy = "ON_DEMAND"
 	}
 }
-`, databaseId)
+`
 
 // Note - this test is not feasible to run unless we generate
 // backups first.
-var testGoogleSqlDatabaseInstance_replica = fmt.Sprintf(`
+var testGoogleSqlDatabaseInstance_replica = `
 resource "google_sql_database_instance" "instance_master" {
 	name = "tf-lw-%d"
 	database_version = "MYSQL_5_6"
@@ -406,4 +414,4 @@ resource "google_sql_database_instance" "instance" {
 		verify_server_certificate = false
 	}
 }
-`, genRandInt(), genRandInt())
+`