mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-15 10:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't return typed nils

Browse source
This commit is contained in:
Neil Alexander 2022-08-09 17:00:25 +01:00
parent 5c6fb34cee
commit 4ddc569cf5
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
federationapi/inthttp/server.go
View file

@ -225,9 +225,12 @@ func federationClientError(err error) *api.FederationClientError {
if err == nil { if err == nil {
return nil return nil
} }
if ferr, ok := err.(*api.FederationClientError); ok { switch ferr := err.(type) {
case api.FederationClientError:
return &ferr
case *api.FederationClientError:
return ferr return ferr
} else { default:
return &api.FederationClientError{ return &api.FederationClientError{
Err: err.Error(), Err: err.Error(),
} }

9
internal/httputil/http.go
View file

@ -30,9 +30,9 @@ import (
// PostJSON performs a POST request with JSON on an internal HTTP API. // PostJSON performs a POST request with JSON on an internal HTTP API.
// The error will match the errtype if returned from the remote API, or // The error will match the errtype if returned from the remote API, or
// will be a different type if there was a problem reaching the API. // will be a different type if there was a problem reaching the API.
func PostJSON[reqtype, restype any, errtype error]( func PostJSON[reqtype, restype, errtype any](
ctx context.Context, span opentracing.Span, httpClient *http.Client, ctx context.Context, span opentracing.Span, httpClient *http.Client,
apiURL string, request *reqtype, response *restype, apiURL string, request *reqtype, response *restype, reserr *errtype,
) error { ) error {
jsonBytes, err := json.Marshal(request) jsonBytes, err := json.Marshal(request)
if err != nil { if err != nil {
@ -71,11 +71,10 @@ func PostJSON[reqtype, restype any, errtype error](
return err return err
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
var errorBody errtype if err = json.NewDecoder(res.Body).Decode(reserr); err != nil {
if err = json.NewDecoder(res.Body).Decode(&errorBody); err != nil {
return fmt.Errorf("HTTP %d from %s", res.StatusCode, apiURL) return fmt.Errorf("HTTP %d from %s", res.StatusCode, apiURL)
} }
return errorBody return nil
} }
if err = json.NewDecoder(res.Body).Decode(response); err != nil { if err = json.NewDecoder(res.Body).Decode(response); err != nil {
return fmt.Errorf("json.NewDecoder.Decode: %w", err) return fmt.Errorf("json.NewDecoder.Decode: %w", err)

23
internal/httputil/internalapi.go
View file

@ -67,10 +67,7 @@ func MakeInternalProxyAPI[reqtype, restype any](metricsName string, f func(conte
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,
JSON: &InternalAPIError{ JSON: err,
Type: reflect.TypeOf(err).String(),
Message: fmt.Sprintf("%s", err),
},
} }
} }
return util.JSONResponse{ return util.JSONResponse{
@ -80,11 +77,17 @@ func MakeInternalProxyAPI[reqtype, restype any](metricsName string, f func(conte
}) })
} }
func CallInternalRPCAPI[req, res any](name, url string, client *http.Client, ctx context.Context, request *req, response *res) error { func CallInternalRPCAPI[reqtype, restype any](name, url string, client *http.Client, ctx context.Context, request *reqtype, response *restype) error {
span, ctx := opentracing.StartSpanFromContext(ctx, name) span, ctx := opentracing.StartSpanFromContext(ctx, name)
defer span.Finish() defer span.Finish()
return PostJSON[req, res, InternalAPIError](ctx, span, client, url, request, response) var reserr *InternalAPIError
if err := PostJSON(ctx, span, client, url, request, response, reserr); err != nil {
return err
} else if reserr != nil {
return reserr
}
return nil // must be untyped nil
} }
func CallInternalProxyAPI[req, res any, errtype error](name, url string, client *http.Client, ctx context.Context, request *req) (res, error) { func CallInternalProxyAPI[req, res any, errtype error](name, url string, client *http.Client, ctx context.Context, request *req) (res, error) {
@ -92,5 +95,11 @@ func CallInternalProxyAPI[req, res any, errtype error](name, url string, client
defer span.Finish() defer span.Finish()
var response res var response res
return response, PostJSON[req, res, errtype](ctx, span, client, url, request, &response) var reserr *errtype
if err := PostJSON(ctx, span, client, url, request, &response, &reserr); err != nil {
return response, err
} else if reserr != nil {
return response, *reserr
}
return response, nil // must be untyped nil
} }