test: use path.Join to ensure OS-specific path separators are used

G-Rath · Dec 16, 2022 · 0a20993 · 0a20993
1 parent 573f2ca
commit 0a20993
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 82 deletions.
diff --git a/internal/configer/load.go b/internal/configer/load.go
@@ -8,7 +8,7 @@ import (
 	"gopkg.in/yaml.v2"
 	"net/url"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 )
 
@@ -132,7 +132,7 @@ func Find(r *reporter.Reporter, pathToDirectory string) (Config, error) {
 func Load(r *reporter.Reporter, pathToConfig string) (Config, error) {
 	var raw rawConfig
 
-	pathToConfig = path.Clean(pathToConfig)
+	pathToConfig = filepath.Clean(pathToConfig)
 
 	raw.FilePath = pathToConfig
 

diff --git a/internal/configer/load_test.go b/internal/configer/load_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/g-rath/osv-detector/internal/configer"
 	"github.com/g-rath/osv-detector/internal/reporter"
+	"path/filepath"
 	"reflect"
 	"strings"
 	"testing"
@@ -26,7 +27,7 @@ func TestFind_NoConfig(t *testing.T) {
 
 	r, _, _ := newReporter(t)
 
-	config, err := configer.Find(r, "fixtures/no-config")
+	config, err := configer.Find(r, filepath.FromSlash("fixtures/no-config"))
 
 	if err != nil {
 		t.Errorf("Find() error = %v, expected nothing", err)
@@ -47,9 +48,9 @@ func TestFind_ExtYml(t *testing.T) {
 	r, _, _ := newReporter(t)
 
 	expectedIgnores := []string{"GHSA-1", "GHSA-2", "GHSA-3"}
-	expectedFilePath := "fixtures/ext-yml/.osv-detector.yml"
+	expectedFilePath := filepath.FromSlash("fixtures/ext-yml/.osv-detector.yml")
 
-	config, err := configer.Find(r, "fixtures/ext-yml")
+	config, err := configer.Find(r, filepath.FromSlash("fixtures/ext-yml"))
 
 	if err != nil {
 		t.Errorf("Find() error = %v, expected nothing", err)
@@ -69,9 +70,9 @@ func TestFind_ExtYml_Invalid(t *testing.T) {
 
 	r, _, _ := newReporter(t)
 
-	expectedFilePath := "fixtures/ext-yml-invalid/.osv-detector.yml"
+	expectedFilePath := filepath.FromSlash("fixtures/ext-yml-invalid/.osv-detector.yml")
 
-	config, err := configer.Find(r, "fixtures/ext-yml-invalid")
+	config, err := configer.Find(r, filepath.FromSlash("fixtures/ext-yml-invalid"))
 
 	if err == nil {
 		t.Errorf("Find() did not error, which was unexpected")
@@ -92,9 +93,9 @@ func TestFind_ExtYaml(t *testing.T) {
 	r, _, _ := newReporter(t)
 
 	expectedIgnores := []string{"GHSA-4", "GHSA-5", "GHSA-6"}
-	expectedFilePath := "fixtures/ext-yaml/.osv-detector.yaml"
+	expectedFilePath := filepath.FromSlash("fixtures/ext-yaml/.osv-detector.yaml")
 
-	config, err := configer.Find(r, "fixtures/ext-yaml")
+	config, err := configer.Find(r, filepath.FromSlash("fixtures/ext-yaml"))
 
 	if err != nil {
 		t.Errorf("Find() error = %v, expected nothing", err)
@@ -114,9 +115,9 @@ func TestFind_ExtYaml_Invalid(t *testing.T) {
 
 	r, _, _ := newReporter(t)
 
-	expectedFilePath := "fixtures/ext-yaml-invalid/.osv-detector.yaml"
+	expectedFilePath := filepath.FromSlash("fixtures/ext-yaml-invalid/.osv-detector.yaml")
 
-	config, err := configer.Find(r, "fixtures/ext-yaml-invalid")
+	config, err := configer.Find(r, filepath.FromSlash("fixtures/ext-yaml-invalid"))
 
 	if err == nil {
 		t.Errorf("Find() did not error, which was unexpected")
@@ -136,7 +137,7 @@ func TestLoad(t *testing.T) {
 
 	r, _, stderr := newReporter(t)
 
-	fixturePath := "fixtures/extra-databases/.osv-detector.yml"
+	fixturePath := filepath.FromSlash("fixtures/extra-databases/.osv-detector.yml")
 
 	config, err := configer.Load(r, fixturePath)
 

diff --git a/main.go b/main.go
@@ -11,7 +11,7 @@ import (
 	"github.com/g-rath/osv-detector/pkg/lockfile"
 	"io"
 	"os"
-	"path"
+	"path/filepath"
 	"sort"
 )
 
@@ -263,7 +263,7 @@ func findLockfiles(r *reporter.Reporter, pathToLockOrDirectory string, parseAs s
 							}
 						}
 
-						lockfiles = append(lockfiles, path.Join(pathToLockOrDirectory, dir.Name()))
+						lockfiles = append(lockfiles, filepath.Join(pathToLockOrDirectory, dir.Name()))
 					}
 				}
 			} else {
@@ -300,7 +300,7 @@ func findAllLockfiles(r *reporter.Reporter, pathsToCheck []string, parseAs strin
 		}
 
 		for _, p := range lps {
-			paths = append(paths, path.Clean(p))
+			paths = append(paths, filepath.Clean(p))
 		}
 	}
 
@@ -417,7 +417,7 @@ func readAllLockfiles(
 
 	for _, pathToLock := range pathsToLocks {
 		if checkForLocalConfig {
-			base := path.Dir(pathToLock)
+			base := filepath.Dir(pathToLock)
 			con, err := configer.Find(r, base)
 
 			if err != nil {