From f473e1580c8490ef03ad4e4b220fb95d3f5a989f Mon Sep 17 00:00:00 2001 From: Tanner Frisch Date: Tue, 25 Jul 2023 11:22:18 -0400 Subject: [PATCH] fix: Error string formatting --- json_response.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/json_response.go b/json_response.go index 264db1a..6712481 100644 --- a/json_response.go +++ b/json_response.go @@ -1,4 +1,4 @@ -// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved. +// Copyright (c) 2018-2023, Sylabs Inc. All rights reserved. // This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file // distributed with the sources of this project regarding your rights to use or distribute this // software. @@ -57,13 +57,13 @@ func encodeResponse(w http.ResponseWriter, jr Response, code int) error { // in order to preserve our ability to set the correct HTTP code. b, err := json.Marshal(jr) if err != nil { - return fmt.Errorf("jsonresp: failed to encode response: %v", err) + return fmt.Errorf("jsonresp: failed to encode response: %w", err) } w.Header().Set("Content-Type", "application/json") w.WriteHeader(code) if _, err := w.Write(b); err != nil { - return fmt.Errorf("jsonresp: failed to write response: %v", err) + return fmt.Errorf("jsonresp: failed to write response: %w", err) } return nil } @@ -102,14 +102,14 @@ func ReadResponsePage(r io.Reader, v interface{}) (pd *PageDetails, err error) { Error *Error `json:"error"` } if err := json.NewDecoder(r).Decode(&u); err != nil { - return nil, fmt.Errorf("jsonresp: failed to read response: %v", err) + return nil, fmt.Errorf("jsonresp: failed to read response: %w", err) } if u.Error != nil { return nil, u.Error } if v != nil { if err := json.Unmarshal(u.Data, v); err != nil { - return nil, fmt.Errorf("jsonresp: failed to unmarshal response: %v", err) + return nil, fmt.Errorf("jsonresp: failed to unmarshal response: %w", err) } } return u.Page, nil