diff --git a/go.mod b/go.mod index c9d159b4..c4a2e411 100644 --- a/go.mod +++ b/go.mod @@ -39,9 +39,7 @@ require ( require ( github.com/distribution/reference v0.6.0 github.com/gofrs/uuid v4.4.0+incompatible - github.com/google/go-github/v63 v63.0.0 github.com/google/go-github/v66 v66.0.0 - github.com/twpayne/go-vfs/v4 v4.3.0 github.com/twpayne/go-vfs/v5 v5.0.4 ) @@ -55,7 +53,6 @@ require ( github.com/Microsoft/hcsshim v0.11.7 // indirect github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/StackExchange/wmi v1.2.1 // indirect - github.com/alecthomas/assert/v2 v2.6.0 // indirect github.com/anatol/devmapper.go v0.0.0-20230829043248-59ac2b9706ba // indirect github.com/anatol/luks.go v0.0.0-20240507052915-92f8bb765f98 // indirect github.com/atotto/clipboard v0.1.4 // indirect @@ -193,6 +190,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/tredoe/osutil v1.5.0 // indirect + github.com/twpayne/go-vfs/v4 v4.3.0 // indirect github.com/ulikunitz/xz v0.5.11 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect diff --git a/go.sum b/go.sum index 8e72c770..06ca5493 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,6 @@ github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNA github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc= github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= @@ -122,8 +120,6 @@ github.com/dgryski/go-camellia v0.0.0-20191119043421-69a8a13fb23d h1:CPqTNIigGwe github.com/dgryski/go-camellia v0.0.0-20191119043421-69a8a13fb23d/go.mod h1:QX5ZVULjAfZJux/W62Y91HvCh9hyW6enAwcrrv/sLj0= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= -github.com/diskfs/go-diskfs v1.4.1 h1:iODgkzHLmvXS+1VDztpW53T+dQm8GQzi20y9yUd5UCA= -github.com/diskfs/go-diskfs v1.4.1/go.mod h1:+tOkQs8CMMog6Nvljg8DGIxEXrgL48iyT3OM3IlSz74= github.com/diskfs/go-diskfs v1.4.2 h1:khBr9RTkqAZFaMYK7PP8NooL30hqj3bSgRmj3Ouguls= github.com/diskfs/go-diskfs v1.4.2/go.mod h1:ss1uAUBhgDdEOewZFDWWpYqJFjNPbK7hYSjRoQE+D94= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= @@ -232,8 +228,7 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= -github.com/google/go-github/v63 v63.0.0 h1:13xwK/wk9alSokujB9lJkuzdmQuVn2QCPeck76wR3nE= -github.com/google/go-github/v63 v63.0.0/go.mod h1:IqbcrgUmIcEaioWrGYei/09o+ge5vhffGOcxrO0AfmA= +github.com/google/go-github/v66 v66.0.0 h1:ADJsaXj9UotwdgK8/iFZtv7MLc8E8WBl62WLd/D/9+M= github.com/google/go-github/v66 v66.0.0/go.mod h1:+4SO9Zkuyf8ytMj0csN1NR/5OTR+MfqPp8P8dVlcvY4= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= @@ -368,8 +363,6 @@ github.com/mudler/go-pluggable v0.0.0-20230126220627-7710299a0ae5 h1:FaZD86+A9mV github.com/mudler/go-pluggable v0.0.0-20230126220627-7710299a0ae5/go.mod h1:WmKcT8ONmhDQIqQ+HxU+tkGWjzBEyY/KFO8LTGCu4AI= github.com/mudler/go-processmanager v0.0.0-20240820160718-8b802d3ecf82 h1:FVT07EI8njvsD4tC2Hw8Xhactp5AWhsQWD4oTeQuSAU= github.com/mudler/go-processmanager v0.0.0-20240820160718-8b802d3ecf82/go.mod h1:Urp7LG5jylKoDq0663qeBh0pINGcRl35nXdKx82PSoU= -github.com/mudler/yip v1.11.0 h1:h+npjzSKM9VbShHxa+ywWZzpGIolKvN/e2FOT+rxKkI= -github.com/mudler/yip v1.11.0/go.mod h1:gwH7iGcr1Jimox2xKtN2AprEO00GzY7smvuycqCL7+Y= github.com/mudler/yip v1.12.0 h1:wuf103kHd0Zrxb7afquH8DxKeXqVSeqiRhBW/1gDHZQ= github.com/mudler/yip v1.12.0/go.mod h1:gwH7iGcr1Jimox2xKtN2AprEO00GzY7smvuycqCL7+Y= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= @@ -395,8 +388,6 @@ github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= -github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -538,12 +529,11 @@ github.com/tredoe/osutil v1.5.0 h1:UGVxbbHRoZi8xXVmbNZ2vgG6XoJ15ndE4LniiQ3rJKg= github.com/tredoe/osutil v1.5.0/go.mod h1:TEzphzUUunysbdDRfdOgqkg10POQbnfIPV50ynqOfIg= github.com/twpayne/go-vfs/v4 v4.3.0 h1:rTqFzzOQ/6ESKTSiwVubHlCBedJDOhQyVSnw8rQNZhU= github.com/twpayne/go-vfs/v4 v4.3.0/go.mod h1:tq2UVhnUepesc0lSnPJH/jQ8HruGhzwZe2r5kDFpEIw= +github.com/twpayne/go-vfs/v5 v5.0.4 h1:/ne3h+rW7f5YOyOFguz+3ztfUwzOLR0Vts3y0mMAitg= github.com/twpayne/go-vfs/v5 v5.0.4/go.mod h1:zTPFJUbgsEMFNSWnWQlLq9wh4AN83edZzx3VXbxrS1w= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= -github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8= -github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ= github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w= github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -771,8 +761,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/internal/agent/hooks/hooks_test.go b/internal/agent/hooks/hooks_test.go index ee712389..4363df86 100644 --- a/internal/agent/hooks/hooks_test.go +++ b/internal/agent/hooks/hooks_test.go @@ -18,8 +18,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) func TestConfig(t *testing.T) { diff --git a/internal/agent/install_test.go b/internal/agent/install_test.go index da2c1b28..825f340c 100644 --- a/internal/agent/install_test.go +++ b/internal/agent/install_test.go @@ -11,7 +11,7 @@ import ( "github.com/kairos-io/kairos-agent/v2/pkg/constants" fsutils "github.com/kairos-io/kairos-agent/v2/pkg/utils/fs" v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5/vfst" "gopkg.in/yaml.v3" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/action/bootentries_test.go b/pkg/action/bootentries_test.go index e363dd7d..c5f2bbb8 100644 --- a/pkg/action/bootentries_test.go +++ b/pkg/action/bootentries_test.go @@ -14,8 +14,8 @@ import ( sdkTypes "github.com/kairos-io/kairos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) var _ = Describe("Bootentries tests", Label("bootentry"), func() { diff --git a/pkg/action/common_test.go b/pkg/action/common_test.go index 77685855..7edfc8fc 100644 --- a/pkg/action/common_test.go +++ b/pkg/action/common_test.go @@ -9,8 +9,8 @@ import ( sdkTypes "github.com/kairos-io/kairos-sdk/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" "os" "path/filepath" ) diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index 9c98c5fd..67291aa1 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -38,8 +38,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) var _ = Describe("Install action tests", func() { diff --git a/pkg/action/reset_test.go b/pkg/action/reset_test.go index 8473cbcb..de9119a9 100644 --- a/pkg/action/reset_test.go +++ b/pkg/action/reset_test.go @@ -35,8 +35,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) var _ = Describe("Reset action tests", func() { diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index 2807d323..12fa19b8 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -32,8 +32,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) var _ = Describe("Upgrade Actions test", func() { diff --git a/pkg/cloudinit/cloudinit.go b/pkg/cloudinit/cloudinit.go index 538c441f..ea39732d 100644 --- a/pkg/cloudinit/cloudinit.go +++ b/pkg/cloudinit/cloudinit.go @@ -22,7 +22,7 @@ import ( "github.com/mudler/yip/pkg/executor" "github.com/mudler/yip/pkg/plugins" "github.com/mudler/yip/pkg/schema" - "github.com/twpayne/go-vfs/v4" + "github.com/twpayne/go-vfs/v5" ) type YipCloudInitRunner struct { diff --git a/pkg/cloudinit/cloudinit_test.go b/pkg/cloudinit/cloudinit_test.go index 0e556f1d..2764d6ea 100644 --- a/pkg/cloudinit/cloudinit_test.go +++ b/pkg/cloudinit/cloudinit_test.go @@ -34,7 +34,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5/vfst" ) // Parted print sample output diff --git a/pkg/config/config.go b/pkg/config/config.go index 3258080a..58dadbc5 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -23,7 +23,7 @@ import ( yip "github.com/mudler/yip/pkg/schema" "github.com/sanity-io/litter" "github.com/spf13/viper" - "github.com/twpayne/go-vfs/v4" + "github.com/twpayne/go-vfs/v5" "gopkg.in/yaml.v3" "k8s.io/mount-utils" ) diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index e093fb40..d13f603f 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -27,8 +27,8 @@ import ( v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" fsutils "github.com/kairos-io/kairos-agent/v2/pkg/utils/fs" v1mocks "github.com/kairos-io/kairos-agent/v2/tests/mocks" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" "gopkg.in/yaml.v3" . "github.com/kairos-io/kairos-agent/v2/pkg/config" diff --git a/pkg/config/spec_test.go b/pkg/config/spec_test.go index 9bcd12e3..eb17f636 100644 --- a/pkg/config/spec_test.go +++ b/pkg/config/spec_test.go @@ -34,7 +34,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/rs/zerolog" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5/vfst" "k8s.io/mount-utils" ) diff --git a/pkg/elemental/elemental_test.go b/pkg/elemental/elemental_test.go index 05d5b9c8..34ac5a82 100644 --- a/pkg/elemental/elemental_test.go +++ b/pkg/elemental/elemental_test.go @@ -44,7 +44,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/sanity-io/litter" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5/vfst" ) func TestElementalSuite(t *testing.T) { diff --git a/pkg/github/releases.go b/pkg/github/releases.go index 3a3f33f3..724de0c0 100644 --- a/pkg/github/releases.go +++ b/pkg/github/releases.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/Masterminds/semver/v3" - "github.com/google/go-github/v63/github" + "github.com/google/go-github/v66/github" "golang.org/x/oauth2" ) diff --git a/pkg/uki/common_test.go b/pkg/uki/common_test.go index 83438622..8cd94970 100644 --- a/pkg/uki/common_test.go +++ b/pkg/uki/common_test.go @@ -10,8 +10,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) var _ = Describe("Common functions tests", func() { diff --git a/pkg/utils/common.go b/pkg/utils/common.go index e7a26d94..919e0305 100644 --- a/pkg/utils/common.go +++ b/pkg/utils/common.go @@ -45,7 +45,7 @@ import ( "github.com/joho/godotenv" cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants" v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" - "github.com/twpayne/go-vfs/v4" + "github.com/twpayne/go-vfs/v5" ) func CommandExists(command string) bool { diff --git a/pkg/utils/fs/fs.go b/pkg/utils/fs/fs.go index 4d69aa12..91bdd738 100644 --- a/pkg/utils/fs/fs.go +++ b/pkg/utils/fs/fs.go @@ -33,8 +33,8 @@ import ( "time" v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) // DirSize returns the accumulated size of all files in folder diff --git a/pkg/utils/runstage_test.go b/pkg/utils/runstage_test.go index 974a69cb..0cf519f5 100644 --- a/pkg/utils/runstage_test.go +++ b/pkg/utils/runstage_test.go @@ -30,8 +30,8 @@ import ( v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) func writeCmdline(s string, fs v1.FS) error { diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index 4f428f5b..8a5eb0e1 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -38,8 +38,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/twpayne/go-vfs/v4" - "github.com/twpayne/go-vfs/v4/vfst" + "github.com/twpayne/go-vfs/v5" + "github.com/twpayne/go-vfs/v5/vfst" ) func getNamesFromListFiles(list []fs.DirEntry) []string {