From 3d1e60b5043c7142f750e6b48dfeb56ff5c3e580 Mon Sep 17 00:00:00 2001
From: Clint <catsby@users.noreply.github.com>
Date: Tue, 6 Jun 2017 09:44:23 -0500
Subject: [PATCH] provider/google: Update compute_disk to read after update,
 always set size (#15095)

---
 builtin/providers/google/resource_compute_disk.go      | 7 ++-----
 builtin/providers/google/resource_compute_disk_test.go | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/builtin/providers/google/resource_compute_disk.go b/builtin/providers/google/resource_compute_disk.go
index 294f654793..c577ad298c 100644
--- a/builtin/providers/google/resource_compute_disk.go
+++ b/builtin/providers/google/resource_compute_disk.go
@@ -204,7 +204,7 @@ func resourceComputeDiskUpdate(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	return nil
+	return resourceComputeDiskRead(d, meta)
 }
 
 func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
@@ -259,10 +259,7 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
 		imageUrlParts := strings.Split(disk.SourceImage, "/")
 		d.Set("image", imageUrlParts[len(imageUrlParts)-1])
 	}
-	if disk.SourceSnapshot != "" {
-		snapshotUrlParts := strings.Split(disk.SourceSnapshot, "/")
-		d.Set("snapshot", snapshotUrlParts[len(snapshotUrlParts)-1])
-	}
+	d.Set("snapshot", disk.SourceSnapshot)
 
 	return nil
 }
diff --git a/builtin/providers/google/resource_compute_disk_test.go b/builtin/providers/google/resource_compute_disk_test.go
index 28288a811c..2583c8e966 100644
--- a/builtin/providers/google/resource_compute_disk_test.go
+++ b/builtin/providers/google/resource_compute_disk_test.go
@@ -304,7 +304,7 @@ resource "google_compute_instance" "bar" {
 	zone = "us-central1-a"
 
 	disk {
-		image = "debian-8"
+		image = "debian-8-jessie-v20170523"
 	}
 
 	disk {