From 804a00e0e63485779e912c2920e3bd4542f904c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2024 14:35:22 +0000 Subject: [PATCH] fix(deps): update patch digest dependencies --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- .../longhorn/sparse-tools/sparse/file.go | 2 +- .../longhorn/sparse-tools/sparse/sfold.go | 2 +- .../longhorn/sparse-tools/sparse/sprune.go | 2 +- vendor/modules.txt | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index bf73610d..96568b37 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/RoaringBitmap/roaring v1.9.4 github.com/golang/protobuf v1.5.4 github.com/gorilla/mux v1.8.1 - github.com/longhorn/backupstore v0.0.0-20240907134751-60247168d4e8 + github.com/longhorn/backupstore v0.0.0-20240907141415-d500900fc713 github.com/longhorn/longhorn-engine v1.6.3-dev-20240825 - github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff + github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d github.com/pkg/errors v0.9.1 github.com/rancher/go-fibmap v0.0.0-20160418233256-5fc9f8c1ed47 github.com/sirupsen/logrus v1.9.3 @@ -41,11 +41,11 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/longhorn/go-common-libs v0.0.0-20240906072425-66d5f9e6ae4e // indirect + github.com/longhorn/go-common-libs v0.0.0-20240907130740-7060fefb5bda // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/mschoch/smat v0.2.0 // indirect - github.com/opencontainers/runc v1.1.13 // indirect + github.com/opencontainers/runc v1.1.14 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/prometheus/client_golang v1.15.0 // indirect diff --git a/go.sum b/go.sum index 12cc7bd1..b2e66259 100644 --- a/go.sum +++ b/go.sum @@ -69,14 +69,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/longhorn/backupstore v0.0.0-20240907134751-60247168d4e8 h1:0U9l9qzP43jxkKk7BWKYZ1Vr5GWPiZaQlBJaztkt/Nk= -github.com/longhorn/backupstore v0.0.0-20240907134751-60247168d4e8/go.mod h1:kljwIr8r8AZyG5ODPuc2Ci0WUiEDUxy6Hr8gnILU48c= -github.com/longhorn/go-common-libs v0.0.0-20240906072425-66d5f9e6ae4e h1:TL2faRfkI7uggJhBJYioZk6WGg0ODLvxWxQX2cJPVfE= -github.com/longhorn/go-common-libs v0.0.0-20240906072425-66d5f9e6ae4e/go.mod h1:T8DVg3NdJ7XDNJey+UI1IRUtZKnHtB75MHWmclF6mUI= +github.com/longhorn/backupstore v0.0.0-20240907141415-d500900fc713 h1:8BvRi2AlIJ0pz0yK1mzGBsHmPZMQrP/CDgfy7J5PWCY= +github.com/longhorn/backupstore v0.0.0-20240907141415-d500900fc713/go.mod h1:3gjQWnKXqJSxAE6rpM5mrCcbRJyLKXHqgzxyyaLgLSo= +github.com/longhorn/go-common-libs v0.0.0-20240907130740-7060fefb5bda h1:+jlHExQsoeb5B8Avl5tc/mX0rDvPDUhTDVbDitvl5vE= +github.com/longhorn/go-common-libs v0.0.0-20240907130740-7060fefb5bda/go.mod h1:T8DVg3NdJ7XDNJey+UI1IRUtZKnHtB75MHWmclF6mUI= github.com/longhorn/longhorn-engine v1.6.3-dev-20240825 h1:9z7BXsIVxCEs8lh/upXKtP/QQA/InjPiBl5WnNoNtbI= github.com/longhorn/longhorn-engine v1.6.3-dev-20240825/go.mod h1:UnZXqmM9JOMP2xAY790rtMVBMvSpMXihgVxyHNQuSgo= -github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff h1:gmdQDbnaGJ/zmrK+QJzSys8mH679os6i7vW/pOpRn1U= -github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff/go.mod h1:iUJCZtOKG/9xv2rfrUAYZntFTzP5dZtvy4Kwe6dMcUc= +github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d h1:iNrrGcE9TLcaayQgOkdEZDvlzKCWMNhXXJD2d2K4Wyo= +github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d/go.mod h1:iUJCZtOKG/9xv2rfrUAYZntFTzP5dZtvy4Kwe6dMcUc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= @@ -84,8 +84,8 @@ github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStA github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= -github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= -github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= +github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w= +github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4= github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= diff --git a/vendor/github.com/longhorn/sparse-tools/sparse/file.go b/vendor/github.com/longhorn/sparse-tools/sparse/file.go index 187f13a4..17624bd6 100644 --- a/vendor/github.com/longhorn/sparse-tools/sparse/file.go +++ b/vendor/github.com/longhorn/sparse-tools/sparse/file.go @@ -347,7 +347,7 @@ func GetFiemapRegionExts(file FileIoProcessor, interval Interval, extCount int) _, exts, errno := file.GetFieMap().FiemapRegion(uint32(extCount), uint64(interval.Begin), uint64(interval.End-interval.Begin)) if errno != 0 { log.Error("Failed to call fiemap.Fiemap(extCount)") - return exts, fmt.Errorf(errno.Error()) + return exts, fmt.Errorf("%v", errno) } log.Tracef("Retrieved %v/%v extents from file %v, interval %+v, elapsed %.2fs", diff --git a/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go b/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go index cfdfe80e..480e59da 100644 --- a/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go +++ b/vendor/github.com/longhorn/sparse-tools/sparse/sfold.go @@ -64,7 +64,7 @@ func coalesce(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops Fil defer func() { if err != nil { - log.Errorf(err.Error()) + log.Errorf("%v", err) updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops) } else { updateProgress(progress, progressComplete, true, nil, progressMutex, ops) diff --git a/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go b/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go index 773d0af0..3940b51c 100644 --- a/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go +++ b/vendor/github.com/longhorn/sparse-tools/sparse/sprune.go @@ -60,7 +60,7 @@ func prune(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops FileHa defer func() { if err != nil { - log.Errorf(err.Error()) + log.Errorf("%v", err) updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops) } else { updateProgress(progress, progressComplete, true, nil, progressMutex, ops) diff --git a/vendor/modules.txt b/vendor/modules.txt index 31e3c45c..80c9309b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -150,7 +150,7 @@ github.com/kr/pretty # github.com/kr/text v0.2.0 ## explicit github.com/kr/text -# github.com/longhorn/backupstore v0.0.0-20240907134751-60247168d4e8 +# github.com/longhorn/backupstore v0.0.0-20240907141415-d500900fc713 ## explicit; go 1.22.0 github.com/longhorn/backupstore github.com/longhorn/backupstore/azblob @@ -165,7 +165,7 @@ github.com/longhorn/backupstore/s3 github.com/longhorn/backupstore/types github.com/longhorn/backupstore/util github.com/longhorn/backupstore/vfs -# github.com/longhorn/go-common-libs v0.0.0-20240906072425-66d5f9e6ae4e +# github.com/longhorn/go-common-libs v0.0.0-20240907130740-7060fefb5bda ## explicit; go 1.22.0 github.com/longhorn/go-common-libs/backup # github.com/longhorn/longhorn-engine v1.6.3-dev-20240825 @@ -175,7 +175,7 @@ github.com/longhorn/longhorn-engine/pkg/types github.com/longhorn/longhorn-engine/pkg/util github.com/longhorn/longhorn-engine/pkg/util/disk github.com/longhorn/longhorn-engine/proto/ptypes -# github.com/longhorn/sparse-tools v0.0.0-20240729132735-18b207e459ff +# github.com/longhorn/sparse-tools v0.0.0-20240907135423-37af3c64d59d ## explicit; go 1.22.0 github.com/longhorn/sparse-tools/sparse github.com/longhorn/sparse-tools/sparse/rest @@ -190,7 +190,7 @@ github.com/moby/sys/mountinfo # github.com/mschoch/smat v0.2.0 ## explicit; go 1.13 github.com/mschoch/smat -# github.com/opencontainers/runc v1.1.13 +# github.com/opencontainers/runc v1.1.14 ## explicit; go 1.18 github.com/opencontainers/runc/libcontainer/configs github.com/opencontainers/runc/libcontainer/devices