Merge pull request #22 from shaneu/main

chore: fixing path handling
americanexpress · Jun 23, 2021 · dd82b41 · dd82b41
2 parents 560c2f7 + d85c7a6
commit dd82b41
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/pkg/file/fileUtil.go b/pkg/file/fileUtil.go
@@ -28,6 +28,7 @@ import (
 	"mime/multipart"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -304,12 +305,12 @@ func hasCompressionExtension(path string) bool {
 }
 
 // Read in .ge_ignore file and ignore files matching the patterns
-func getIgnorePatterns(path, ignoreFile string, verbose bool) (ignorePatterns []string) {
+func getIgnorePatterns(filePath, ignoreFile string, verbose bool) (ignorePatterns []string) {
 	ignorePatterns = append(ignorePatterns, "*.git/*")
 
 	// Loop through the files defined to contain ignore patterns (.ge_ignore, .gitignore, etc.)
 	for _, ignoreFile := range ignoreFiles {
-		path := path + "/" + ignoreFile
+		path := path.Join(filePath, ignoreFile)
 		if Exists(path) {
 			file, err := os.Open(path)
 			if err != nil {

diff --git a/pkg/file/fileUtil_test.go b/pkg/file/fileUtil_test.go
@@ -17,29 +17,32 @@
 package file
 
 import (
-	"log"
-	"os"
+	"github.com/americanexpress/earlybird/pkg/scan"
 	"reflect"
+
+	"os"
+	"path"
 	"strings"
 	"testing"
-
-	"github.com/americanexpress/earlybird/pkg/scan"
 )
 
-var userHomeDir string
+var projectRoot string
+var workDir string
 
 func init() {
-	var err error
-	userHomeDir, err = os.UserHomeDir()
+	workingDir, err := os.Getwd()
 	if err != nil {
-		log.Fatal("Home directory doesn't exist", err)
+		panic("cannot get working dir")
 	}
-	ignorePatterns = getIgnorePatterns(userHomeDir+string(os.PathSeparator), ".ge_ignore", false)
+
+	workDir = workingDir
+	projectRoot = path.Join(workingDir, "../../")
+	ignorePatterns = getIgnorePatterns(projectRoot, path.Join(projectRoot, ".ge_ignore"), false)
 }
 
 func TestGetFiles(t *testing.T) {
 	searchDir := "test_data"
-	ignoreFile := userHomeDir + string(os.PathSeparator) + ".ge_ignore"
+	ignoreFile := path.Join(projectRoot, ".ge_ignore")
 	verbose := false
 	maxFileSize := int64(1000000)
 
@@ -117,7 +120,7 @@ func Test_getFileSizeOK(t *testing.T) {
 }
 
 func Test_getIgnorePatterns(t *testing.T) {
-	if gotIgnorePatterns := getIgnorePatterns(userHomeDir+string(os.PathSeparator), ".ge_ignore", false); len(ignorePatterns) == 0 {
+	if gotIgnorePatterns := getIgnorePatterns(projectRoot, ".ge_ignore", false); len(ignorePatterns) == 0 {
 		t.Errorf("getIgnorePatterns() = %v, want multiple patterns", gotIgnorePatterns)
 	}
 }
@@ -137,7 +140,7 @@ func Test_isIgnoredFile(t *testing.T) {
 		{
 			name: "Check if file is ignored",
 			args: args{
-				fileName: "ignore.png",
+				fileName: "/npm-shrinkwrap.json",
 			},
 			want: true,
 		},

diff --git a/pkg/scan/scan_test.go b/pkg/scan/scan_test.go
@@ -58,7 +58,7 @@ func init() {
 
 	cfg.AdjustedSeverityCategories = []cfgReader.AdjustedSeverityCategory{
 		{
-			Category: "password-secret",
+			Category:                "password-secret",
 			AdjustedDisplaySeverity: "medium",
 			Patterns: []string{
 				"(?i)/lowEnv/",