From 699ffaf4bdc534a58ac6715c85a8f6e6cca13db9 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 28 Feb 2024 14:37:24 +0100 Subject: [PATCH] Drop dependency on pkg/errors from hardwareutils Signed-off-by: Dmitry Tantsur --- apis/go.mod | 1 - pkg/hardwareutils/bmc/access.go | 11 +++++------ pkg/hardwareutils/go.mod | 2 -- pkg/hardwareutils/go.sum | 2 -- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/apis/go.mod b/apis/go.mod index 1e793b6a39..d4b309a499 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -33,7 +33,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect diff --git a/pkg/hardwareutils/bmc/access.go b/pkg/hardwareutils/bmc/access.go index 73eaa7c721..81830c0672 100644 --- a/pkg/hardwareutils/bmc/access.go +++ b/pkg/hardwareutils/bmc/access.go @@ -1,13 +1,12 @@ package bmc import ( + "errors" "fmt" "net" "net/url" "regexp" "strings" - - "github.com/pkg/errors" ) // AccessDetailsFactory describes a callable that returns a new @@ -103,7 +102,7 @@ func GetParsedURL(address string) (parsedURL *url.URL, err error) { // values. Otherwise, report the original parser error. _, _, err2 := net.SplitHostPort(address) if err2 != nil { - return nil, errors.Wrap(err, "failed to parse BMC address information") + return nil, fmt.Errorf("failed to parse BMC address information: %w", err) } } parsedURL = &url.URL{ @@ -115,7 +114,7 @@ func GetParsedURL(address string) (parsedURL *url.URL, err error) { if parsedURL.Opaque != "" { parsedURL, err = url.Parse(strings.Replace(address, ":", "://", 1)) if err != nil { - return nil, errors.Wrap(err, "failed to parse BMC address information") + return nil, fmt.Errorf("failed to parse BMC address information: %w", err) } } if parsedURL.Scheme == "" { @@ -124,7 +123,7 @@ func GetParsedURL(address string) (parsedURL *url.URL, err error) { // interpreted as a path. parsedURL, err = url.Parse("ipmi://" + address) if err != nil { - return nil, errors.Wrap(err, "failed to parse BMC address information") + return nil, fmt.Errorf("failed to parse BMC address information: %w", err) } } } @@ -132,7 +131,7 @@ func GetParsedURL(address string) (parsedURL *url.URL, err error) { // Check for expected hostname format if err := checkDNSValid(parsedURL.Hostname()); err != nil { - return nil, errors.Wrap(err, "failed to parse BMC address information") + return nil, fmt.Errorf("failed to parse BMC address information: %w", err) } return parsedURL, nil diff --git a/pkg/hardwareutils/go.mod b/pkg/hardwareutils/go.mod index d00b164b2e..d0ae807830 100644 --- a/pkg/hardwareutils/go.mod +++ b/pkg/hardwareutils/go.mod @@ -1,5 +1,3 @@ module github.com/metal3-io/baremetal-operator/pkg/hardwareutils go 1.21 - -require github.com/pkg/errors v0.9.1 diff --git a/pkg/hardwareutils/go.sum b/pkg/hardwareutils/go.sum index 7c401c3f58..e69de29bb2 100644 --- a/pkg/hardwareutils/go.sum +++ b/pkg/hardwareutils/go.sum @@ -1,2 +0,0 @@ -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=