Merge pull request #3027 from sparkprime/fix_int_cast

Fix #2901
hashicorp · Aug 19, 2015 · 2c30ff2 · 2c30ff2
2 parents b2731e2 + aa45266
commit 2c30ff2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/builtin/providers/google/resource_compute_instance_template.go b/builtin/providers/google/resource_compute_instance_template.go
@@ -261,7 +261,7 @@ func buildDisks(d *schema.ResourceData, meta interface{}) ([]*compute.AttachedDi
 				disk.InitializeParams.DiskName = v.(string)
 			}
 			if v, ok := d.GetOk(prefix + ".disk_size_gb"); ok {
-				disk.InitializeParams.DiskSizeGb = v.(int64)
+				disk.InitializeParams.DiskSizeGb = int64(v.(int))
 			}
 			disk.InitializeParams.DiskType = "pd-standard"
 			if v, ok := d.GetOk(prefix + ".disk_type"); ok {

diff --git a/builtin/providers/google/resource_compute_instance_template_test.go b/builtin/providers/google/resource_compute_instance_template_test.go
@@ -269,6 +269,7 @@ resource "google_compute_instance_template" "foobar" {
 	disk {
 		source_image = "debian-7-wheezy-v20140814"
 		auto_delete = true
+		disk_size_gb = 100
 		boot = true
 	}