public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-09 03:28:29 +00:00
Code Issues Projects Releases Wiki Activity

Test failures (#2250)

Browse Source 
fix disk encrypt tests
fxing compute instance data source tests
fixing the compute instance migration tests
This commit is contained in:
Chris Stephens 2018-10-12 08:57:09 -07:00 committed by Nathan McKinley
parent 5f236ec8e8
commit c4db896d39
3 changed files with 91 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/data_source_google_compute_instance_test.go
View File

@ -115,8 +115,6 @@ resource "google_compute_instance" "foo" {
baz = "qux" baz = "qux"
} }
create_timeout = 5
metadata { metadata {
startup-script = "echo Hello" startup-script = "echo Hello"
} }

178
google/resource_compute_instance_migrate_test.go
View File

@ -148,28 +148,28 @@ func TestAccComputeInstanceMigrateState_bootDisk(t *testing.T) {
defer cleanUpInstance(config, instanceName, zone) defer cleanUpInstance(config, instanceName, zone)
attributes := map[string]string{ attributes := map[string]string{
"disk.#": "1", "disk.#": "1",
"disk.0.disk": "disk-1", "disk.0.disk": "disk-1",
"disk.0.type": "pd-ssd", "disk.0.type": "pd-ssd",
"disk.0.auto_delete": "false", "disk.0.auto_delete": "false",
"disk.0.size": "12", "disk.0.size": "12",
"disk.0.device_name": "persistent-disk-0", "disk.0.device_name": "persistent-disk-0",
"disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "disk.0.disk_encryption_key_raw": "encrypt-key",
"disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"zone": zone, "zone": zone,
} }
expected := map[string]string{ expected := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"boot_disk.0.auto_delete": "false", "boot_disk.0.auto_delete": "false",
"boot_disk.0.device_name": "persistent-disk-0", "boot_disk.0.device_name": "persistent-disk-0",
"boot_disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "boot_disk.0.disk_encryption_key_raw": "encrypt-key",
"boot_disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "boot_disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"boot_disk.0.initialize_params.#": "1", "boot_disk.0.initialize_params.#": "1",
"boot_disk.0.initialize_params.0.size": "12", "boot_disk.0.initialize_params.0.size": "12",
"boot_disk.0.initialize_params.0.type": "pd-ssd", "boot_disk.0.initialize_params.0.type": "pd-ssd",
"boot_disk.0.source": instanceName, "boot_disk.0.source": instanceName,
"zone": zone, "zone": zone,
"create_timeout": "4", "create_timeout": "4",
} }
runInstanceMigrateTest(t, instanceName, "migrate disk to boot disk", 2 /* state version */, attributes, expected, config) runInstanceMigrateTest(t, instanceName, "migrate disk to boot disk", 2 /* state version */, attributes, expected, config)
@ -215,27 +215,27 @@ func TestAccComputeInstanceMigrateState_v4FixBootDisk(t *testing.T) {
defer cleanUpInstance(config, instanceName, zone) defer cleanUpInstance(config, instanceName, zone)
attributes := map[string]string{ attributes := map[string]string{
"disk.#": "1", "disk.#": "1",
"disk.0.disk": "disk-1", "disk.0.disk": "disk-1",
"disk.0.type": "pd-ssd", "disk.0.type": "pd-ssd",
"disk.0.auto_delete": "false", "disk.0.auto_delete": "false",
"disk.0.size": "12", "disk.0.size": "12",
"disk.0.device_name": "persistent-disk-0", "disk.0.device_name": "persistent-disk-0",
"disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "disk.0.disk_encryption_key_raw": "encrypt-key",
"disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"zone": zone, "zone": zone,
} }
expected := map[string]string{ expected := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"boot_disk.0.auto_delete": "false", "boot_disk.0.auto_delete": "false",
"boot_disk.0.device_name": "persistent-disk-0", "boot_disk.0.device_name": "persistent-disk-0",
"boot_disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "boot_disk.0.disk_encryption_key_raw": "encrypt-key",
"boot_disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "boot_disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"boot_disk.0.initialize_params.#": "1", "boot_disk.0.initialize_params.#": "1",
"boot_disk.0.initialize_params.0.size": "12", "boot_disk.0.initialize_params.0.size": "12",
"boot_disk.0.initialize_params.0.type": "pd-ssd", "boot_disk.0.initialize_params.0.type": "pd-ssd",
"boot_disk.0.source": instanceName, "boot_disk.0.source": instanceName,
"zone": zone, "zone": zone,
} }
runInstanceMigrateTest(t, instanceName, "migrate disk to boot disk", 4 /* state version */, attributes, expected, config) runInstanceMigrateTest(t, instanceName, "migrate disk to boot disk", 4 /* state version */, attributes, expected, config)
@ -299,21 +299,21 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromSource(t *testing.T) {
defer cleanUpInstance(config, instanceName, zone) defer cleanUpInstance(config, instanceName, zone)
attributes := map[string]string{ attributes := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"disk.#": "1", "disk.#": "1",
"disk.0.disk": diskName, "disk.0.disk": diskName,
"disk.0.device_name": "persistent-disk-1", "disk.0.device_name": "persistent-disk-1",
"disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "disk.0.disk_encryption_key_raw": "encrypt-key",
"disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"zone": zone, "zone": zone,
} }
expected := map[string]string{ expected := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"attached_disk.#": "1", "attached_disk.#": "1",
"attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + diskName, "attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + diskName,
"attached_disk.0.device_name": "persistent-disk-1", "attached_disk.0.device_name": "persistent-disk-1",
"attached_disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "attached_disk.0.disk_encryption_key_raw": "encrypt-key",
"attached_disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "attached_disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"zone": zone, "zone": zone,
"create_timeout": "4", "create_timeout": "4",
} }
@ -379,21 +379,21 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromSource(t *testing.T
defer cleanUpInstance(config, instanceName, zone) defer cleanUpInstance(config, instanceName, zone)
attributes := map[string]string{ attributes := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"disk.#": "1", "disk.#": "1",
"disk.0.disk": diskName, "disk.0.disk": diskName,
"disk.0.device_name": "persistent-disk-1", "disk.0.device_name": "persistent-disk-1",
"disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "disk.0.disk_encryption_key_raw": "encrypt-key",
"disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"zone": zone, "zone": zone,
} }
expected := map[string]string{ expected := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"attached_disk.#": "1", "attached_disk.#": "1",
"attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + diskName, "attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + diskName,
"attached_disk.0.device_name": "persistent-disk-1", "attached_disk.0.device_name": "persistent-disk-1",
"attached_disk.0.disk_encryption_key.0.raw_key": "encrypt-key", "attached_disk.0.disk_encryption_key_raw": "encrypt-key",
"attached_disk.0.disk_encryption_key.0.sha256": "encrypt-key-sha", "attached_disk.0.disk_encryption_key_sha256": "encrypt-key-sha",
"zone": zone, "zone": zone,
} }
@ -447,20 +447,20 @@ func TestAccComputeInstanceMigrateState_attachedDiskFromEncryptionKey(t *testing
defer cleanUpInstance(config, instanceName, zone) defer cleanUpInstance(config, instanceName, zone)
attributes := map[string]string{ attributes := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"disk.#": "1", "disk.#": "1",
"disk.0.image": "projects/debian-cloud/global/images/family/debian-9", "disk.0.image": "projects/debian-cloud/global/images/family/debian-9",
"disk.0.disk_encryption_key.0.raw_key": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=", "disk.0.disk_encryption_key_raw": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
"disk.0.disk_encryption_key.0.sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=", "disk.0.disk_encryption_key_sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=",
"zone": zone, "zone": zone,
} }
expected := map[string]string{ expected := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"attached_disk.#": "1", "attached_disk.#": "1",
"attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + instanceName + "-1", "attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + instanceName + "-1",
"attached_disk.0.device_name": "persistent-disk-1", "attached_disk.0.device_name": "persistent-disk-1",
"attached_disk.0.disk_encryption_key.0.raw_key": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=", "attached_disk.0.disk_encryption_key_raw": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
"attached_disk.0.disk_encryption_key.0.sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=", "attached_disk.0.disk_encryption_key_sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=",
"zone": zone, "zone": zone,
"create_timeout": "4", "create_timeout": "4",
} }
@ -515,20 +515,20 @@ func TestAccComputeInstanceMigrateState_v4FixAttachedDiskFromEncryptionKey(t *te
defer cleanUpInstance(config, instanceName, zone) defer cleanUpInstance(config, instanceName, zone)
attributes := map[string]string{ attributes := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"disk.#": "1", "disk.#": "1",
"disk.0.image": "projects/debian-cloud/global/images/family/debian-9", "disk.0.image": "projects/debian-cloud/global/images/family/debian-9",
"disk.0.disk_encryption_key.0.raw_key": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=", "disk.0.disk_encryption_key_raw": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
"disk.0.disk_encryption_key.0.sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=", "disk.0.disk_encryption_key_sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=",
"zone": zone, "zone": zone,
} }
expected := map[string]string{ expected := map[string]string{
"boot_disk.#": "1", "boot_disk.#": "1",
"attached_disk.#": "1", "attached_disk.#": "1",
"attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + instanceName + "-1", "attached_disk.0.source": "https://www.googleapis.com/compute/v1/projects/" + config.Project + "/zones/" + zone + "/disks/" + instanceName + "-1",
"attached_disk.0.device_name": "persistent-disk-1", "attached_disk.0.device_name": "persistent-disk-1",
"attached_disk.0.disk_encryption_key.0.raw_key": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=", "attached_disk.0.disk_encryption_key_raw": "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=",
"attached_disk.0.disk_encryption_key.0.sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=", "attached_disk.0.disk_encryption_key_sha256": "esTuF7d4eatX4cnc4JsiEiaI+Rff78JgPhA/v1zxX9E=",
"zone": zone, "zone": zone,
} }

8
google/resource_compute_snapshot_test.go
View File

@ -254,11 +254,7 @@ resource "google_compute_snapshot" "foobar" {
name = "%s" name = "%s"
source_disk = "${google_compute_disk.foobar.name}" source_disk = "${google_compute_disk.foobar.name}"
zone = "us-central1-a" zone = "us-central1-a"
source_disk_encryption_key { source_disk_encryption_key_raw = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0=" snapshot_encryption_key_raw = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
}
snapshot_encryption_key {
raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
}
}`, diskName, snapshotName) }`, diskName, snapshotName)
} }