Avoid nested error in PvcNotFoundError

Signed-off-by: Zvi Cahana <zvic@il.ibm.com>
kubevirt · Sep 19, 2021 · c1ee7fb · c1ee7fb
1 parent fc7ce50
commit c1ee7fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/pkg/virt-controller/services/template.go b/pkg/virt-controller/services/template.go
@@ -135,25 +135,19 @@ type templateService struct {
 }
 
 type PvcNotFoundError struct {
-	Err error
+	Reason string
 }
 
 func (e PvcNotFoundError) Error() string {
-	if e.Err == nil {
-		return ""
-	}
-	return e.Err.Error()
+	return e.Reason
 }
 
 type DataVolumeNotFoundError struct {
-	Err error
+	Reason string
 }
 
 func (e DataVolumeNotFoundError) Error() string {
-	if e.Err == nil {
-		return ""
-	}
-	return e.Err.Error()
+	return e.Reason
 }
 
 func isFeatureStateEnabled(fs *v1.FeatureState) bool {
@@ -534,7 +528,7 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, t
 				return nil, err
 			} else if !exists {
 				logger.Errorf("didn't find PVC %v", claimName)
-				return nil, PvcNotFoundError{Err: fmt.Errorf("didn't find PVC %v", claimName)}
+				return nil, PvcNotFoundError{Reason: fmt.Sprintf("didn't find PVC %v", claimName)}
 			} else if isBlock {
 				devicePath := filepath.Join(string(filepath.Separator), "dev", volume.Name)
 				device := k8sv1.VolumeDevice{
@@ -602,7 +596,7 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, t
 				return nil, err
 			} else if !exists {
 				logger.Errorf("didn't find PVC associated with DataVolume: %v", claimName)
-				return nil, PvcNotFoundError{Err: fmt.Errorf("didn't find PVC associated with DataVolume: %v", claimName)}
+				return nil, PvcNotFoundError{Reason: fmt.Sprintf("didn't find PVC associated with DataVolume: %v", claimName)}
 			} else if isBlock {
 				devicePath := filepath.Join(string(filepath.Separator), "dev", volume.Name)
 				device := k8sv1.VolumeDevice{

diff --git a/pkg/virt-controller/services/template_test.go b/pkg/virt-controller/services/template_test.go
@@ -20,7 +20,6 @@
 package services
 
 import (
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -2088,7 +2087,7 @@ var _ = Describe("Template", func() {
 
 				_, err := svc.RenderLaunchManifest(&vmi)
 				Expect(err).To(HaveOccurred(), "Render manifest results in an error")
-				Expect(err).To(BeAssignableToTypeOf(PvcNotFoundError{Err: errors.New("")}), "Render manifest results in an PvsNotFoundError")
+				Expect(err).To(BeAssignableToTypeOf(PvcNotFoundError{}), "Render manifest results in an PvsNotFoundError")
 			})
 		})
 

diff --git a/pkg/virt-controller/watch/vmi.go b/pkg/virt-controller/watch/vmi.go
@@ -1627,7 +1627,7 @@ func (c *VMIController) volumeReadyToAttachToNode(namespace string, volume virtv
 		// First, ensure DataVolume exists
 		_, err := dataVolumeFunc(name, namespace)
 		if err != nil {
-			return false, false, services.DataVolumeNotFoundError{Err: err}
+			return false, false, services.DataVolumeNotFoundError{Reason: err.Error()}
 		}
 	}
 
@@ -1652,7 +1652,7 @@ func (c *VMIController) volumeReadyToAttachToNode(namespace string, volume virtv
 			}
 		}
 	} else {
-		return false, false, services.PvcNotFoundError{Err: fmt.Errorf("didn't find PVC %v", name)}
+		return false, false, services.PvcNotFoundError{Reason: fmt.Sprintf("didn't find PVC %v", name)}
 	}
 	return ready, wffc, nil
 }