From a0979fe66a8f505c5e57b12a1a153a8bb33fb1f5 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Wed, 10 Oct 2018 10:30:55 -0700 Subject: [PATCH] don't try to parse the source image if there is none --- google/resource_compute_instance_template.go | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/google/resource_compute_instance_template.go b/google/resource_compute_instance_template.go index b47f469f..854616fd 100644 --- a/google/resource_compute_instance_template.go +++ b/google/resource_compute_instance_template.go @@ -689,15 +689,19 @@ func flattenDisks(disks []*computeBeta.AttachedDisk, d *schema.ResourceData, def for _, disk := range disks { diskMap := make(map[string]interface{}) if disk.InitializeParams != nil { - selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage) - if err != nil { - return nil, errwrap.Wrapf("Error expanding source image input to self_link: {{err}}", err) + if disk.InitializeParams.SourceImage != "" { + selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage) + if err != nil { + return nil, errwrap.Wrapf("Error expanding source image input to self_link: {{err}}", err) + } + path, err := getRelativePath(selfLink) + if err != nil { + return nil, errwrap.Wrapf("Error getting relative path for source image: {{err}}", err) + } + diskMap["source_image"] = path + } else { + diskMap["source_image"] = "" } - path, err := getRelativePath(selfLink) - if err != nil { - return nil, errwrap.Wrapf("Error getting relative path for source image: {{err}}", err) - } - diskMap["source_image"] = path diskMap["disk_type"] = disk.InitializeParams.DiskType diskMap["disk_name"] = disk.InitializeParams.DiskName diskMap["disk_size_gb"] = disk.InitializeParams.DiskSizeGb