Skip to content

Commit

Permalink
Merge pull request #1568 from dtantsur/errors/hardwareutils
Browse files Browse the repository at this point in the history
🌱 Drop dependency on pkg/errors from hardwareutils
  • Loading branch information
metal3-io-bot authored Feb 28, 2024
2 parents 1b326e9 + 699ffaf commit 289290a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
1 change: 0 additions & 1 deletion apis/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions pkg/hardwareutils/bmc/access.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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{
Expand All @@ -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 == "" {
Expand All @@ -124,15 +123,15 @@ 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)
}
}
}
}

// 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
Expand Down
2 changes: 0 additions & 2 deletions pkg/hardwareutils/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
module github.com/metal3-io/baremetal-operator/pkg/hardwareutils

go 1.21

require github.com/pkg/errors v0.9.1
2 changes: 0 additions & 2 deletions pkg/hardwareutils/go.sum
Original file line number Diff line number Diff line change
@@ -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=

0 comments on commit 289290a

Please sign in to comment.