From 194ed7d6666fd50283a24b94bc18a483a328aff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 1 Jul 2024 13:07:00 +0200 Subject: Fix remaining lints --- object.go | 7 ++++--- request.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/object.go b/object.go index 6e0dc92..b32c412 100644 --- a/object.go +++ b/object.go @@ -669,11 +669,12 @@ func (o *Object) TempURL(key, method string, expires time.Time) (string, error) allowedDigest := capabilities.TempURL.AllowedDigests var mac hash.Hash - if contains(allowedDigest, "sha256") { + switch { + case contains(allowedDigest, "sha256"): mac = hmac.New(sha256.New, []byte(key)) - } else if contains(allowedDigest, "sha1") { + case contains(allowedDigest, "sha1"): mac = hmac.New(sha1.New, []byte(key)) - } else { + default: return "", fmt.Errorf("schwift supports sha1 and sha256 digests but the Swift server only supports: %s", strings.Join(allowedDigest, ", ")) } diff --git a/request.go b/request.go index 63d4963..aad08ea 100644 --- a/request.go +++ b/request.go @@ -148,7 +148,7 @@ func (r Request) Do(backend Backend) (*http.Response, error) { for _, code := range r.ExpectStatusCodes { if code == resp.StatusCode { var err error - if r.DrainResponseBody || resp.StatusCode == 204 { + if r.DrainResponseBody || resp.StatusCode == http.StatusNoContent { err = drainResponseBody(resp) } return resp, err -- cgit v1.2.3