From e1a62dfaf6956e09ae435958ba185325ecfc4af9 Mon Sep 17 00:00:00 2001 From: Tom Bamford Date: Fri, 22 Mar 2024 00:36:02 +0000 Subject: [PATCH] dependencies: updating to `v0.25.3` of `github.com/tombuildsstuff/giovanni` --- go.mod | 2 +- go.sum | 4 ++-- .../giovanni/storage/2023-11-03/blob/blobs/get.go | 14 ++++++++------ vendor/modules.txt | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 69d6d0d19dd7..0c667339fda1 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/rickb777/date v1.12.5-0.20200422084442-6300e543c4d9 github.com/sergi/go-diff v1.2.0 - github.com/tombuildsstuff/giovanni v0.25.3-0.20240320223224-81f160a937cd + github.com/tombuildsstuff/giovanni v0.25.3 github.com/tombuildsstuff/kermit v0.20240122.1123108 golang.org/x/crypto v0.18.0 golang.org/x/tools v0.13.0 diff --git a/go.sum b/go.sum index f3b5d9b0bc4a..2de1713a5e16 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tombuildsstuff/giovanni v0.25.3-0.20240320223224-81f160a937cd h1:c8P1GroZZFmmrPf/P9s3tgTtRErAnXwR8d7M/JgjVr4= -github.com/tombuildsstuff/giovanni v0.25.3-0.20240320223224-81f160a937cd/go.mod h1:s7xbU2lN5Iz9MBglmDDv9p2QPbn6x3UkJBtpCfUerLs= +github.com/tombuildsstuff/giovanni v0.25.3 h1:sqUXiKvU4tmmGA3+YXZe87j4ngu7DkwijFO/ex8a4Hk= +github.com/tombuildsstuff/giovanni v0.25.3/go.mod h1:s7xbU2lN5Iz9MBglmDDv9p2QPbn6x3UkJBtpCfUerLs= github.com/tombuildsstuff/kermit v0.20240122.1123108 h1:icQaxsv/ANv/KC4Sr0V1trrWA/XIL+3QAVBDpiSTgj8= github.com/tombuildsstuff/kermit v0.20240122.1123108/go.mod h1:T3YBVFhRV4qA7SbnRaNE6eapIMpKDA9rG/V7Ocsjlno= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= diff --git a/vendor/github.com/tombuildsstuff/giovanni/storage/2023-11-03/blob/blobs/get.go b/vendor/github.com/tombuildsstuff/giovanni/storage/2023-11-03/blob/blobs/get.go index 1ce01fdb01a5..4ae212d9ed61 100644 --- a/vendor/github.com/tombuildsstuff/giovanni/storage/2023-11-03/blob/blobs/get.go +++ b/vendor/github.com/tombuildsstuff/giovanni/storage/2023-11-03/blob/blobs/get.go @@ -68,13 +68,15 @@ func (c Client) Get(ctx context.Context, containerName, blobName string, input G if resp != nil { result.HttpResponse = resp.Response - respBody, err := io.ReadAll(resp.Body) - if err != nil { - return result, fmt.Errorf("could not parse response body") + if resp.Body != nil { + defer resp.Body.Close() + respBody, err := io.ReadAll(resp.Body) + if err != nil { + return result, fmt.Errorf("could not parse response body") + } + + result.Contents = &respBody } - resp.Body.Close() - - result.Contents = &respBody } if err != nil { err = fmt.Errorf("executing request: %+v", err) diff --git a/vendor/modules.txt b/vendor/modules.txt index 95e7b99b7d2e..ca82580787a8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1271,7 +1271,7 @@ github.com/rickb777/plural # github.com/sergi/go-diff v1.2.0 ## explicit; go 1.12 github.com/sergi/go-diff/diffmatchpatch -# github.com/tombuildsstuff/giovanni v0.25.3-0.20240320223224-81f160a937cd +# github.com/tombuildsstuff/giovanni v0.25.3 ## explicit; go 1.21 github.com/tombuildsstuff/giovanni/storage/2023-11-03/blob/accounts github.com/tombuildsstuff/giovanni/storage/2023-11-03/blob/blobs