diff --git a/.gitignore b/.gitignore index 66fd13c..d53ec74 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ # Dependency directories (remove the comment below to include it) # vendor/ + +# Go workspace files +go.work* \ No newline at end of file diff --git a/errorhandling/error_handling.go b/errorhandling/error_handling.go index 1faaee3..66d3575 100644 --- a/errorhandling/error_handling.go +++ b/errorhandling/error_handling.go @@ -15,12 +15,13 @@ import ( var ( errorCodeMappings = map[errors.ErrorCode]string{ - errors.InternalError: "INTERNAL_ERROR", - errors.NotFound: "NOT_FOUND", - errors.InvalidArgument: "INVALID_ARGUMENT", - errors.Unauthenticated: "UNAUTHENTICATED", - errors.PermissionDenied: "PERMISSION_DENIED", - errors.Unknown: "UNKNOWN", + errors.InternalError: "INTERNAL_ERROR", + errors.NotFound: "NOT_FOUND", + errors.InvalidArgument: "INVALID_ARGUMENT", + errors.Unauthenticated: "UNAUTHENTICATED", + errors.PermissionDenied: "PERMISSION_DENIED", + errors.UnprocessableContent: "UNPROCESSABLE_CONTENT", + errors.Unknown: "UNKNOWN", } ) @@ -48,7 +49,7 @@ func ConfigureErrorPresenterFunc(reporterFunc ErrorReporterFunc) graphql.ErrorPr reportAndLogError(reporterFunc, ctx, customError) err.Message = errors.DisplayMessage(customError) - err.Extensions = map[string]interface{}{ + err.Extensions = map[string]any{ "code": transformToGraphqlErrorCode(errors.Code(customError)), } return err @@ -57,7 +58,7 @@ func ConfigureErrorPresenterFunc(reporterFunc ErrorReporterFunc) graphql.ErrorPr // ConfigureRecoverFunc will better handle panic errors and recover from it func ConfigureRecoverFunc() graphql.RecoverFunc { - return func(_ context.Context, errInterface interface{}) error { + return func(_ context.Context, errInterface any) error { var err error switch e := errInterface.(type) { case error: diff --git a/go.mod b/go.mod index aa7cc33..62afe55 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/99designs/gqlgen v0.17.41 - github.com/neighborly/go-errors v0.2.0 + github.com/neighborly/go-errors v0.4.0 github.com/nrfta/go-log v0.9.1 github.com/vektah/gqlparser/v2 v2.5.14 ) diff --git a/go.sum b/go.sum index 0306c64..ff7774a 100644 --- a/go.sum +++ b/go.sum @@ -23,19 +23,17 @@ github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/neighborly/go-errors v0.2.0 h1:MKrcBKLyIt385UFERVQ/5QTiVx1VJa8w9lficUjxleU= -github.com/neighborly/go-errors v0.2.0/go.mod h1:UqMUPb+2EVrSQxHZAEgWv/9CjXgaZU+55JYmCVdexgA= +github.com/neighborly/go-errors v0.4.0 h1:4+hGZT/IvJfVkmLPaIGKu5qDJoVDJYC1MG/oGWGfCmA= +github.com/neighborly/go-errors v0.4.0/go.mod h1:d6rJr9ZUoQo6rvHHgIJijcdpLYRerK5UW3GCxuE2B/U= github.com/nrfta/go-log v0.9.1 h1:T/L9EbGKtL5e/3J7y/wp6OQefH/rbUJWo451TGxCdCE= github.com/nrfta/go-log v0.9.1/go.mod h1:jNqPuzQLsaA3vFbckN4PYgl0z7rC1DqwHnGZyNrwb0c= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -80,7 +78,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=