From 9fdb5e3638bdd02305cff528ea6c51d2e094a958 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:24:54 +0000 Subject: [PATCH] fix(deps): update patch digest dependencies --- go.mod | 16 +++++----- go.sum | 32 +++++++++---------- .../longhorn/backupstore/renovate.json | 2 +- .../lz4/v4/internal/lz4stream/block.go | 4 +-- .../x/exp/constraints/constraints.go | 2 ++ vendor/modules.txt | 16 +++++----- 6 files changed, 37 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 4c2368508..b62864e65 100644 --- a/go.mod +++ b/go.mod @@ -10,11 +10,11 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/handlers v1.5.2 github.com/gorilla/mux v1.8.1 - github.com/longhorn/backupstore v0.0.0-20241208150358-e44f7d35fe1f - github.com/longhorn/go-common-libs v0.0.0-20241208100509-e1932c65c078 - github.com/longhorn/go-iscsi-helper v0.0.0-20241208120713-c4ac270fbe7e - github.com/longhorn/sparse-tools v0.0.0-20241124090628-9499c1fb63d7 - github.com/longhorn/types v0.0.0-20241214151852-cf9e27d3d0a9 + github.com/longhorn/backupstore v0.0.0-20241216162505-6ea1b1d542a3 + github.com/longhorn/go-common-libs v0.0.0-20241216151853-f3a20a6d8f6e + github.com/longhorn/go-iscsi-helper v0.0.0-20241216162435-a9bda5faf8b8 + github.com/longhorn/sparse-tools v0.0.0-20241216160947-2b328f0fa59c + github.com/longhorn/types v0.0.0-20241217083824-2e0ecb487ccf github.com/moby/moby v26.1.5+incompatible github.com/pkg/errors v0.9.1 github.com/rancher/go-fibmap v0.0.0-20160418233256-5fc9f8c1ed47 @@ -56,7 +56,7 @@ require ( github.com/mitchellh/go-ps v1.0.0 // indirect github.com/moby/sys/mountinfo v0.7.2 // indirect github.com/moby/sys/userns v0.1.0 // indirect - github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_golang v1.15.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect @@ -67,7 +67,7 @@ require ( github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/slok/goresilience v0.2.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect + golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect gopkg.in/VividCortex/ewma.v1 v1.1.1 // indirect @@ -78,5 +78,5 @@ require ( gotest.tools/v3 v3.4.0 // indirect k8s.io/apimachinery v0.31.3 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect + k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect ) diff --git a/go.sum b/go.sum index 0dccd33db..d9380afe3 100644 --- a/go.sum +++ b/go.sum @@ -76,16 +76,16 @@ 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-20241208150358-e44f7d35fe1f h1:hpAaf+PINVPXbXsSUV1kwO7gtQoDa4rTlge5VQG3kJ4= -github.com/longhorn/backupstore v0.0.0-20241208150358-e44f7d35fe1f/go.mod h1:KUgcirgmFoTKrb9K7Sq9vTdY1yN441R5OAgP+Cq6A8I= -github.com/longhorn/go-common-libs v0.0.0-20241208100509-e1932c65c078 h1:QnN9bPRhWr38ziOdknlC+NORk0PgQJcPX1vo20oVi9I= -github.com/longhorn/go-common-libs v0.0.0-20241208100509-e1932c65c078/go.mod h1:whDcaYDin1L7uaKTpr86RxpfOT+VJQbubDWdEGPnvVs= -github.com/longhorn/go-iscsi-helper v0.0.0-20241208120713-c4ac270fbe7e h1:fX1GSLGgQdzBzzwwK1NLvO3dpSj9ce5e3kT9tz8yVsU= -github.com/longhorn/go-iscsi-helper v0.0.0-20241208120713-c4ac270fbe7e/go.mod h1:v+xVeM1Ea065+NHRihSnYjd3Az3D9+XEaEcVgFT8F9E= -github.com/longhorn/sparse-tools v0.0.0-20241124090628-9499c1fb63d7 h1:jrW659ETMgyy8kmGAjG03DnaUWSxpFwnqDHlWe0kIUk= -github.com/longhorn/sparse-tools v0.0.0-20241124090628-9499c1fb63d7/go.mod h1:dfbJqfI8+T9ZCp5zhTYcBi/64hPBNt5/vFF3gTlfMmc= -github.com/longhorn/types v0.0.0-20241214151852-cf9e27d3d0a9 h1:mgIwf1do39qeJWwZDK+MhGMZmeNIbEluQITZ2TsDUGg= -github.com/longhorn/types v0.0.0-20241214151852-cf9e27d3d0a9/go.mod h1:JxIgbjNE9hBUA4B153VqLOTJMsskx6P/mst70M24F6A= +github.com/longhorn/backupstore v0.0.0-20241216162505-6ea1b1d542a3 h1:4UHfJOSbrwTuK/DmGFlTg9jUDgYgh2uYMx/OhIU/t5I= +github.com/longhorn/backupstore v0.0.0-20241216162505-6ea1b1d542a3/go.mod h1:BMf2uXcZRdFvoD9X9Eq+a3gPyemd4Bsew9wpEIhQ9n4= +github.com/longhorn/go-common-libs v0.0.0-20241216151853-f3a20a6d8f6e h1:wr2QnL9vo1KoRlupTtQeFakgWOdqjcgd2E6aCGssXCo= +github.com/longhorn/go-common-libs v0.0.0-20241216151853-f3a20a6d8f6e/go.mod h1:Ps3/x2JxP6W1jkUapEA3uxL5f/sSRA5mh67EFcH4zpU= +github.com/longhorn/go-iscsi-helper v0.0.0-20241216162435-a9bda5faf8b8 h1:Mqr6XlBkf3+hxCo8hcV5ngTKLYMrUDGJEDn2f3ajbOQ= +github.com/longhorn/go-iscsi-helper v0.0.0-20241216162435-a9bda5faf8b8/go.mod h1:1qILuI2jBCcgdE7bBGY//pCh6eUyOMDJ/2glD0yPqlk= +github.com/longhorn/sparse-tools v0.0.0-20241216160947-2b328f0fa59c h1:OFz3haCSPdgiiJvXLBeId/4dPu0dxIEqkQkfNMufLwc= +github.com/longhorn/sparse-tools v0.0.0-20241216160947-2b328f0fa59c/go.mod h1:dfbJqfI8+T9ZCp5zhTYcBi/64hPBNt5/vFF3gTlfMmc= +github.com/longhorn/types v0.0.0-20241217083824-2e0ecb487ccf h1:7TFVWpGl0MB9osrliT+j6+Jdr1cAuR/U2noPx0H9yYY= +github.com/longhorn/types v0.0.0-20241217083824-2e0ecb487ccf/go.mod h1:3jHuVDtpkXQzpnp4prguDBskVRric2kmF8aSPkRJ4jw= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -102,8 +102,8 @@ github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9Kou github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= -github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= -github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -178,8 +178,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY= golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0= -golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= +golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e h1:4qufH0hlUYs6AO6XmZC3GqfDPGSXHVXUFR6OND+iJX4= +golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -249,5 +249,5 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/mount-utils v0.32.0 h1:KOQAhPzJICATXnc6XCkWoexKbkOexRnMCUW8APFfwg4= k8s.io/mount-utils v0.32.0/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= -k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= -k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= +k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= diff --git a/vendor/github.com/longhorn/backupstore/renovate.json b/vendor/github.com/longhorn/backupstore/renovate.json index c297cdcff..93b3d5f4a 100644 --- a/vendor/github.com/longhorn/backupstore/renovate.json +++ b/vendor/github.com/longhorn/backupstore/renovate.json @@ -1,3 +1,3 @@ { - "extends": ["github>longhorn/release:renovate-default"] + "extends": ["github>longhorn/release:renovate-lib"] } diff --git a/vendor/github.com/pierrec/lz4/v4/internal/lz4stream/block.go b/vendor/github.com/pierrec/lz4/v4/internal/lz4stream/block.go index e96465460..04aaca848 100644 --- a/vendor/github.com/pierrec/lz4/v4/internal/lz4stream/block.go +++ b/vendor/github.com/pierrec/lz4/v4/internal/lz4stream/block.go @@ -246,7 +246,7 @@ func (b *FrameDataBlock) Compress(f *Frame, src []byte, level lz4block.Compressi b.src = src // keep track of the source for content checksum if f.Descriptor.Flags.BlockChecksum() { - b.Checksum = xxh32.ChecksumZero(src) + b.Checksum = xxh32.ChecksumZero(b.Data) } return b } @@ -328,7 +328,7 @@ func (b *FrameDataBlock) Uncompress(f *Frame, dst, dict []byte, sum bool) ([]byt dst = dst[:n] } if f.Descriptor.Flags.BlockChecksum() { - if c := xxh32.ChecksumZero(dst); c != b.Checksum { + if c := xxh32.ChecksumZero(b.data); c != b.Checksum { err := fmt.Errorf("%w: got %x; expected %x", lz4errors.ErrInvalidBlockChecksum, c, b.Checksum) return nil, err } diff --git a/vendor/golang.org/x/exp/constraints/constraints.go b/vendor/golang.org/x/exp/constraints/constraints.go index 2c033dff4..a9392af7c 100644 --- a/vendor/golang.org/x/exp/constraints/constraints.go +++ b/vendor/golang.org/x/exp/constraints/constraints.go @@ -45,6 +45,8 @@ type Complex interface { // that supports the operators < <= >= >. // If future releases of Go add new ordered types, // this constraint will be modified to include them. +// +// This type is redundant since Go 1.21 introduced [cmp.Ordered]. type Ordered interface { Integer | Float | ~string } diff --git a/vendor/modules.txt b/vendor/modules.txt index 42dc2b8fa..d4fa2bcc9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -155,7 +155,7 @@ github.com/kr/pretty # github.com/kr/text v0.2.0 ## explicit github.com/kr/text -# github.com/longhorn/backupstore v0.0.0-20241208150358-e44f7d35fe1f +# github.com/longhorn/backupstore v0.0.0-20241216162505-6ea1b1d542a3 ## explicit; go 1.22.7 github.com/longhorn/backupstore github.com/longhorn/backupstore/azblob @@ -172,7 +172,7 @@ github.com/longhorn/backupstore/systembackup github.com/longhorn/backupstore/types github.com/longhorn/backupstore/util github.com/longhorn/backupstore/vfs -# github.com/longhorn/go-common-libs v0.0.0-20241208100509-e1932c65c078 +# github.com/longhorn/go-common-libs v0.0.0-20241216151853-f3a20a6d8f6e ## explicit; go 1.22.7 github.com/longhorn/go-common-libs/backup github.com/longhorn/go-common-libs/exec @@ -184,14 +184,14 @@ github.com/longhorn/go-common-libs/sync github.com/longhorn/go-common-libs/sys github.com/longhorn/go-common-libs/types github.com/longhorn/go-common-libs/utils -# github.com/longhorn/go-iscsi-helper v0.0.0-20241208120713-c4ac270fbe7e +# github.com/longhorn/go-iscsi-helper v0.0.0-20241216162435-a9bda5faf8b8 ## explicit; go 1.22.7 github.com/longhorn/go-iscsi-helper/iscsi github.com/longhorn/go-iscsi-helper/iscsidev github.com/longhorn/go-iscsi-helper/longhorndev github.com/longhorn/go-iscsi-helper/types github.com/longhorn/go-iscsi-helper/util -# github.com/longhorn/sparse-tools v0.0.0-20241124090628-9499c1fb63d7 +# github.com/longhorn/sparse-tools v0.0.0-20241216160947-2b328f0fa59c ## explicit; go 1.22.0 github.com/longhorn/sparse-tools/cli/ssync github.com/longhorn/sparse-tools/sparse @@ -199,7 +199,7 @@ github.com/longhorn/sparse-tools/sparse/rest github.com/longhorn/sparse-tools/stats github.com/longhorn/sparse-tools/types github.com/longhorn/sparse-tools/util -# github.com/longhorn/types v0.0.0-20241214151852-cf9e27d3d0a9 +# github.com/longhorn/types v0.0.0-20241217083824-2e0ecb487ccf ## explicit; go 1.22.7 github.com/longhorn/types/pkg/generated/enginerpc github.com/longhorn/types/pkg/generated/profilerrpc @@ -224,7 +224,7 @@ github.com/moby/sys/mountinfo # github.com/moby/sys/userns v0.1.0 ## explicit; go 1.21 github.com/moby/sys/userns -# github.com/pierrec/lz4/v4 v4.1.21 +# github.com/pierrec/lz4/v4 v4.1.22 ## explicit; go 1.14 github.com/pierrec/lz4/v4 github.com/pierrec/lz4/v4/internal/lz4block @@ -287,7 +287,7 @@ github.com/urfave/cli # github.com/yusufpapurcu/wmi v1.2.4 ## explicit; go 1.16 github.com/yusufpapurcu/wmi -# golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d +# golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e ## explicit; go 1.22.0 golang.org/x/exp/constraints # golang.org/x/net v0.32.0 @@ -460,7 +460,7 @@ k8s.io/klog/v2/internal/sloghandler # k8s.io/mount-utils v0.32.0 ## explicit; go 1.23.0 k8s.io/mount-utils -# k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 +# k8s.io/utils v0.0.0-20241210054802-24370beab758 ## explicit; go 1.18 k8s.io/utils/clock k8s.io/utils/exec