fix(terraform): ensure consistent path handling across OS

aquasecurity · Feb 19, 2024 · ed197d0 · ed197d0
1 parent 32a02a9
commit ed197d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/iac/scanners/terraform/parser/parser.go b/pkg/iac/scanners/terraform/parser/parser.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"io/fs"
 	"os"
+	"path"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -195,7 +196,7 @@ func (p *Parser) ParseFile(_ context.Context, fullPath string) error {
 // ParseFS parses a root module, where it exists at the root of the provided filesystem
 func (p *Parser) ParseFS(ctx context.Context, dir string) error {
 
-	dir = filepath.Clean(dir)
+	dir = path.Clean(dir)
 
 	if p.projectRoot == "" {
 		p.debug.Log("Setting project/module root to '%s'", dir)
@@ -212,7 +213,7 @@ func (p *Parser) ParseFS(ctx context.Context, dir string) error {
 
 	var paths []string
 	for _, info := range fileInfos {
-		realPath := filepath.Join(dir, info.Name())
+		realPath := path.Join(dir, info.Name())
 		if info.Type()&os.ModeSymlink != 0 {
 			extra, ok := p.moduleFS.(extrafs.FS)
 			if !ok {

diff --git a/pkg/iac/scanners/terraform/scanner.go b/pkg/iac/scanners/terraform/scanner.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"io"
 	"io/fs"
+	"path"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -334,7 +335,7 @@ func (s *Scanner) findRootModules(target fs.FS, scanDir string, dirs ...string)
 			continue
 		}
 		for _, file := range files {
-			realPath := filepath.Join(dir, file.Name())
+			realPath := path.Join(dir, file.Name())
 			if symFS, ok := target.(extrafs.ReadLinkFS); ok {
 				realPath, err = symFS.ResolveSymlink(realPath, scanDir)
 				if err != nil {