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

don't try to parse the source image if there is none

Browse Source
This commit is contained in:
Dana Hoffman 2018-10-10 10:30:55 -07:00 committed by Paddy Carver
parent acb0a16556
commit a0979fe66a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
google/resource_compute_instance_template.go
View File

@ -689,15 +689,19 @@ func flattenDisks(disks []*computeBeta.AttachedDisk, d *schema.ResourceData, def
for _, disk := range disks { for _, disk := range disks {
diskMap := make(map[string]interface{}) diskMap := make(map[string]interface{})
if disk.InitializeParams != nil { if disk.InitializeParams != nil {
selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage) if disk.InitializeParams.SourceImage != "" {
if err != nil { selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage)
return nil, errwrap.Wrapf("Error expanding source image input to self_link: {{err}}", err) 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_type"] = disk.InitializeParams.DiskType
diskMap["disk_name"] = disk.InitializeParams.DiskName diskMap["disk_name"] = disk.InitializeParams.DiskName
diskMap["disk_size_gb"] = disk.InitializeParams.DiskSizeGb diskMap["disk_size_gb"] = disk.InitializeParams.DiskSizeGb