diff --git a/domain/service_metadata.go b/domain/service_metadata.go index 926aae23..4d959e5f 100644 --- a/domain/service_metadata.go +++ b/domain/service_metadata.go @@ -2,9 +2,8 @@ package domain import ( "encoding/json" + "fmt" "reflect" - - "github.com/pkg/errors" ) type ServiceMetadata struct { @@ -23,7 +22,7 @@ func (sm ServiceMetadata) MarshalJSON() ([]byte, error) { b, err := json.Marshal(Alias(sm)) if err != nil { - return []byte{}, errors.Wrap(err, "unmarshallable content in AdditionalMetadata") + return nil, fmt.Errorf("unmarshallable content in AdditionalMetadata: %w", err) } var m map[string]interface{} diff --git a/domain/service_plan_metadata.go b/domain/service_plan_metadata.go index fbb329d8..51b4b8a7 100644 --- a/domain/service_plan_metadata.go +++ b/domain/service_plan_metadata.go @@ -2,10 +2,9 @@ package domain import ( "encoding/json" + "fmt" "reflect" "strings" - - "github.com/pkg/errors" ) type ServicePlanMetadata struct { @@ -51,7 +50,7 @@ func (spm ServicePlanMetadata) MarshalJSON() ([]byte, error) { b, err := json.Marshal(Alias(spm)) if err != nil { - return []byte{}, errors.Wrap(err, "unmarshallable content in AdditionalMetadata") + return nil, fmt.Errorf("unmarshallable content in AdditionalMetadata: %w", err) } var m map[string]interface{} diff --git a/go.mod b/go.mod index 2ce513c4..16bb1a7f 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/onsi/ginkgo/v2 v2.17.1 github.com/onsi/gomega v1.33.0 github.com/pborman/uuid v1.2.1 - github.com/pkg/errors v0.9.1 honnef.co/go/tools v0.4.7 ) diff --git a/go.sum b/go.sum index 474d86c1..d8503c25 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,6 @@ github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8= diff --git a/handlers/catalog_test.go b/handlers/catalog_test.go index f9f7f19f..d51c5050 100644 --- a/handlers/catalog_test.go +++ b/handlers/catalog_test.go @@ -2,13 +2,12 @@ package handlers_test import ( "context" + "errors" "log/slog" "net/http" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/pkg/errors" - "github.com/pivotal-cf/brokerapi/v11/domain" "github.com/pivotal-cf/brokerapi/v11/domain/apiresponses" brokerFakes "github.com/pivotal-cf/brokerapi/v11/fakes" diff --git a/handlers/last_binding_operation_test.go b/handlers/last_binding_operation_test.go index 81a56048..18e21396 100644 --- a/handlers/last_binding_operation_test.go +++ b/handlers/last_binding_operation_test.go @@ -3,6 +3,7 @@ package handlers_test import ( "context" "encoding/json" + "errors" "fmt" "log/slog" "net/http" @@ -17,7 +18,6 @@ import ( "github.com/pivotal-cf/brokerapi/v11/handlers" "github.com/pivotal-cf/brokerapi/v11/handlers/fakes" "github.com/pivotal-cf/brokerapi/v11/middlewares" - "github.com/pkg/errors" ) var _ = Describe("LastBindingOperation", func() {