From 6cf5d8fb13e9d7bfc58a3c2e36054e2aa68f5654 Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 25 Jan 2024 12:26:21 +0100 Subject: [PATCH] chore: bump icap client which fixes defer error handling (#8234) * chore: bump icap client which fixes defer error handling * chore: bump icap-client --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/egirna/icap-client/client.go | 10 ++++------ vendor/github.com/egirna/icap-client/request.go | 3 +-- vendor/modules.txt | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index b51fe0cff9..0692f6ef53 100644 --- a/go.mod +++ b/go.mod @@ -354,7 +354,7 @@ replace github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/pl replace github.com/studio-b12/gowebdav => github.com/aduffeck/gowebdav v0.0.0-20231215102054-212d4a4374f6 -replace github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240105150744-9c2d8aff3ef2 +replace github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240123094924-5af178158eaf // exclude the v2 line of go-sqlite3 which was released accidentally and prevents pulling in newer versions of go-sqlite3 // see https://github.com/mattn/go-sqlite3/issues/965 for more details diff --git a/go.sum b/go.sum index d36cd3ab02..659ada4ed7 100644 --- a/go.sum +++ b/go.sum @@ -1113,8 +1113,8 @@ github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6 github.com/foxcpp/go-mockdns v1.0.0/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4= github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= -github.com/fschade/icap-client v0.0.0-20240105150744-9c2d8aff3ef2 h1:PJERPsceXsS4uTJuDvHy/4rgrZyZWttbKesaacKmXiI= -github.com/fschade/icap-client v0.0.0-20240105150744-9c2d8aff3ef2/go.mod h1:Curjbe9P7SKWAtoXuu/huL8VnqzuBzetEpEPt9TLToE= +github.com/fschade/icap-client v0.0.0-20240123094924-5af178158eaf h1:3IzYXRblwIxeis+EtLLWTK0QitcefZT7YfpF7jfTFYA= +github.com/fschade/icap-client v0.0.0-20240123094924-5af178158eaf/go.mod h1:Curjbe9P7SKWAtoXuu/huL8VnqzuBzetEpEPt9TLToE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= diff --git a/vendor/github.com/egirna/icap-client/client.go b/vendor/github.com/egirna/icap-client/client.go index a3abeffac7..50943daadb 100644 --- a/vendor/github.com/egirna/icap-client/client.go +++ b/vendor/github.com/egirna/icap-client/client.go @@ -31,9 +31,7 @@ func NewClient(options ...ConfigOption) (Client, error) { } // Do is the main function of the client that makes the ICAP request -func (c *Client) Do(req Request) (Response, error) { - var err error - +func (c *Client) Do(req Request) (res Response, err error) { // establish connection to the icap server err = c.conn.Connect(req.ctx, req.URL.Host) if err != nil { @@ -57,15 +55,15 @@ func (c *Client) Do(req Request) (Response, error) { return Response{}, err } - resp, err := toClientResponse(bufio.NewReader(strings.NewReader(string(dataRes)))) + res, err = toClientResponse(bufio.NewReader(strings.NewReader(string(dataRes)))) if err != nil { return Response{}, err } // check if the message is fully done scanning or if it needs to be sent another chunk - done := !(resp.StatusCode == http.StatusContinue && !req.bodyFittedInPreview && req.previewSet) + done := !(res.StatusCode == http.StatusContinue && !req.bodyFittedInPreview && req.previewSet) if done { - return resp, nil + return res, nil } // get the remaining body bytes diff --git a/vendor/github.com/egirna/icap-client/request.go b/vendor/github.com/egirna/icap-client/request.go index 841cb8f645..82907c9877 100644 --- a/vendor/github.com/egirna/icap-client/request.go +++ b/vendor/github.com/egirna/icap-client/request.go @@ -55,10 +55,9 @@ func NewRequest(ctx context.Context, method, urlStr string, httpReq *http.Reques // SetPreview sets the preview bytes in the icap header // todo: defer close error -func (r *Request) SetPreview(maxBytes int) error { +func (r *Request) SetPreview(maxBytes int) (err error) { var bodyBytes []byte var previewBytes int - var err error // receiving the body bites to determine the preview bytes depending on the request ICAP method if r.Method == MethodREQMOD { diff --git a/vendor/modules.txt b/vendor/modules.txt index 2aa98156d2..fdca12de4d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -763,7 +763,7 @@ github.com/dutchcoders/go-clamd # github.com/egirna/icap v0.0.0-20181108071049-d5ee18bd70bc ## explicit github.com/egirna/icap -# github.com/egirna/icap-client v0.1.1 => github.com/fschade/icap-client v0.0.0-20240105150744-9c2d8aff3ef2 +# github.com/egirna/icap-client v0.1.1 => github.com/fschade/icap-client v0.0.0-20240123094924-5af178158eaf ## explicit; go 1.21 github.com/egirna/icap-client # github.com/emirpasic/gods v1.18.1 @@ -2320,4 +2320,4 @@ stash.kopano.io/kgol/oidc-go stash.kopano.io/kgol/rndm # github.com/go-micro/plugins/v4/store/nats-js-kv => github.com/kobergj/plugins/v4/store/nats-js-kv v0.0.0-20231207143248-4d424e3ae348 # github.com/studio-b12/gowebdav => github.com/aduffeck/gowebdav v0.0.0-20231215102054-212d4a4374f6 -# github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240105150744-9c2d8aff3ef2 +# github.com/egirna/icap-client => github.com/fschade/icap-client v0.0.0-20240123094924-5af178158eaf