fix(commonjs): Substitute doublestar for zglob to fix data race

fossas · Jan 31, 2018 · b16e851 · b16e851
1 parent c7d449d
commit b16e851
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -47,3 +47,11 @@
 [[constraint]]
   branch = "v2"
   name = "gopkg.in/yaml.v2"
+
+[[constraint]]
+  name = "github.com/gobwas/glob"
+  version = "0.2.2"
+
+[[constraint]]
+  name = "github.com/bmatcuk/doublestar"
+  version = "1.0.9"
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ endif
 .PHONY: default
 
 default: 
-	GOBIN=${GOBIN} go install -ldflags '-race -X main.revision=$(shell git rev-parse HEAD)' github.com/fossas/fossa-cli/cmd/fossa
+	GOBIN=${GOBIN} go install -ldflags '-X main.revision=$(shell git rev-parse HEAD)' github.com/fossas/fossa-cli/cmd/fossa
 
 clean:
 	rm -f $(GOPATH)/bin/fossa
diff --git a/build/commonjs.go b/build/commonjs.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/mattn/go-zglob"
+	"github.com/bmatcuk/doublestar"
 
 	"github.com/fossas/fossa-cli/log"
 )
@@ -191,7 +191,7 @@ func (ctx *CommonJSContext) traverseNodeModules(m *Module) ([]Dependency, error)
 		return nil, err
 	}
 
-	commonjsPkgs, err := zglob.Glob(filepath.Join(cwd, m.Dir) + "/**/node_modules/*/package.json")
+	commonjsPkgs, err := doublestar.Glob(filepath.Join(cwd, m.Dir) + "/**/node_modules/*/package.json")
 	if err != nil {
 		return nil, err
 	}