🧹 refactor packages for filesystem handling

chris-rock · chris-rock · commit 1f910502b4bd · 2025-12-14T14:30:43.000+01:00
diff --git a/providers/os/connection/device/linux/device_manager.go b/providers/os/connection/device/linux/device_manager.go
@@ -19,7 +19,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/afero"
 	"go.mondoo.com/cnquery/v12/providers/os/connection/snapshot"
-	"go.mondoo.com/cnquery/v12/providers/os/fs"
+	"go.mondoo.com/cnquery/v12/providers/os/mountedfs"
 	"go.mondoo.com/cnquery/v12/providers/os/resources"
 )
 
@@ -201,7 +201,7 @@ func (d *LinuxDeviceManager) attemptFindFstab(dir string) ([]resources.FstabEntr
 
 	mnt, fstab := path.Split(strings.TrimSpace(string(out)))
 	fstabFile, err := afero.ReadFile(
-		fs.NewMountedFs(mnt),
+		mountedfs.NewMountedFs(mnt),
 		path.Base(fstab))
 	if err != nil {
 		log.Error().Err(err).Msg("error reading fstab")
diff --git a/providers/os/connection/fs/filesystem.go b/providers/os/connection/fs/filesystem.go
@@ -12,7 +12,7 @@ import (
 	"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v12/providers-sdk/v1/plugin"
 	"go.mondoo.com/cnquery/v12/providers/os/connection/shared"
-	"go.mondoo.com/cnquery/v12/providers/os/fs"
+	"go.mondoo.com/cnquery/v12/providers/os/mountedfs"
 )
 
 var (
@@ -33,7 +33,7 @@ func NewFileSystemConnectionWithClose(id uint32, conf *inventory.Config, asset *
 
 	log.Debug().Str("path", path).Msg("load filesystem")
 
-	return NewFileSystemConnectionWithFs(id, conf, asset, path, closeFN, fs.NewMountedFs(path))
+	return NewFileSystemConnectionWithFs(id, conf, asset, path, closeFN, mountedfs.NewMountedFs(path))
 }
 
 func NewFileSystemConnectionWithFs(id uint32, conf *inventory.Config, asset *inventory.Asset, path string, closeFN func(), fs afero.Fs) (*FileSystemConnection, error) {
@@ -69,7 +69,7 @@ func (c *FileSystemConnection) RunCommand(command string) (*shared.Command, erro
 
 func (c *FileSystemConnection) FileSystem() afero.Fs {
 	if c.fs == nil {
-		c.fs = fs.NewMountedFs(c.MountedDir)
+		c.fs = mountedfs.NewMountedFs(c.MountedDir)
 	}
 	return c.fs
 }
diff --git a/providers/os/connection/tar/fs.go b/providers/os/connection/tar/fs.go
@@ -193,8 +193,7 @@ func (fs *FS) tar(path string, header *tar.Header) (io.ReadCloser, error) {
 	return tarReader, nil
 }
 
-// searches for files and returns the file info
-// regex can be nil
+// Find searches for files and returns the file info, regex can be nil
 func (fs *FS) Find(from string, r *regexp.Regexp, typ string, perm *uint32, depth *int) ([]string, error) {
 	list := []string{}
 	for k := range fs.FileMap {
diff --git a/providers/os/fsutil/find_files.go b/providers/os/fsutil/find_files.go
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package fs
+package fsutil
 
 import (
 	"io/fs"
diff --git a/providers/os/fsutil/find_files_test.go b/providers/os/fsutil/find_files_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package fs
+package fsutil
 
 import (
 	"fmt"
diff --git a/providers/os/fsutil/find_files_unix.go b/providers/os/fsutil/find_files_unix.go
@@ -4,7 +4,7 @@
 //go:build linux || darwin || netbsd || openbsd || freebsd
 // +build linux darwin netbsd openbsd freebsd
 
-package fs
+package fsutil
 
 import (
 	"errors"
diff --git a/providers/os/fsutil/find_files_windows.go b/providers/os/fsutil/find_files_windows.go
@@ -4,7 +4,7 @@
 //go:build windows
 // +build windows
 
-package fs
+package fsutil
 
 import (
 	"errors"
diff --git a/providers/os/mountedfs/file.go b/providers/os/mountedfs/file.go
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package fs
+package mountedfs
 
 import (
 	"os"
diff --git a/providers/os/mountedfs/fs.go b/providers/os/mountedfs/fs.go
@@ -1,7 +1,7 @@
 // Copyright (c) Mondoo, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package fs
+package mountedfs
 
 import (
 	"errors"
@@ -12,6 +12,7 @@ import (
 
 	"github.com/spf13/afero"
 	"go.mondoo.com/cnquery/v12/providers/os/connection/shared"
+	"go.mondoo.com/cnquery/v12/providers/os/fsutil"
 )
 
 var _ shared.FileSearch = (*MountedFs)(nil)
@@ -118,5 +119,5 @@ func (t *MountedFs) Chown(name string, uid, gid int) error {
 
 func (t *MountedFs) Find(from string, r *regexp.Regexp, typ string, perm *uint32, depth *int) ([]string, error) {
 	iofs := afero.NewIOFS(t)
-	return FindFiles(iofs, from, r, typ, perm, depth)
+	return fsutil.FindFiles(iofs, from, r, typ, perm, depth)
 }
diff --git a/providers/os/resources/services/systemd_test.go b/providers/os/resources/services/systemd_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"
 	"go.mondoo.com/cnquery/v12/providers/os/connection/mock"
-	"go.mondoo.com/cnquery/v12/providers/os/fs"
+	"go.mondoo.com/cnquery/v12/providers/os/mountedfs"
 )
 
 func TestSystemDExtractDescription(t *testing.T) {
@@ -112,7 +112,7 @@ func TestParseServiceSystemDUnitFilesPhoton(t *testing.T) {
 
 func TestSystemdFS(t *testing.T) {
 	s := SystemdFSServiceManager{
-		Fs: fs.NewMountedFs("testdata/systemd"),
+		Fs: mountedfs.NewMountedFs("testdata/systemd"),
 	}
 
 	services, err := s.List()

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"`
`13`	`13`	`"go.mondoo.com/cnquery/v12/providers-sdk/v1/plugin"`
`14`	`14`	`"go.mondoo.com/cnquery/v12/providers/os/connection/shared"`
`15`		`- "go.mondoo.com/cnquery/v12/providers/os/fs"`
	`15`	`+ "go.mondoo.com/cnquery/v12/providers/os/mountedfs"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var (`
`@@ -33,7 +33,7 @@ func NewFileSystemConnectionWithClose(id uint32, conf inventory.Config, asset `
`33`	`33`
`34`	`34`	`log.Debug().Str("path", path).Msg("load filesystem")`
`35`	`35`
`36`		`- return NewFileSystemConnectionWithFs(id, conf, asset, path, closeFN, fs.NewMountedFs(path))`
	`36`	`+ return NewFileSystemConnectionWithFs(id, conf, asset, path, closeFN, mountedfs.NewMountedFs(path))`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func NewFileSystemConnectionWithFs(id uint32, conf inventory.Config, asset inventory.Asset, path string, closeFN func(), fs afero.Fs) (*FileSystemConnection, error) {`
`@@ -69,7 +69,7 @@ func (c FileSystemConnection) RunCommand(command string) (shared.Command, erro`
`69`	`69`
`70`	`70`	`func (c *FileSystemConnection) FileSystem() afero.Fs {`
`71`	`71`	`if c.fs == nil {`
`72`		`- c.fs = fs.NewMountedFs(c.MountedDir)`
	`72`	`+ c.fs = mountedfs.NewMountedFs(c.MountedDir)`
`73`	`73`	`}`
`74`	`74`	`return c.fs`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,8 +193,7 @@ func (fs FS) tar(path string, header tar.Header) (io.ReadCloser, error) {`
`193`	`193`	`return tarReader, nil`
`194`	`194`	`}`
`195`	`195`
`196`		`-// searches for files and returns the file info`
`197`		`-// regex can be nil`
	`196`	`+// Find searches for files and returns the file info, regex can be nil`
`198`	`197`	`func (fs FS) Find(from string, r regexp.Regexp, typ string, perm uint32, depth int) ([]string, error) {`
`199`	`198`	`list := []string{}`
`200`	`199`	`for k := range fs.FileMap {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/stretchr/testify/require"`
`11`	`11`	`"go.mondoo.com/cnquery/v12/providers-sdk/v1/inventory"`
`12`	`12`	`"go.mondoo.com/cnquery/v12/providers/os/connection/mock"`
`13`		`- "go.mondoo.com/cnquery/v12/providers/os/fs"`
	`13`	`+ "go.mondoo.com/cnquery/v12/providers/os/mountedfs"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestSystemDExtractDescription(t *testing.T) {`
`@@ -112,7 +112,7 @@ func TestParseServiceSystemDUnitFilesPhoton(t *testing.T) {`
`112`	`112`
`113`	`113`	`func TestSystemdFS(t *testing.T) {`
`114`	`114`	`s := SystemdFSServiceManager{`
`115`		`- Fs: fs.NewMountedFs("testdata/systemd"),`
	`115`	`+ Fs: mountedfs.NewMountedFs("testdata/systemd"),`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`services, err := s.List()`