Go: Check for modules.txt or glide.yaml to exclude vendor dirs

mbg · mbg · commit 11e3a08e44bb · 2025-02-19T13:57:15.000Z
diff --git a/go/extractor/util/util.go b/go/extractor/util/util.go
@@ -306,5 +306,6 @@ func fileExists(path string) bool {
 // Decides if `dirPath` is a vendor directory by testing whether it is called `vendor`
 // and contains a `modules.txt` file.
 func IsGolangVendorDirectory(dirPath string) bool {
-	return filepath.Base(dirPath) == "vendor" && fileExists(filepath.Join(dirPath, "modules.txt"))
+	return filepath.Base(dirPath) == "vendor" &&
+		(fileExists(filepath.Join(dirPath, "modules.txt")) || fileExists(filepath.Join(dirPath, "../glide.yaml")))
 }

Original file line number	Diff line number	Diff line change
`@@ -306,5 +306,6 @@ func fileExists(path string) bool {`
`306`	`306`	// Decides if `dirPath` is a vendor directory by testing whether it is called `vendor`
`307`	`307`	// and contains a `modules.txt` file.
`308`	`308`	`func IsGolangVendorDirectory(dirPath string) bool {`
`309`		`- return filepath.Base(dirPath) == "vendor" && fileExists(filepath.Join(dirPath, "modules.txt"))`
	`309`	`+ return filepath.Base(dirPath) == "vendor" &&`
	`310`	`+ (fileExists(filepath.Join(dirPath, "modules.txt")) \|\| fileExists(filepath.Join(dirPath, "../glide.yaml")))`
`310`	`311`	`}`