From 7221658641e1bbcc48eac0d33e660677448a6f2f Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 10 Jan 2025 13:41:28 +0100 Subject: [PATCH] vendor: github.com/tonistiigi/go-actions-cache 017636a73805 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/tonistiigi/go-actions-cache/cache.go | 11 +++++------ vendor/modules.txt | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 731843ad48ad..0241b456c452 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 - github.com/tonistiigi/go-actions-cache v0.0.0-20241108014124-394979b8119e + github.com/tonistiigi/go-actions-cache v0.0.0-20241210095730-017636a73805 github.com/tonistiigi/go-archvariant v1.0.0 github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea diff --git a/go.sum b/go.sum index a9bc4963b706..b3ff0650d077 100644 --- a/go.sum +++ b/go.sum @@ -375,8 +375,8 @@ github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 h1:eUk79E1 github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205/go.mod h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY= github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 h1:RgyoSI38Y36zjQaszel/0RAcIehAnjA1B0RiUV9SDO4= github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184/go.mod h1:Dl/9oEjK7IqnjAm21Okx/XIxUCFJzvh+XdVHUlBwXTw= -github.com/tonistiigi/go-actions-cache v0.0.0-20241108014124-394979b8119e h1:SdcAL/tmv2mIfNhRygmeRrcci3aJQFqNughD7rcV170= -github.com/tonistiigi/go-actions-cache v0.0.0-20241108014124-394979b8119e/go.mod h1:xsu+XeKT9piH/5f9Y1Zsv5krQqI34CWkIusbs5027IM= +github.com/tonistiigi/go-actions-cache v0.0.0-20241210095730-017636a73805 h1:l2x1Ubj8f5xhPzZI428ZQ6+BDafGovpdk2ITnD3twTw= +github.com/tonistiigi/go-actions-cache v0.0.0-20241210095730-017636a73805/go.mod h1:xsu+XeKT9piH/5f9Y1Zsv5krQqI34CWkIusbs5027IM= github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0= github.com/tonistiigi/go-archvariant v1.0.0/go.mod h1:TxFmO5VS6vMq2kvs3ht04iPXtu2rUT/erOnGFYfk5Ho= github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 h1:7I5c2Ig/5FgqkYOh/N87NzoyI9U15qUPXhDD8uCupv8= diff --git a/vendor/github.com/tonistiigi/go-actions-cache/cache.go b/vendor/github.com/tonistiigi/go-actions-cache/cache.go index 3f29d2f07b3b..516e71943165 100644 --- a/vendor/github.com/tonistiigi/go-actions-cache/cache.go +++ b/vendor/github.com/tonistiigi/go-actions-cache/cache.go @@ -8,7 +8,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/url" "os" @@ -219,7 +218,7 @@ func (c *Cache) Load(ctx context.Context, keys ...string) (*Entry, error) { return nil, errors.WithStack(err) } var ce Entry - dt, err := ioutil.ReadAll(io.LimitReader(resp.Body, 32*1024)) + dt, err := io.ReadAll(io.LimitReader(resp.Body, 32*1024)) if err != nil { return nil, errors.WithStack(err) } @@ -252,7 +251,7 @@ func (c *Cache) reserve(ctx context.Context, key string) (int, error) { return 0, errors.WithStack(err) } - dt, err = ioutil.ReadAll(io.LimitReader(resp.Body, 32*1024)) + dt, err = io.ReadAll(io.LimitReader(resp.Body, 32*1024)) if err != nil { return 0, errors.WithStack(err) } @@ -281,7 +280,7 @@ func (c *Cache) commit(ctx context.Context, id int, size int64) error { if err != nil { return errors.Wrapf(err, "error committing cache %d", id) } - dt, err = ioutil.ReadAll(io.LimitReader(resp.Body, 32*1024)) + dt, err = io.ReadAll(io.LimitReader(resp.Body, 32*1024)) if err != nil { return err } @@ -411,7 +410,7 @@ func (c *Cache) uploadChunk(ctx context.Context, id int, ra io.ReaderAt, off, n if err != nil { return errors.WithStack(err) } - dt, err := ioutil.ReadAll(io.LimitReader(resp.Body, 32*1024)) + dt, err := io.ReadAll(io.LimitReader(resp.Body, 32*1024)) if err != nil { return errors.WithStack(err) } @@ -635,7 +634,7 @@ func checkResponse(resp *http.Response) error { if resp.StatusCode >= 200 && resp.StatusCode < 300 { return nil } - dt, err := ioutil.ReadAll(utfbom.SkipOnly(io.LimitReader(resp.Body, 32*1024))) + dt, err := io.ReadAll(utfbom.SkipOnly(io.LimitReader(resp.Body, 32*1024))) if err != nil { return errors.WithStack(err) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 179c0a412b4a..4aa0e78b489e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -768,7 +768,7 @@ github.com/tonistiigi/dchapes-mode github.com/tonistiigi/fsutil github.com/tonistiigi/fsutil/copy github.com/tonistiigi/fsutil/types -# github.com/tonistiigi/go-actions-cache v0.0.0-20241108014124-394979b8119e +# github.com/tonistiigi/go-actions-cache v0.0.0-20241210095730-017636a73805 ## explicit; go 1.22 github.com/tonistiigi/go-actions-cache # github.com/tonistiigi/go-archvariant v1.0.0