kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-09-04 10:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to use vfs4 (#240)

Browse Source
This commit is contained in:
Itxaka
2024-03-18 11:57:34 +01:00
committed by GitHub
parent 7d3a163ae2
commit abf92beac8
23 changed files with 174 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/utils/utils_test.go
View File

@@ -23,6 +23,7 @@ import (
"github.com/kairos-io/kairos-agent/v2/pkg/utils/fs"
"github.com/kairos-io/kairos-agent/v2/pkg/utils/partitions"
sdkTypes "github.com/kairos-io/kairos-sdk/types"
"io/fs"
"os"
"path/filepath"
"strings"
@@ -37,11 +38,11 @@ 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"
"github.com/twpayne/go-vfs/vfst"
"github.com/twpayne/go-vfs/v4"
"github.com/twpayne/go-vfs/v4/vfst"
)
func getNamesFromListFiles(list []os.FileInfo) []string {
func getNamesFromListFiles(list []fs.DirEntry) []string {
var names []string
for _, f := range list {
names = append(names, f.Name())
@@ -396,10 +397,8 @@ var _ = Describe("Utils", Label("utils"), func() {
Expect(e).To(BeTrue())
})
It("Fails to open non existing file", func() {
err := fsutils.MkdirAll(fs, "/some", constants.DirPerm)
Expect(err).ShouldNot(HaveOccurred())
Expect(utils.CopyFile(fs, "/some/file", "/some/otherfile")).NotTo(BeNil())
_, err = fs.Stat("/some/otherfile")
Expect(utils.CopyFile(fs, "file:/file", "/some/otherfile")).NotTo(BeNil())
_, err := fs.Stat("/some/otherfile")
Expect(err).NotTo(BeNil())
})
It("Fails to copy on non writable target", func() {
@@ -548,10 +547,10 @@ var _ = Describe("Utils", Label("utils"), func() {
Expect(utils.SyncData(logger, realRunner, fs, sourceDir, destDir)).To(BeNil())
})
It("should NOT fail if destination does not exist", func() {
sourceDir, err := os.MkdirTemp("", "elemental")
err = os.WriteFile(filepath.Join(sourceDir, "testfile"), []byte("sdjfnsdjkfjkdsanfkjsnda"), os.ModePerm)
sourceDir, err := fsutils.TempDir(fs, "", "elemental")
err = fs.WriteFile(filepath.Join(sourceDir, "testfile"), []byte("sdjfnsdjkfjkdsanfkjsnda"), os.ModePerm)
Expect(err).ToNot(HaveOccurred())
err = utils.SyncData(logger, realRunner, nil, sourceDir, "/welp")
err = utils.SyncData(logger, realRunner, fs, sourceDir, "/welp")
Expect(err).To(BeNil())
})
It("should fail if source does not exist", func() {