ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6689 from evandbrown/disk-delete 

providers/google: Don't fail deleting disks that don't exist.
This commit is contained in:
James Nugent 2016-05-20 16:58:17 -05:00
parent ab1551e863 f075b0214d
commit 4b89e0802b
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/google/resource_compute_disk.go
View File

@ -184,6 +184,12 @@ func resourceComputeDiskDelete(d *schema.ResourceData, meta interface{}) error {
op, err := config.clientCompute.Disks.Delete(
project, d.Get("zone").(string), d.Id()).Do()
if err != nil {
if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 404 {
log.Printf("[WARN] Removing Disk %q because it's gone", d.Get("name").(string))
// The resource doesn't exist anymore
d.SetId("")
return nil
}
return fmt.Errorf("Error deleting disk: %s", err)
}

33
builtin/providers/google/resource_compute_instance_test.go
View File

@ -126,7 +126,7 @@ func TestAccComputeInstance_IP(t *testing.T) {
})
}
func TestAccComputeInstance_disks(t *testing.T) {
func TestAccComputeInstance_disksWithoutAutodelete(t *testing.T) {
var instance compute.Instance
var instanceName = fmt.Sprintf("instance-test-%s", acctest.RandString(10))
var diskName = fmt.Sprintf("instance-testd-%s", acctest.RandString(10))
@ -137,7 +137,7 @@ func TestAccComputeInstance_disks(t *testing.T) {
CheckDestroy: testAccCheckComputeInstanceDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeInstance_disks(diskName, instanceName),
Config: testAccComputeInstance_disks(diskName, instanceName, false),
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeInstanceExists(
"google_compute_instance.foobar", &instance),
@ -149,6 +149,29 @@ func TestAccComputeInstance_disks(t *testing.T) {
})
}
func TestAccComputeInstance_disksWithAutodelete(t *testing.T) {
var instance compute.Instance
var instanceName = fmt.Sprintf("instance-test-%s", acctest.RandString(10))
var diskName = fmt.Sprintf("instance-testd-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeInstanceDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeInstance_disks(diskName, instanceName, true),
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeInstanceExists(
"google_compute_instance.foobar", &instance),
testAccCheckComputeInstanceDisk(&instance, instanceName, true, true),
testAccCheckComputeInstanceDisk(&instance, diskName, true, false),
),
},
},
})
}
func TestAccComputeInstance_local_ssd(t *testing.T) {
var instance compute.Instance
var instanceName = fmt.Sprintf("instance-test-%s", acctest.RandString(10))
@ -702,7 +725,7 @@ func testAccComputeInstance_ip(ip, instance string) string {
}`, ip, instance)
}
func testAccComputeInstance_disks(disk, instance string) string {
func testAccComputeInstance_disks(disk, instance string, autodelete bool) string {
return fmt.Sprintf(`
resource "google_compute_disk" "foobar" {
name = "%s"
@ -722,7 +745,7 @@ func testAccComputeInstance_disks(disk, instance string) string {
disk {
disk = "${google_compute_disk.foobar.name}"
auto_delete = false
auto_delete = %v
}
network_interface {
@ -732,7 +755,7 @@ func testAccComputeInstance_disks(disk, instance string) string {
metadata {
foo = "bar"
}
}`, disk, instance)
}`, disk, instance, autodelete)
}
func testAccComputeInstance_local_ssd(instance string) string {