Ignore vendor/ directories in golang strategies (#39)

fossas · Feb 25, 2020 · f4e7c26 · f4e7c26
1 parent bef733d
commit f4e7c26
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/Strategy/Go/GoList.hs b/src/Strategy/Go/GoList.hs
@@ -23,12 +23,12 @@ import Strategy.Go.Types
 import Types
 
 discover :: HasDiscover sig m => Path Abs Dir -> m ()
-discover = walk $ \_ _ files -> do
+discover = walk $ \_ subdirs files -> do
   case find (\f -> fileName f == "go.mod") files of
     Nothing -> pure ()
     Just file  -> runSimpleStrategy "golang-golist" GolangGroup $ analyze (parent file)
 
-  walkContinue
+  walkSkipNamed ["vendor/"] subdirs
 
 data Require = Require
   { reqPackage :: Text

diff --git a/src/Strategy/Go/Gomod.hs b/src/Strategy/Go/Gomod.hs
@@ -30,12 +30,12 @@ import Strategy.Go.Types
 import Types
 
 discover :: HasDiscover sig m => Path Abs Dir -> m ()
-discover = walk $ \_ _ files -> do
+discover = walk $ \_ subdirs files -> do
   case find (\f -> fileName f == "go.mod") files of
     Nothing -> pure ()
     Just file -> runSimpleStrategy "golang-gomod" GolangGroup $ analyze file
 
-  walkContinue
+  walkSkipNamed ["vendor/"] subdirs
 
 data Statement =
     RequireStatement Text Text -- ^ package, version

diff --git a/src/Strategy/Go/GopkgLock.hs b/src/Strategy/Go/GopkgLock.hs
@@ -26,12 +26,12 @@ import Toml (TomlCodec, (.=))
 import Types
 
 discover :: HasDiscover sig m => Path Abs Dir -> m ()
-discover = walk $ \_ _ files -> do
+discover = walk $ \_ subdirs files -> do
   case find (\f -> fileName f == "Gopkg.lock") files of
     Nothing -> pure ()
     Just file -> runSimpleStrategy "golang-gopkglock" GolangGroup $ analyze file
 
-  walkContinue
+  walkSkipNamed ["vendor/"] subdirs
 
 golockCodec :: TomlCodec GoLock
 golockCodec = GoLock

diff --git a/src/Strategy/Go/GopkgToml.hs b/src/Strategy/Go/GopkgToml.hs
@@ -29,12 +29,12 @@ import Strategy.Go.Types
 import Types
 
 discover :: HasDiscover sig m => Path Abs Dir -> m ()
-discover = walk $ \_ _ files -> do
+discover = walk $ \_ subdirs files -> do
   case find (\f -> fileName f == "Gopkg.toml") files of
     Nothing -> pure ()
     Just file -> runSimpleStrategy "golang-gopkgtoml" GolangGroup $ analyze file
 
-  walkContinue
+  walkSkipNamed ["vendor/"] subdirs
 
 gopkgCodec :: TomlCodec Gopkg
 gopkgCodec = Gopkg