feat: remove deprecated package github.com/pkg/errors

formancehq · Oct 16, 2024 · 96c977e · 96c977e
1 parent 073cd0d
commit 96c977e
Show file tree

Hide file tree

Showing 81 changed files with 167 additions and 162 deletions.
diff --git a/cmd/doc_events.go b/cmd/doc_events.go
@@ -2,9 +2,9 @@ package cmd
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/formancehq/ledger/internal/bus"
 	"github.com/invopop/jsonschema"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"os"
 	"path/filepath"
@@ -21,12 +21,12 @@ func NewDocEventsCommand() *cobra.Command {
 
 			writeDir, err := cmd.Flags().GetString(writeDirFlag)
 			if err != nil {
-				return errors.Wrap(err, "failed to get write-dir flag")
+				return fmt.Errorf("failed to get write-dir flag: %w", err)
 			}
 
 			err = os.MkdirAll(writeDir, 0755)
 			if err != nil {
-				return errors.Wrap(err, "failed to create write-dir")
+				return fmt.Errorf("failed to create write-dir: %w", err)
 			}
 
 			for _, o := range []any{
@@ -38,11 +38,11 @@ func NewDocEventsCommand() *cobra.Command {
 				schema := jsonschema.Reflect(o)
 				data, err := json.MarshalIndent(schema, "", "  ")
 				if err != nil {
-					return errors.Wrap(err, "failed to marshal schema")
+					return fmt.Errorf("failed to marshal schema: %w", err)
 				}
 				err = os.WriteFile(filepath.Join(writeDir, reflect.TypeOf(o).Name()+".json"), data, 0600)
 				if err != nil {
-					return errors.Wrap(err, "failed to write schema")
+					return fmt.Errorf("failed to write schema: %w", err)
 				}
 			}
 

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"errors"
 	"github.com/formancehq/ledger/internal/storage/driver"
 	"net/http"
 
@@ -20,7 +21,6 @@ import (
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 	systemcontroller "github.com/formancehq/ledger/internal/controller/system"
 	"github.com/formancehq/ledger/internal/storage"
-	"github.com/pkg/errors"
 
 	"github.com/formancehq/go-libs/ballast"
 	"github.com/formancehq/go-libs/service"

diff --git a/internal/api/common/middleware_resolver.go b/internal/api/common/middleware_resolver.go
@@ -10,7 +10,7 @@ import (
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/platform/postgres"
 
-	"github.com/pkg/errors"
+	"errors"
 )
 
 const (

diff --git a/internal/api/common/middleware_resolver_test.go b/internal/api/common/middleware_resolver_test.go
@@ -6,11 +6,11 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/logging"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 	systemcontroller "github.com/formancehq/ledger/internal/controller/system"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v1/controllers_accounts.go b/internal/api/v1/controllers_accounts.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
+	"errors"
 
 	"github.com/formancehq/go-libs/query"
 	ledger "github.com/formancehq/ledger/internal"

diff --git a/internal/api/v1/controllers_accounts_add_metadata.go b/internal/api/v1/controllers_accounts_add_metadata.go
@@ -7,11 +7,11 @@ import (
 	"net/http"
 	"net/url"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/metadata"
 	"github.com/formancehq/ledger/internal/api/common"
 	"github.com/go-chi/chi/v5"
-	"github.com/pkg/errors"
 )
 
 func addAccountMetadata(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v1/controllers_accounts_count.go b/internal/api/v1/controllers_accounts_count.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"net/http"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/bun/bunpaginate"
 	"github.com/formancehq/go-libs/pointer"
 	"github.com/formancehq/ledger/internal/api/common"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 )
 
 func countAccounts(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v1/controllers_accounts_count_test.go b/internal/api/v1/controllers_accounts_count_test.go
@@ -6,12 +6,12 @@ import (
 	"net/url"
 	"testing"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/auth"
 	"github.com/formancehq/go-libs/query"
 	"github.com/formancehq/go-libs/time"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v1/controllers_accounts_delete_metadata_test.go b/internal/api/v1/controllers_accounts_delete_metadata_test.go
@@ -7,11 +7,11 @@ import (
 	"net/url"
 	"testing"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/auth"
 	"github.com/formancehq/go-libs/logging"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v1/controllers_accounts_list.go b/internal/api/v1/controllers_accounts_list.go
@@ -3,12 +3,12 @@ package v1
 import (
 	"net/http"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/bun/bunpaginate"
 	"github.com/formancehq/go-libs/pointer"
 	"github.com/formancehq/ledger/internal/api/common"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 )
 
 func listAccounts(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v1/controllers_logs_list.go b/internal/api/v1/controllers_logs_list.go
@@ -1,14 +1,14 @@
 package v1
 
 import (
+	"fmt"
 	"net/http"
 
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/bun/bunpaginate"
 	"github.com/formancehq/go-libs/query"
 	"github.com/formancehq/ledger/internal/api/common"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 )
 
 func buildGetLogsQuery(r *http.Request) (query.Builder, error) {
@@ -42,7 +42,7 @@ func getLogs(w http.ResponseWriter, r *http.Request) {
 	if r.URL.Query().Get(QueryKeyCursor) != "" {
 		err := bunpaginate.UnmarshalCursor(r.URL.Query().Get(QueryKeyCursor), &query)
 		if err != nil {
-			api.BadRequest(w, ErrValidation, errors.Errorf("invalid '%s' query param", QueryKeyCursor))
+			api.BadRequest(w, ErrValidation, fmt.Errorf("invalid '%s' query param: %w", QueryKeyCursor, err))
 			return
 		}
 	} else {

diff --git a/internal/api/v1/controllers_transactions_add_metadata.go b/internal/api/v1/controllers_transactions_add_metadata.go
@@ -7,11 +7,11 @@ import (
 
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/metadata"
 	"github.com/formancehq/ledger/internal/api/common"
 	"github.com/go-chi/chi/v5"
-	"github.com/pkg/errors"
 )
 
 func addTransactionMetadata(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v1/controllers_transactions_create.go b/internal/api/v1/controllers_transactions_create.go
@@ -8,12 +8,12 @@ import (
 
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/metadata"
 	"github.com/formancehq/go-libs/time"
 	ledger "github.com/formancehq/ledger/internal"
 	"github.com/formancehq/ledger/internal/api/common"
-	"github.com/pkg/errors"
 )
 
 type Script struct {
@@ -38,11 +38,11 @@ func (s Script) ToCore() (*ledgercontroller.Script, error) {
 		// Is a monetary
 		var asset string
 		if err := json.Unmarshal(m["asset"], &asset); err != nil {
-			return nil, errors.Wrap(err, "unmarshalling asset")
+			return nil, fmt.Errorf("unmarshalling asset: %w", err)
 		}
 		amount := &big.Int{}
 		if err := json.Unmarshal(m["amount"], amount); err != nil {
-			return nil, errors.Wrap(err, "unmarshalling amount")
+			return nil, fmt.Errorf("unmarshalling amount: %w", err)
 		}
 
 		s.Script.Vars[k] = fmt.Sprintf("%s %s", asset, amount)

diff --git a/internal/api/v1/controllers_transactions_delete_metadata.go b/internal/api/v1/controllers_transactions_delete_metadata.go
@@ -6,10 +6,10 @@ import (
 
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/ledger/internal/api/common"
 	"github.com/go-chi/chi/v5"
-	"github.com/pkg/errors"
 )
 
 func deleteTransactionMetadata(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v1/controllers_transactions_delete_metadata_test.go b/internal/api/v1/controllers_transactions_delete_metadata_test.go
@@ -7,11 +7,11 @@ import (
 	"net/url"
 	"testing"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/auth"
 	"github.com/formancehq/go-libs/logging"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v1/controllers_transactions_revert.go b/internal/api/v1/controllers_transactions_revert.go
@@ -6,10 +6,10 @@ import (
 
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/ledger/internal/api/common"
 	"github.com/go-chi/chi/v5"
-	"github.com/pkg/errors"
 )
 
 func revertTransaction(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v1/middleware_auto_create_ledger.go b/internal/api/v1/middleware_auto_create_ledger.go
@@ -3,7 +3,7 @@ package v1
 import (
 	"net/http"
 
-	"github.com/pkg/errors"
+	"errors"
 
 	"github.com/formancehq/ledger/internal/controller/system"
 

diff --git a/internal/api/v2/controllers_accounts_add_metadata.go b/internal/api/v2/controllers_accounts_add_metadata.go
@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"net/url"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/metadata"
 	"github.com/formancehq/ledger/internal/api/common"
 	"github.com/go-chi/chi/v5"
-	"github.com/pkg/errors"
 )
 
 func addAccountMetadata(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v2/controllers_accounts_count.go b/internal/api/v2/controllers_accounts_count.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"net/http"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/ledger/internal/api/common"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 )
 
 func countAccounts(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v2/controllers_accounts_count_test.go b/internal/api/v2/controllers_accounts_count_test.go
@@ -7,12 +7,12 @@ import (
 	"net/url"
 	"testing"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/auth"
 	"github.com/formancehq/go-libs/query"
 	"github.com/formancehq/go-libs/time"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v2/controllers_accounts_delete_metadata_test.go b/internal/api/v2/controllers_accounts_delete_metadata_test.go
@@ -7,11 +7,11 @@ import (
 	"net/url"
 	"testing"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/auth"
 	"github.com/formancehq/go-libs/logging"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v2/controllers_accounts_list.go b/internal/api/v2/controllers_accounts_list.go
@@ -3,12 +3,12 @@ package v2
 import (
 	"net/http"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/bun/bunpaginate"
 	"github.com/formancehq/go-libs/pointer"
 	"github.com/formancehq/ledger/internal/api/common"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 )
 
 func listAccounts(w http.ResponseWriter, r *http.Request) {

diff --git a/internal/api/v2/controllers_accounts_list_test.go b/internal/api/v2/controllers_accounts_list_test.go
@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"testing"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/auth"
 	"github.com/formancehq/go-libs/bun/bunpaginate"
@@ -15,7 +16,6 @@ import (
 	"github.com/formancehq/go-libs/time"
 	ledger "github.com/formancehq/ledger/internal"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v2/controllers_balances.go b/internal/api/v2/controllers_balances.go
@@ -3,8 +3,8 @@ package v2
 import (
 	"net/http"
 
+	"errors"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
-	"github.com/pkg/errors"
 
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/ledger/internal/api/common"

diff --git a/internal/api/v2/controllers_bulk.go b/internal/api/v2/controllers_bulk.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"net/http"
 
+	"errors"
 	"github.com/formancehq/go-libs/metadata"
 	ledger "github.com/formancehq/ledger/internal"
 	ledgercontroller "github.com/formancehq/ledger/internal/controller/ledger"
 	"github.com/formancehq/ledger/internal/tracing"
-	"github.com/pkg/errors"
 
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/ledger/internal/api/common"

diff --git a/internal/api/v2/controllers_bulk_test.go b/internal/api/v2/controllers_bulk_test.go
@@ -15,11 +15,11 @@ import (
 
 	"github.com/formancehq/go-libs/time"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/formancehq/go-libs/auth"
 	"github.com/formancehq/go-libs/metadata"
 	ledger "github.com/formancehq/ledger/internal"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

diff --git a/internal/api/v2/controllers_ledgers_create.go b/internal/api/v2/controllers_ledgers_create.go
@@ -9,9 +9,9 @@ import (
 
 	ledger "github.com/formancehq/ledger/internal"
 
+	"errors"
 	"github.com/formancehq/go-libs/api"
 	"github.com/go-chi/chi/v5"
-	"github.com/pkg/errors"
 )
 
 func createLedger(systemController system.Controller) http.HandlerFunc {