better error handling

fenio · Oct 25, 2024 · 9c3ab1b · 9c3ab1b
1 parent 1d65663
commit 9c3ab1b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cmd/plugin/cli/clean.go b/cmd/plugin/cli/clean.go
@@ -2,7 +2,7 @@ package cli
 
 import (
 	"context"
-	"log"
+	"fmt"
 
 	"github.com/fenio/pv-mounter/pkg/plugin"
 	"github.com/spf13/cobra"
@@ -22,7 +22,7 @@ func cleanCmd() *cobra.Command {
 			ctx := context.Background()
 
 			if err := plugin.Clean(ctx, namespace, pvcName, localMountPoint); err != nil {
-				log.Fatalf("Failed to clean PVC: %v", err)
+				return fmt.Errorf("failed to clean PVC: %w", err)
 			}
 			return nil
 		},

diff --git a/cmd/plugin/cli/mount.go b/cmd/plugin/cli/mount.go
@@ -2,7 +2,7 @@ package cli
 
 import (
 	"context"
-	"log"
+	"fmt"
 	"os"
 	"strconv"
 
@@ -25,7 +25,7 @@ func mountCmd() *cobra.Command {
 				if parsedNeedsRoot, err := strconv.ParseBool(needsRootEnv); err == nil {
 					needsRoot = parsedNeedsRoot
 				} else {
-					log.Fatalf("Invalid value for NEEDS_ROOT: %v", needsRootEnv)
+					return fmt.Errorf("invalid value for NEEDS_ROOT: %v", needsRootEnv)
 				}
 			}
 
@@ -35,7 +35,7 @@ func mountCmd() *cobra.Command {
 				if parsedDebug, err := strconv.ParseBool(debugEnv); err == nil {
 					debug = parsedDebug
 				} else {
-					log.Fatalf("Invalid value for DEBUG: %v", debugEnv)
+					return fmt.Errorf("invalid value for DEBUG: %v", debugEnv)
 				}
 			}
 
@@ -47,7 +47,7 @@ func mountCmd() *cobra.Command {
 			ctx := context.Background()
 
 			if err := plugin.Mount(ctx, namespace, pvcName, localMountPoint, needsRoot, debug); err != nil {
-				log.Fatalf("Failed to mount PVC: %v", err)
+				return fmt.Errorf("failed to mount PVC: %w", err)
 			}
 			return nil
 		},