diff --git a/go.mod b/go.mod index 9876a686..0fc86c4b 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/manifoldco/promptui v0.8.0 github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 github.com/opencontainers/umoci v0.4.6 + github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cobra v1.1.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/internal/pkg/container/build.go b/internal/pkg/container/build.go index 99f3fe76..ade41bed 100644 --- a/internal/pkg/container/build.go +++ b/internal/pkg/container/build.go @@ -6,7 +6,8 @@ import ( "os/exec" "path" - "github.com/hpcng/warewulf/internal/pkg/errors" + "github.com/pkg/errors" + "github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/wwlog" ) diff --git a/internal/pkg/container/imprt.go b/internal/pkg/container/imprt.go index 9ec62988..3b2f0d48 100644 --- a/internal/pkg/container/imprt.go +++ b/internal/pkg/container/imprt.go @@ -5,13 +5,13 @@ import ( "os" "path" - "github.com/hpcng/warewulf/internal/pkg/util" - "github.com/containers/image/v5/types" "github.com/containers/storage/drivers/copy" + "github.com/pkg/errors" + "github.com/hpcng/warewulf/internal/pkg/config" - "github.com/hpcng/warewulf/internal/pkg/errors" "github.com/hpcng/warewulf/internal/pkg/oci" + "github.com/hpcng/warewulf/internal/pkg/util" ) func ImportDocker(uri string, name string, sCtx *types.SystemContext) error { diff --git a/internal/pkg/container/util.go b/internal/pkg/container/util.go index 34e65de1..c8f53703 100644 --- a/internal/pkg/container/util.go +++ b/internal/pkg/container/util.go @@ -5,8 +5,9 @@ import ( "os" "path" + "github.com/pkg/errors" + "github.com/hpcng/warewulf/internal/pkg/config" - "github.com/hpcng/warewulf/internal/pkg/errors" "github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/wwlog" ) diff --git a/internal/pkg/errors/errors.go b/internal/pkg/errors/errors.go deleted file mode 100644 index 2cf7c75d..00000000 --- a/internal/pkg/errors/errors.go +++ /dev/null @@ -1,19 +0,0 @@ -package errors - -type error interface { - Error() string -} - -// errorString is a trivial implementation of error. -type errorString struct { - s string -} - -func (e *errorString) Error() string { - return e.s -} - -// New returns an error that formats as the given text. -func New(text string) error { - return &errorString{text} -} diff --git a/internal/pkg/kernel/kernel.go b/internal/pkg/kernel/kernel.go index 961041c4..9a8e1eae 100644 --- a/internal/pkg/kernel/kernel.go +++ b/internal/pkg/kernel/kernel.go @@ -7,8 +7,9 @@ import ( "os/exec" "path" + "github.com/pkg/errors" + "github.com/hpcng/warewulf/internal/pkg/config" - "github.com/hpcng/warewulf/internal/pkg/errors" "github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/wwlog" ) diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 4209ba30..473c249d 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -6,9 +6,10 @@ import ( "sort" "strings" - "github.com/hpcng/warewulf/internal/pkg/errors" - "github.com/hpcng/warewulf/internal/pkg/wwlog" + "github.com/pkg/errors" "gopkg.in/yaml.v2" + + "github.com/hpcng/warewulf/internal/pkg/wwlog" ) const ConfigFile = "/etc/warewulf/nodes.conf" diff --git a/internal/pkg/node/modifiers.go b/internal/pkg/node/modifiers.go index 7abdd7e5..bdde2e9f 100644 --- a/internal/pkg/node/modifiers.go +++ b/internal/pkg/node/modifiers.go @@ -3,9 +3,10 @@ package node import ( "os" - "github.com/hpcng/warewulf/internal/pkg/errors" - "github.com/hpcng/warewulf/internal/pkg/wwlog" + "github.com/pkg/errors" "gopkg.in/yaml.v2" + + "github.com/hpcng/warewulf/internal/pkg/wwlog" ) /**** diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go index 167c084c..fb151716 100644 --- a/internal/pkg/overlay/overlay.go +++ b/internal/pkg/overlay/overlay.go @@ -13,8 +13,9 @@ import ( "strings" "text/template" + "github.com/pkg/errors" + "github.com/hpcng/warewulf/internal/pkg/config" - "github.com/hpcng/warewulf/internal/pkg/errors" "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/wwlog" diff --git a/internal/pkg/warewulfd/nodedb.go b/internal/pkg/warewulfd/nodedb.go index 02204df5..1c434407 100644 --- a/internal/pkg/warewulfd/nodedb.go +++ b/internal/pkg/warewulfd/nodedb.go @@ -3,7 +3,8 @@ package warewulfd import ( "sync" - "github.com/hpcng/warewulf/internal/pkg/errors" + "github.com/pkg/errors" + "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/wwlog" ) diff --git a/internal/pkg/warewulfd/util.go b/internal/pkg/warewulfd/util.go index 95de631e..74ee9242 100644 --- a/internal/pkg/warewulfd/util.go +++ b/internal/pkg/warewulfd/util.go @@ -8,7 +8,8 @@ import ( "strconv" "strings" - "github.com/hpcng/warewulf/internal/pkg/errors" + "github.com/pkg/errors" + "github.com/hpcng/warewulf/internal/pkg/node" )