formatting changes for google_compute_instance tests

This commit is contained in:
Dana Hoffman 2017-06-16 16:42:08 -07:00
parent abea820372
commit 4ee6fc5602

View File

@ -867,7 +867,8 @@ func testAccComputeInstance_basic_deprecated_network(instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_update_deprecated_network(instance string) string { func testAccComputeInstance_update_deprecated_network(instance string) string {
@ -889,7 +890,8 @@ func testAccComputeInstance_update_deprecated_network(instance string) string {
metadata { metadata {
bar = "baz" bar = "baz"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_basic(instance string) string { func testAccComputeInstance_basic(instance string) string {
@ -917,7 +919,8 @@ func testAccComputeInstance_basic(instance string) string {
create_timeout = 5 create_timeout = 5
metadata_startup_script = "echo Hello" metadata_startup_script = "echo Hello"
}`, instance) }
`, instance)
} }
func testAccComputeInstance_basic2(instance string) string { func testAccComputeInstance_basic2(instance string) string {
@ -940,7 +943,8 @@ func testAccComputeInstance_basic2(instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_basic3(instance string) string { func testAccComputeInstance_basic3(instance string) string {
@ -960,11 +964,11 @@ func testAccComputeInstance_basic3(instance string) string {
network = "default" network = "default"
} }
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_basic4(instance string) string { func testAccComputeInstance_basic4(instance string) string {
@ -988,7 +992,8 @@ func testAccComputeInstance_basic4(instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_basic5(instance string) string { func testAccComputeInstance_basic5(instance string) string {
@ -1011,7 +1016,8 @@ func testAccComputeInstance_basic5(instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, instance) }
`, instance)
} }
// Update zone to ForceNew, and change metadata k/v entirely // Update zone to ForceNew, and change metadata k/v entirely
@ -1021,7 +1027,6 @@ func testAccComputeInstance_forceNewAndChangeMetadata(instance string) string {
resource "google_compute_instance" "foobar" { resource "google_compute_instance" "foobar" {
name = "%s" name = "%s"
machine_type = "n1-standard-1" machine_type = "n1-standard-1"
zone = "us-central1-a"
zone = "us-central1-b" zone = "us-central1-b"
tags = ["baz"] tags = ["baz"]
@ -1037,7 +1042,8 @@ func testAccComputeInstance_forceNewAndChangeMetadata(instance string) string {
metadata { metadata {
qux = "true" qux = "true"
} }
}`, instance) }
`, instance)
} }
// Update metadata, tags, and network_interface // Update metadata, tags, and network_interface
@ -1061,7 +1067,8 @@ func testAccComputeInstance_update(instance string) string {
metadata { metadata {
bar = "baz" bar = "baz"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_ip(ip, instance string) string { func testAccComputeInstance_ip(ip, instance string) string {
@ -1090,7 +1097,8 @@ func testAccComputeInstance_ip(ip, instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, ip, instance) }
`, ip, instance)
} }
func testAccComputeInstance_disks(disk, instance string, autodelete bool) string { func testAccComputeInstance_disks(disk, instance string, autodelete bool) string {
@ -1123,7 +1131,8 @@ func testAccComputeInstance_disks(disk, instance string, autodelete bool) string
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, disk, instance, autodelete) }
`, disk, instance, autodelete)
} }
func testAccComputeInstance_disks_encryption(disk, instance string) string { func testAccComputeInstance_disks_encryption(disk, instance string) string {
@ -1156,7 +1165,8 @@ func testAccComputeInstance_disks_encryption(disk, instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, disk, instance) }
`, disk, instance)
} }
func testAccComputeInstance_attachedDisk(disk, instance string) string { func testAccComputeInstance_attachedDisk(disk, instance string) string {
@ -1184,7 +1194,8 @@ func testAccComputeInstance_attachedDisk(disk, instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, disk, instance) }
`, disk, instance)
} }
func testAccComputeInstance_noDisk(instance string) string { func testAccComputeInstance_noDisk(instance string) string {
@ -1201,7 +1212,8 @@ func testAccComputeInstance_noDisk(instance string) string {
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_local_ssd(instance string) string { func testAccComputeInstance_local_ssd(instance string) string {
@ -1224,7 +1236,8 @@ func testAccComputeInstance_local_ssd(instance string) string {
network = "default" network = "default"
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_service_account(instance string) string { func testAccComputeInstance_service_account(instance string) string {
@ -1249,7 +1262,8 @@ func testAccComputeInstance_service_account(instance string) string {
"storage-ro", "storage-ro",
] ]
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_scheduling(instance string) string { func testAccComputeInstance_scheduling(instance string) string {
@ -1269,13 +1283,15 @@ func testAccComputeInstance_scheduling(instance string) string {
scheduling { scheduling {
} }
}`, instance) }
`, instance)
} }
func testAccComputeInstance_subnet_auto(instance string) string { func testAccComputeInstance_subnet_auto(instance string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_compute_network" "inst-test-network" { resource "google_compute_network" "inst-test-network" {
name = "inst-test-network-%s" name = "inst-test-network-%s"
auto_create_subnetworks = true auto_create_subnetworks = true
} }
@ -1293,13 +1309,15 @@ func testAccComputeInstance_subnet_auto(instance string) string {
access_config { } access_config { }
} }
}`, acctest.RandString(10), instance) }
`, acctest.RandString(10), instance)
} }
func testAccComputeInstance_subnet_custom(instance string) string { func testAccComputeInstance_subnet_custom(instance string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_compute_network" "inst-test-network" { resource "google_compute_network" "inst-test-network" {
name = "inst-test-network-%s" name = "inst-test-network-%s"
auto_create_subnetworks = false auto_create_subnetworks = false
} }
@ -1324,15 +1342,17 @@ func testAccComputeInstance_subnet_custom(instance string) string {
access_config { } access_config { }
} }
}`, acctest.RandString(10), acctest.RandString(10), instance) }
`, acctest.RandString(10), acctest.RandString(10), instance)
} }
func testAccComputeInstance_subnet_xpn(instance, xpn_host string) string { func testAccComputeInstance_subnet_xpn(instance, xpn_host string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_compute_network" "inst-test-network" { resource "google_compute_network" "inst-test-network" {
name = "inst-test-network-%s" name = "inst-test-network-%s"
auto_create_subnetworks = false
project = "%s" project = "%s"
auto_create_subnetworks = false
} }
resource "google_compute_subnetwork" "inst-test-subnetwork" { resource "google_compute_subnetwork" "inst-test-subnetwork" {
@ -1358,7 +1378,8 @@ func testAccComputeInstance_subnet_xpn(instance, xpn_host string) string {
access_config { } access_config { }
} }
}`, acctest.RandString(10), xpn_host, acctest.RandString(10), xpn_host, instance) }
`, acctest.RandString(10), xpn_host, acctest.RandString(10), xpn_host, instance)
} }
func testAccComputeInstance_address_auto(instance string) string { func testAccComputeInstance_address_auto(instance string) string {
@ -1386,7 +1407,8 @@ func testAccComputeInstance_address_auto(instance string) string {
access_config { } access_config { }
} }
}`, acctest.RandString(10), acctest.RandString(10), instance) }
`, acctest.RandString(10), acctest.RandString(10), instance)
} }
func testAccComputeInstance_address_custom(instance, address string) string { func testAccComputeInstance_address_custom(instance, address string) string {
@ -1415,7 +1437,8 @@ func testAccComputeInstance_address_custom(instance, address string) string {
access_config { } access_config { }
} }
}`, acctest.RandString(10), acctest.RandString(10), instance, address) }
`, acctest.RandString(10), acctest.RandString(10), instance, address)
} }
func testAccComputeInstance_private_image_family(disk, image, family, instance string) string { func testAccComputeInstance_private_image_family(disk, image, family, instance string) string {
@ -1448,7 +1471,8 @@ func testAccComputeInstance_private_image_family(disk, image, family, instance s
metadata { metadata {
foo = "bar" foo = "bar"
} }
}`, disk, image, family, instance) }
`, disk, image, family, instance)
} }
func testAccComputeInstance_invalid_disk(disk, instance string) string { func testAccComputeInstance_invalid_disk(disk, instance string) string {
@ -1479,5 +1503,6 @@ func testAccComputeInstance_invalid_disk(disk, instance string) string {
zone = "us-central1-a" zone = "us-central1-a"
type = "pd-standard" type = "pd-standard"
size = "1" size = "1"
}`, instance, disk) }
`, instance, disk)
} }