From 556025172dd3cba803f2f2b8d3c5b591a105fb2d Mon Sep 17 00:00:00 2001 From: Itxaka Date: Wed, 31 Jul 2024 12:17:56 +0200 Subject: [PATCH] Bump vfs to v5 Signed-off-by: Itxaka --- go.mod | 3 ++- go.sum | 6 ++++-- pkg/action/build_iso_test.go | 4 ++-- pkg/config/config.go | 2 +- pkg/utils/fs.go | 4 ++-- pkg/utils/utils_test.go | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 7deabdc..afe5e8e 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 - github.com/twpayne/go-vfs/v4 v4.3.0 + github.com/twpayne/go-vfs/v5 v5.0.4 github.com/u-root/u-root v0.12.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 ) @@ -162,6 +162,7 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // 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/vbatts/tar-split v0.11.3 // indirect github.com/vishvananda/netlink v1.2.1-beta.2 // indirect diff --git a/go.sum b/go.sum index de0b5bc..e5ec966 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/g github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU= github.com/alecthomas/assert/v2 v2.6.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE= -github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= -github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= +github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= +github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -1069,6 +1069,8 @@ 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/u-root/u-root v0.12.0 h1:K0AuBFriwr0w/PGS3HawiAw89e3+MU7ks80GpghAsNs= github.com/u-root/u-root v0.12.0/go.mod h1:FYjTOh4IkIZHhjsd17lb8nYW6udgXdJhG1c0r6u0arI= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= diff --git a/pkg/action/build_iso_test.go b/pkg/action/build_iso_test.go index 97ec93c..b93f578 100644 --- a/pkg/action/build_iso_test.go +++ b/pkg/action/build_iso_test.go @@ -32,8 +32,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("BuildISOAction", func() { diff --git a/pkg/config/config.go b/pkg/config/config.go index ed53d96..03bc679 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -1,6 +1,7 @@ package config import ( + "github.com/twpayne/go-vfs/v5" "reflect" "runtime" @@ -17,7 +18,6 @@ import ( "github.com/sanity-io/litter" "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/twpayne/go-vfs/v4" ) var decodeHook = viper.DecodeHook( diff --git a/pkg/utils/fs.go b/pkg/utils/fs.go index 9978dd5..855e70c 100644 --- a/pkg/utils/fs.go +++ b/pkg/utils/fs.go @@ -14,8 +14,8 @@ import ( "github.com/kairos-io/enki/pkg/constants" 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" ) // MkdirAll directory and all parents if not existing diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index 9b159bb..061a2c8 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -29,8 +29,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/spf13/viper" - "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("Utils", Label("utils"), func() {