8000 feat(storage): better fk violation errors and avoid exposing internal errors by paul-nicolas · Pull Request #372 · formancehq/payments · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat(storage): better fk violation errors and avoid exposing internal errors #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 21, 2025
Merged

feat(storage): better fk violation errors and avoid exposing internal errors #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb5e8ab
feat(storage): better fk violation errors
paul-nicolas Mar 20, 2025
50df5d0
feat(api): do not expose internal errors via the api
paul-nicolas Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions internal/api/common/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package common

import (
"errors"
"net/http"

"github.com/formancehq/go-libs/v2/api"
)

func InternalServerError(w http.ResponseWriter, r *http.Request, err error) {
api.InternalServerError(w, r, errors.New("Internal error. Consult logs/traces to have more details."))
}
3 changes: 2 additions & 1 deletion internal/api/v2/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"net/http"

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/api/services"
"github.com/formancehq/payments/internal/storage"
)
Expand All @@ -30,6 +31,6 @@ func handleServiceErrors(w http.ResponseWriter, r *http.Request, err error) {
case errors.Is(err, services.ErrNotFound):
api.NotFound(w, err)
default:
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)
}
}
3 changes: 2 additions & 1 deletion internal/api/v2/handler_accounts_balances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/go-libs/v2/pointer"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/payments/internal/storage"
Expand Down Expand Up @@ -83,7 +84,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 87 in internal/api/v2/handler_accounts_balances.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_accounts_balances.go#L87 

Added line #L87 was not covered by tests
return
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/api/v2/handler_accounts_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/api/validation"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
Expand Down Expand Up @@ -50,7 +51,7 @@
raw, err := json.Marshal(req)
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 54 in internal/api/v2/handler_accounts_create.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_accounts_create.go#L54 

Added line #L54 was not covered by tests
return
}

Expand Down Expand Up @@ -102,7 +103,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 106 in internal/api/v2/handler_accounts_create.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_accounts_create.go#L106 

Added line #L106 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_accounts_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend&qu 9E81 ot;
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
"go.opentelemetry.io/otel/attribute"
Expand Down Expand Up @@ -56,7 +57,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 60 in internal/api/v2/handler_accounts_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_accounts_get.go#L60 

Added line #L60 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_accounts_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/go-libs/v2/pointer"
"github.com/formancehq/payments/internal/api/b F438 ackend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/payments/internal/storage"
)
Expand Down Expand Up @@ -88,7 +89,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 92 in internal/api/v2/handler_accounts_list.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_accounts_list.go#L92 

Added line #L92 was not covered by tests
return
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/api/v2/handler_bank_accounts_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/api/validation"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
Expand Down Expand Up @@ -118,7 +119,7 @@

if err := bankAccount.Obfuscate(); err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 122 in internal/api/v2/handler_bank_accounts_create.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_bank_accounts_create.go#L122 

Added line #L122 was not covered by tests
return
}

Expand Down Expand Up @@ -160,7 +161,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 164 in internal/api/v2/handler_bank_accounts_create.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_bank_accounts_create.go#L164 

Added line #L164 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_bank_accounts_forward_to_connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/api/validation"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
Expand Down Expand Up @@ -106,7 +107,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 110 in internal/api/v2/handler_bank_accounts_forward_to_connector.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_bank_accounts_forward_to_connector.go#L110 

Added line #L110 was not covered by tests
return
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/api/v2/handler_bank_accounts_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/google/uuid"
"go.opentelemetry.io/otel/attribute"
Expand Down Expand Up @@ -33,7 +34,7 @@

if err := bankAccount.Obfuscate(); err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 37 in internal/api/v2/handler_bank_accounts_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_bank_accounts_get.go#L37 

Added line #L37 was not covered by tests
return
}

Expand Down Expand Up @@ -75,7 +76,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 79 in internal/api/v2/handler_bank_accounts_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_bank_accounts_get.go#L79 

Added line #L79 was not covered by tests
return
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/api/v2/handler_bank_accounts_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/go-libs/v2/pointer"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/payments/internal/storage"
)
Expand Down Expand Up @@ -42,7 +43,7 @@
for i := range cursor.Data {
if err := cursor.Data[i].Obfuscate(); err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 46 in internal/api/v2/handler_bank_accounts_list.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_bank_accounts_list.go#L46 

Added line #L46 was not covered by tests
return
}

