replaced errors.Wrap with fmt.Errorf

Signed-off-by: Christian Goll <cgoll@suse.com>

internal/pkg/warewulfd/daemon.go

@@ -1,6 +1,7 @@
 package warewulfd
 
 import (
+	"fmt"
 	"log/syslog"
 	"os"
 	"os/exec"
@@ -62,7 +63,7 @@ func DaemonInitLogging() error {
 
 		logwriter, err := syslog.New(syslog.LOG_NOTICE, "warewulfd")
 		if err != nil {
-			return errors.Wrap(err, "Could not create syslog writer")
+			return fmt.Errorf("Could not create syslog writer: %w", err)
 		}
 
 		wwlog.SetLogFormatter(wwlog.DefaultFormatter)
@@ -86,17 +87,17 @@ func DaemonStatus() error {
 
 	dat, err := os.ReadFile(WAREWULFD_PIDFILE)
 	if err != nil {
-		return errors.Wrap(err, "could not read Warewulfd PID file")
+		return fmt.Errorf("could not read Warewulfd PID file: %w", err)
 	}
 
 	pid, _ := strconv.Atoi(string(dat))
 	process, err := os.FindProcess(pid)
 	if err != nil {
-		return errors.Wrap(err, "failed to find running PID")
+		return fmt.Errorf("failed to find running PID: %w", err)
 	} else {
 		err := process.Signal(syscall.Signal(0))
 		if err != nil {
-			return errors.Wrap(err, "failed to send process SIGCONT")
+			return fmt.Errorf("failed to send process SIGCONT: %w", err)
 		} else {
 			wwlog.Serv("Warewulf server is running at PID: %d", pid)
 		}
@@ -112,11 +113,11 @@ func DaemonReload() error {
 	cmd := exec.Command("/usr/sbin/service", "warewulfd", "reload")
 	err := cmd.Start()
 	if err != nil {
-		return errors.Wrap(err, "failed to reload warewulfd")
+		return fmt.Errorf("failed to reload warewulfd: %w", err)
 	}
 	err = cmd.Wait()
 	if err != nil {
-		return errors.Wrap(err, "failed to reload warewulfd")
+		return fmt.Errorf("failed to reload warewulfd: %w", err)
 	}
 	return nil
 }

internal/pkg/warewulfd/nodedb.go

@@ -1,11 +1,10 @@
 package warewulfd
 
 import (
+	"fmt"
 	"strings"
 	"sync"
 
-	"github.com/pkg/errors"
-
 	"github.com/warewulf/warewulf/internal/pkg/node"
 	"github.com/warewulf/warewulf/internal/pkg/wwlog"
 )
@@ -88,11 +87,11 @@ func GetNodeOrSetDiscoverable(hwaddr string) (node.NodeConf, error) {
 	}
 	err = db.yml.Persist()
 	if err != nil {
-		return node, errors.Wrapf(err, "%s (failed to persist node configuration)", hwaddr)
+		return node, fmt.Errorf("%s (failed to persist node configuration) %w", hwaddr, err)
 	}
 	err = loadNodeDB()
 	if err != nil {
-		return node, errors.Wrapf(err, "%s (failed to reload configuration)", hwaddr)
+		return node, fmt.Errorf("%s (failed to reload configuration) %w", hwaddr, err)
 	}
 	// NOTE: previously all overlays were built here, but that will also
 	// be done automatically when attempting to serve an overlay that

internal/pkg/warewulfd/status.go

@@ -2,11 +2,11 @@ package warewulfd
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"sync"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/warewulf/warewulf/internal/pkg/node"
 	"github.com/warewulf/warewulf/internal/pkg/wwlog"
 )
@@ -86,7 +86,7 @@ func statusJSON() ([]byte, error) {
 
 	ret, err := json.MarshalIndent(statusDB, "", "  ")
 	if err != nil {
-		return ret, errors.Wrap(err, "could not marshal JSON data from status structure")
+		return ret, fmt.Errorf("could not marshal JSON data from status structure: %w", err)
 	}
 
 	return ret, nil

internal/pkg/warewulfd/warewulfd.go

@@ -1,6 +1,7 @@
 package warewulfd
 
 import (
+	"fmt"
 	"net/http"
 	"os"
 	"os/signal"
@@ -8,7 +9,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/pkg/errors"
 	warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
 	"github.com/warewulf/warewulf/internal/pkg/wwlog"
 )
@@ -82,7 +82,7 @@ func RunServer() error {
 	err = http.ListenAndServe(":"+strconv.Itoa(daemonPort), &slashFix{&wwHandler})
 
 	if err != nil {
-		return errors.Wrap(err, "Could not start listening service")
+		return fmt.Errorf("could not start listening service: %w", err)
 	}
 
 	return nil