From 3a382152539a55d2ab67dccce41b28b0325676b2 Mon Sep 17 00:00:00 2001 From: acabarbaye Date: Mon, 25 Nov 2024 11:30:35 +0000 Subject: [PATCH] :arrow_up: dependencies major updates --- changes/20241125111544.bugfix | 1 + utils/filesystem/files.go | 2 +- utils/filesystem/lockfile.go | 2 +- utils/go.mod | 8 ++++---- utils/go.sum | 17 ++++++++--------- utils/idgen/uuid.go | 2 +- utils/platform/os.go | 4 ++-- utils/proc/errors.go | 2 +- utils/proc/process.go | 2 +- utils/retry/retry.go | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 changes/20241125111544.bugfix diff --git a/changes/20241125111544.bugfix b/changes/20241125111544.bugfix new file mode 100644 index 0000000000..77e2c54b85 --- /dev/null +++ b/changes/20241125111544.bugfix @@ -0,0 +1 @@ +:arrow_up: dependencies major updates diff --git a/utils/filesystem/files.go b/utils/filesystem/files.go index d8a1b743d1..54e2093eb9 100644 --- a/utils/filesystem/files.go +++ b/utils/filesystem/files.go @@ -20,7 +20,7 @@ import ( "time" "github.com/bmatcuk/doublestar/v3" - "github.com/shirou/gopsutil/v3/disk" + "github.com/shirou/gopsutil/v4/disk" "github.com/spf13/afero" "github.com/ARM-software/golang-utils/utils/commonerrors" diff --git a/utils/filesystem/lockfile.go b/utils/filesystem/lockfile.go index 3583ce11d1..aaeb5f82cd 100644 --- a/utils/filesystem/lockfile.go +++ b/utils/filesystem/lockfile.go @@ -13,7 +13,7 @@ import ( "strings" "time" - retry "github.com/avast/retry-go" + retry "github.com/avast/retry-go/v4" "github.com/ARM-software/golang-utils/utils/collection" "github.com/ARM-software/golang-utils/utils/commonerrors" diff --git a/utils/go.mod b/utils/go.mod index 98ed65bf87..cd5057b8ba 100644 --- a/utils/go.mod +++ b/utils/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/OneOfOne/xxhash v1.2.8 - github.com/avast/retry-go v3.0.0+incompatible + github.com/avast/retry-go/v4 v4.6.0 github.com/bmatcuk/doublestar/v3 v3.0.0 github.com/bombsimon/logrusr/v4 v4.1.0 github.com/deckarep/golang-set/v2 v2.6.0 @@ -18,7 +18,7 @@ require ( github.com/go-logr/stdr v1.2.2 github.com/go-logr/zapr v1.3.0 github.com/go-ozzo/ozzo-validation/v4 v4.3.0 - github.com/gofrs/uuid v4.4.0+incompatible + github.com/gofrs/uuid/v5 v5.3.0 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f github.com/golang/mock v1.6.0 github.com/hashicorp/go-cleanhttp v0.5.2 @@ -31,7 +31,7 @@ require ( github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/rs/zerolog v1.33.0 github.com/sasha-s/go-deadlock v0.3.5 - github.com/shirou/gopsutil/v3 v3.24.5 + github.com/shirou/gopsutil/v4 v4.24.10 github.com/sirupsen/logrus v1.9.3 github.com/spaolacci/murmur3 v1.1.0 github.com/spf13/afero v1.11.0 @@ -59,6 +59,7 @@ require ( github.com/cloudflare/circl v1.3.7 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/ebitengine/purego v0.8.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/fatih/color v1.16.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -84,7 +85,6 @@ require ( github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect - github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/skeema/knownhosts v1.2.2 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/cast v1.6.0 // indirect diff --git a/utils/go.sum b/utils/go.sum index 3533515d06..6c4d5db8ef 100644 --- a/utils/go.sum +++ b/utils/go.sum @@ -14,8 +14,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0= -github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= +github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA= +github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE= github.com/bmatcuk/doublestar/v3 v3.0.0 h1:TQtVPlDnAYwcrVNB2JiGuMc++H5qzWZd9PhkNo5WyHI= github.com/bmatcuk/doublestar/v3 v3.0.0/go.mod h1:6PcTVMw80pCY1RVuoqu3V++99uQB3vsSYKPTd8AWA0k= github.com/bombsimon/logrusr/v4 v4.1.0 h1:uZNPbwusB0eUXlO8hIUwStE6Lr5bLN6IgYgG+75kuh4= @@ -39,6 +39,8 @@ github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c= github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0= github.com/dolmen-go/contextio v1.0.0 h1:bNfCo4gsRIhMeo6Z1ImXzkxZG81B6I5t2fUFJjphdAU= github.com/dolmen-go/contextio v1.0.0/go.mod h1:cxc20xI7fOgsFHWgt+PenlDDnMcrvh7Ocuj5hEFIdEk= +github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE= +github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= @@ -79,8 +81,8 @@ github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead5 github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew= github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA= -github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk= +github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs= github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14= github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -192,11 +194,8 @@ github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e h1:+/AzLkOdIXE github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e/go.mod h1:9Tc1SKnfACJb9N7cw2eyuI6xzy845G7uZONBsi5uPEA= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= -github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= -github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= -github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= -github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= +github.com/shirou/gopsutil/v4 v4.24.10 h1:7VOzPtfw/5YDU+jLEoBwXwxJbQetULywoSV4RYY7HkM= +github.com/shirou/gopsutil/v4 v4.24.10/go.mod h1:s4D/wg+ag4rG0WO7AiTj2BeYCRhym0vM7DHbZRxnIT8= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= diff --git a/utils/idgen/uuid.go b/utils/idgen/uuid.go index cad22e145a..9755681db3 100644 --- a/utils/idgen/uuid.go +++ b/utils/idgen/uuid.go @@ -7,7 +7,7 @@ package idgen import ( "fmt" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid/v5" "github.com/ARM-software/golang-utils/utils/commonerrors" ) diff --git a/utils/platform/os.go b/utils/platform/os.go index bc43f1e16d..c587c871a3 100644 --- a/utils/platform/os.go +++ b/utils/platform/os.go @@ -15,8 +15,8 @@ import ( "time" validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/shirou/gopsutil/v3/host" - "github.com/shirou/gopsutil/v3/mem" + "github.com/shirou/gopsutil/v4/host" + "github.com/shirou/gopsutil/v4/mem" "github.com/ARM-software/golang-utils/utils/commonerrors" "github.com/ARM-software/golang-utils/utils/safecast" diff --git a/utils/proc/errors.go b/utils/proc/errors.go index be2c56442f..4386d211df 100644 --- a/utils/proc/errors.go +++ b/utils/proc/errors.go @@ -10,7 +10,7 @@ import ( "os/exec" "syscall" - "github.com/shirou/gopsutil/v3/process" + "github.com/shirou/gopsutil/v4/process" "github.com/ARM-software/golang-utils/utils/commonerrors" ) diff --git a/utils/proc/process.go b/utils/proc/process.go index fb79d332e4..2ff8c1ed12 100644 --- a/utils/proc/process.go +++ b/utils/proc/process.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - "github.com/shirou/gopsutil/v3/process" + "github.com/shirou/gopsutil/v4/process" "github.com/ARM-software/golang-utils/utils/collection" "github.com/ARM-software/golang-utils/utils/commonerrors" diff --git a/utils/retry/retry.go b/utils/retry/retry.go index 315a71e21b..76770cb5ff 100644 --- a/utils/retry/retry.go +++ b/utils/retry/retry.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/avast/retry-go" + "github.com/avast/retry-go/v4" "github.com/go-logr/logr" "github.com/ARM-software/golang-utils/utils/commonerrors"