Add symlink support to files.CopyDir

ubuntu · Jan 21, 2025 · b88e18d · b88e18d
1 parent 8960fef
commit b88e18d
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 76 deletions.
diff --git a/internal/collector/sysinfo/sysinfo_linux.go b/internal/collector/sysinfo/sysinfo_linux.go
@@ -58,7 +58,7 @@ func (s Manager) readFile(file string) string {
 		return ""
 	}
 
-	return string(f)
+	return strings.TrimSpace(string(f))
 }
 
 func (s Manager) collectProduct() map[string]string {

diff --git a/internal/collector/sysinfo/sysinfo_linux_test.go b/internal/collector/sysinfo/sysinfo_linux_test.go
@@ -164,7 +164,7 @@ func TestCollect(t *testing.T) {
 				t.FailNow()
 			}
 
-			root := filepath.Join(tmp, "linuxfs", tc.root)
+			root := filepath.Join(tmp, tc.root)
 			for _, f := range tc.missingFiles {
 				err := os.Remove(filepath.Join(root, f))
 				if err != nil {

diff --git a/internal/collector/sysinfo/testdata/TestCollect/golden/missing_block_information b/internal/collector/sysinfo/testdata/TestCollect/golden/missing_block_information
@@ -2,8 +2,7 @@ hardware:
     product:
         Family: Framework DIY
         Name: DIY Framework Laptop 16
-        Vendor: |
-            Framework
+        Vendor: Framework
     cpu:
         cpu:
             'Architecture:': x86_64

diff --git a/internal/collector/sysinfo/testdata/TestCollect/golden/missing_cpu_information b/internal/collector/sysinfo/testdata/TestCollect/golden/missing_cpu_information
@@ -2,8 +2,7 @@ hardware:
     product:
         Family: Framework DIY
         Name: DIY Framework Laptop 16
-        Vendor: |
-            Framework
+        Vendor: Framework
     cpu:
         cpu: {}
     gpus:

diff --git a/internal/collector/sysinfo/testdata/TestCollect/golden/missing_gpu_information b/internal/collector/sysinfo/testdata/TestCollect/golden/missing_gpu_information
@@ -2,8 +2,7 @@ hardware:
     product:
         Family: Framework DIY
         Name: DIY Framework Laptop 16
-        Vendor: |
-            Framework
+        Vendor: Framework
     cpu:
         cpu:
             'Architecture:': x86_64

diff --git a/internal/collector/sysinfo/testdata/TestCollect/golden/missing_gpus b/internal/collector/sysinfo/testdata/TestCollect/golden/missing_gpus
@@ -2,8 +2,7 @@ hardware:
     product:
         Family: Framework DIY
         Name: DIY Framework Laptop 16
-        Vendor: |
-            Framework
+        Vendor: Framework
     cpu:
         cpu:
             'Architecture:': x86_64

diff --git a/internal/collector/sysinfo/testdata/TestCollect/golden/missing_memory_information b/internal/collector/sysinfo/testdata/TestCollect/golden/missing_memory_information
@@ -2,8 +2,7 @@ hardware:
     product:
         Family: Framework DIY
         Name: DIY Framework Laptop 16
-        Vendor: |
-            Framework
+        Vendor: Framework
     cpu:
         cpu:
             'Architecture:': x86_64

diff --git a/internal/collector/sysinfo/testdata/TestCollect/golden/missing_screen_information b/internal/collector/sysinfo/testdata/TestCollect/golden/missing_screen_information
@@ -2,8 +2,7 @@ hardware:
     product:
         Family: Framework DIY
         Name: DIY Framework Laptop 16
-        Vendor: |
-            Framework
+        Vendor: Framework
     cpu:
         cpu:
             'Architecture:': x86_64

diff --git a/internal/collector/sysinfo/testdata/TestCollect/golden/regular_hardware_information b/internal/collector/sysinfo/testdata/TestCollect/golden/regular_hardware_information
@@ -2,8 +2,7 @@ hardware:
     product:
         Family: Framework DIY
         Name: DIY Framework Laptop 16
-        Vendor: |
-            Framework
+        Vendor: Framework
     cpu:
         cpu:
             'Architecture:': x86_64

diff --git a/internal/testutils/files.go b/internal/testutils/files.go
@@ -4,6 +4,7 @@ package testutils
 
 import (
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"testing"
@@ -35,6 +36,19 @@ func CopyFile(src, dst string) error {
 	return err
 }
 
+func CopySymlink(src, dst string) error {
+	lnk, err := os.Readlink(src)
+	if err != nil {
+		return err
+	}
+
+	err = os.Symlink(lnk, dst)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // CopyDir copies the contents of a directory to another directory.
 func CopyDir(srcDir, dstDir string) error {
 	return filepath.Walk(srcDir, func(path string, info os.FileInfo, err error) error {
@@ -49,6 +63,9 @@ func CopyDir(srcDir, dstDir string) error {
 		if info.IsDir() {
 			return os.MkdirAll(dstPath, info.Mode())
 		}
+		if info.Mode()&fs.ModeSymlink > 0 {
+			return CopySymlink(path, dstPath)
+		}
 		return CopyFile(path, dstPath)
 	})
 }
diff --git a/internal/testutils/filesystem.go b/internal/testutils/filesystem.go