mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-06 18:51:13 +00:00
don't try to parse the source image if there is none
This commit is contained in:
parent
acb0a16556
commit
a0979fe66a
@ -689,6 +689,7 @@ 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 {
|
||||||
|
if disk.InitializeParams.SourceImage != "" {
|
||||||
selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage)
|
selfLink, err := resolvedImageSelfLink(defaultProject, disk.InitializeParams.SourceImage)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errwrap.Wrapf("Error expanding source image input to self_link: {{err}}", err)
|
return nil, errwrap.Wrapf("Error expanding source image input to self_link: {{err}}", err)
|
||||||
@ -698,6 +699,9 @@ func flattenDisks(disks []*computeBeta.AttachedDisk, d *schema.ResourceData, def
|
|||||||
return nil, errwrap.Wrapf("Error getting relative path for source image: {{err}}", err)
|
return nil, errwrap.Wrapf("Error getting relative path for source image: {{err}}", err)
|
||||||
}
|
}
|
||||||
diskMap["source_image"] = path
|
diskMap["source_image"] = path
|
||||||
|
} else {
|
||||||
|
diskMap["source_image"] = ""
|
||||||
|
}
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user