Merge pull request #375 from eparis/print-err

Print err message instead of throwing it away
dmacvicar · Aug 27, 2018 · 9d83963 · 9d83963
2 parents c434619 + a73e75d
commit 9d83963
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/libvirt/cloudinit_def.go b/libvirt/cloudinit_def.go
@@ -222,7 +222,7 @@ func newCloudInitDefFromRemoteISO(virConn *libvirt.Connect, id string) (defCloud
 
 	volume, err := virConn.LookupStorageVolByKey(key)
 	if err != nil {
-		return ci, fmt.Errorf("Can't retrieve volume %s", key)
+		return ci, fmt.Errorf("Can't retrieve volume %s: %v", key, err)
 	}
 	defer volume.Free()
 

diff --git a/libvirt/coreos_ignition_def.go b/libvirt/coreos_ignition_def.go
@@ -168,7 +168,7 @@ func newIgnitionDefFromRemoteVol(virConn *libvirt.Connect, id string) (defIgniti
 
 	volume, err := virConn.LookupStorageVolByKey(key)
 	if err != nil {
-		return ign, fmt.Errorf("Can't retrieve volume %s", key)
+		return ign, fmt.Errorf("Can't retrieve volume %s: %v", key, err)
 	}
 	defer volume.Free()
 

diff --git a/libvirt/resource_libvirt_domain.go b/libvirt/resource_libvirt_domain.go
@@ -929,7 +929,7 @@ func newDiskForCloudInit(virConn *libvirt.Connect, volumeKey string) (libvirtxml
 
 	diskVolume, err := virConn.LookupStorageVolByKey(volumeKey)
 	if err != nil {
-		return disk, fmt.Errorf("Can't retrieve volume %s", volumeKey)
+		return disk, fmt.Errorf("Can't retrieve volume %s: %v", volumeKey, err)
 	}
 	diskVolumeFile, err := diskVolume.GetPath()
 	if err != nil {
@@ -1125,7 +1125,7 @@ func setDisks(d *schema.ResourceData, domainDef *libvirtxml.Domain, virConn *lib
 		if volumeKey, ok := d.GetOk(prefix + ".volume_id"); ok {
 			diskVolume, err := virConn.LookupStorageVolByKey(volumeKey.(string))
 			if err != nil {
-				return fmt.Errorf("Can't retrieve volume %s", volumeKey.(string))
+				return fmt.Errorf("Can't retrieve volume %s: %v", volumeKey.(string), err)
 			}
 			diskVolumeFile, err := diskVolume.GetPath()
 			if err != nil {

diff --git a/libvirt/resource_libvirt_volume.go b/libvirt/resource_libvirt_volume.go
@@ -159,7 +159,7 @@ func resourceLibvirtVolumeCreate(d *schema.ResourceData, meta interface{}) error
 		volume = nil
 		baseVolume, err := client.libvirt.LookupStorageVolByKey(baseVolumeID.(string))
 		if err != nil {
-			return fmt.Errorf("Can't retrieve volume %s", baseVolumeID.(string))
+			return fmt.Errorf("Can't retrieve volume %s: %v", baseVolumeID.(string), err)
 		}
 		backingStoreDef, err := newDefBackingStoreFromLibvirt(baseVolume)
 		if err != nil {
@@ -185,7 +185,7 @@ func resourceLibvirtVolumeCreate(d *schema.ResourceData, meta interface{}) error
 		}
 		baseVolume, err := baseVolumePool.LookupStorageVolByName(baseVolumeName.(string))
 		if err != nil {
-			return fmt.Errorf("Can't retrieve volume %s", baseVolumeName.(string))
+			return fmt.Errorf("Can't retrieve volume %s: %v", baseVolumeName.(string), err)
 		}
 		backingStoreDef, err := newDefBackingStoreFromLibvirt(baseVolume)
 		if err != nil {

diff --git a/libvirt/utils_volume.go b/libvirt/utils_volume.go
@@ -182,7 +182,7 @@ func timeFromEpoch(str string) time.Time {
 func removeVolume(client *Client, key string) error {
 	volume, err := client.libvirt.LookupStorageVolByKey(key)
 	if err != nil {
-		return fmt.Errorf("Can't retrieve volume %s", key)
+		return fmt.Errorf("Can't retrieve volume %s: %v", key, err)
 	}
 	defer volume.Free()