Expand Down Expand Up @@ -92,7 +93,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 96 in internal/api/v2/handler_bank_accounts_list.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_bank_accounts_list.go#L96 

Added line #L96 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_connectors_configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/connectors/plugins/registry"
"github.com/formancehq/payments/internal/otel"
)
Expand All @@ -22,7 +23,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 26 in internal/api/v2/handler_connectors_configs.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_connectors_configs.go#L26 

Added line #L26 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_connectors_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/payments/internal/storage"
)
Expand Down Expand Up @@ -58,7 +59,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 62 in internal/api/v2/handler_connectors_list.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_connectors_list.go#L62 

Added line #L62 was not covered by tests
return
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/api/v2/handler_payments_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/go-libs/v2/pointer"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/api/validation"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
Expand Down Expand Up @@ -58,7 +59,7 @@
raw, err := json.Marshal(req)
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 62 in internal/api/v2/handler_payments_create.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_payments_create.go#L62 

Added line #L62 was not covered by tests
return
}
pid := models.PaymentID{
Expand Down Expand Up @@ -160,7 +161,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 164 in internal/api/v2/handler_payments_create.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_payments_create.go#L164 

Added line #L164 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_payments_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
"go.opentelemetry.io/otel/attribute"
Expand Down Expand Up @@ -70,7 +71,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 74 in internal/api/v2/handler_payments_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_payments_get.go#L74 

Added line #L74 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_payments_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/go-libs/v2/pointer"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/payments/internal/storage"
)
Expand Down Expand Up @@ -116,7 +117,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 120 in internal/api/v2/handler_payments_list.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_payments_list.go#L120 

Added line #L120 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_pools_balances_at.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/google/uuid"
"github.com/pkg/errors"
Expand Down Expand Up @@ -76,7 +77,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 80 in internal/api/v2/handler_pools_balances_at.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_pools_balances_at.go#L80 

Added line #L80 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_pools_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/api/validation"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
Expand Down Expand Up @@ -85,7 +86,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 89 in internal/api/v2/handler_pools_create.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_pools_create.go#L89 

Added line #L89 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_pools_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/google/uuid"
"go.opentelemetry.io/otel/attribute"
Expand Down Expand Up @@ -47,7 +48,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 51 in internal/api/v2/handler_pools_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_pools_get.go#L51 

Added line #L51 was not covered by tests
return
}
}
Expand Down
3 changes: 2 additions & 1 deletion internal/api/v2/handler_pools_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"github.com/formancehq/go-libs/v2/bun/bunpaginate"
"github.com/formancehq/go-libs/v2/pointer"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/otel"
"github.com/formancehq/payments/internal/storage"
)
Expand Down Expand Up @@ -63,7 +64,7 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 67 in internal/api/v2/handler_pools_list.go

View check run for this annotation

Codecov / codecov/patch

10163 internal/api/v2/handler_pools_list.go#L67 

Added line #L67 was not covered by tests
return
}
}
Expand Down
5 changes: 3 additions & 2 deletions internal/api/v2/handler_tasks_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

"github.com/formancehq/go-libs/v2/api"
"github.com/formancehq/payments/internal/api/backend"
"github.com/formancehq/payments/internal/api/common"
"github.com/formancehq/payments/internal/models"
"github.com/formancehq/payments/internal/otel"
"go.opentelemetry.io/otel/attribute"
Expand Down Expand Up @@ -38,7 +39,7 @@
raw, err := json.Marshal(schedule)
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)

Check warning on line 42 in internal/api/v2/handler_tasks_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_tasks_get.go#L42 

Added line #L42 was not covered by tests
return
}

Expand All @@ -56,8 +57,8 @@
})
if err != nil {
otel.RecordError(span, err)
api.InternalServerError(w, r, err)
common.InternalServerError(w, r, err)
return

Check warning on line 61 in internal/api/v2/handler_tasks_get.go

View check run for this annotation

Codecov / codecov/patch

internal/api/v2/handler_tasks_get.go#L60-L61 

Added lines #L60 - L61 were not covered by tests
}
}
}
Loading
0