fix: show warning when unsupported languages are detected (#1271)

* fix: show warning when unsupported languages are detected * fix: add detector lang to dependency * fix: update test helper in-memory report * chore: update snapshots
Bearer · Sep 19, 2023 · 4f9beb1 · 4f9beb1
1 parent 2a567ad
commit 4f9beb1
Show file tree

Hide file tree

Showing 70 changed files with 7,909 additions and 39 deletions.
diff --git a/internal/detectors/csharp/.snapshots/TestDetectorReportDataTypes b/internal/detectors/csharp/.snapshots/TestDetectorReportDataTypes
@@ -2,6 +2,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "datatypes.cs",
@@ -30,6 +31,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "datatypes.cs",
@@ -58,6 +60,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "datatypes.cs",
@@ -86,6 +89,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "datatypes.cs",
@@ -114,6 +118,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "datatypes.cs",
@@ -142,6 +147,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "datatypes.cs",
@@ -170,6 +176,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "datatypes.cs",

diff --git a/internal/detectors/csharp/.snapshots/TestDetectorReportInterfaces b/internal/detectors/csharp/.snapshots/TestDetectorReportInterfaces
@@ -2,6 +2,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=9) "config.cs",
@@ -30,6 +31,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=9) "config.cs",
@@ -61,6 +63,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=9) "config.cs",
@@ -92,6 +95,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -120,6 +124,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -148,6 +153,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=6) "schema",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -176,6 +182,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -204,6 +211,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -240,6 +248,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -272,6 +281,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -300,6 +310,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -328,6 +339,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -356,6 +368,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",
@@ -384,6 +397,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=9) "interface",
     DetectorType: (detectors.Type) (len=6) "csharp",
+    DetectorLanguage: (detectors.Language) "",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=7) "urls.cs",

diff --git a/internal/detectors/dependencies/buildgradle/.snapshots/TestDependenciesReport b/internal/detectors/dependencies/buildgradle/.snapshots/TestDependenciesReport
@@ -2,6 +2,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "gradleparser",
+    DetectorLanguage: (detectors.Language) (len=4) "Java",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "build.gradle",
@@ -24,6 +25,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "gradleparser",
+    DetectorLanguage: (detectors.Language) (len=4) "Java",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=12) "build.gradle",

diff --git a/internal/detectors/dependencies/composerjson/.snapshots/TestDependenciesReport b/internal/detectors/dependencies/composerjson/.snapshots/TestDependenciesReport
@@ -2,6 +2,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerjson",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.json",
@@ -24,6 +25,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerjson",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.json",

diff --git a/internal/detectors/dependencies/composerlock/.snapshots/TestDependenciesReport b/internal/detectors/dependencies/composerlock/.snapshots/TestDependenciesReport
@@ -2,6 +2,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerlock",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.lock",
@@ -24,6 +25,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerlock",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.lock",
@@ -46,6 +48,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerlock",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.lock",
@@ -68,6 +71,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerlock",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.lock",
@@ -90,6 +94,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerlock",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.lock",
@@ -112,6 +117,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerlock",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.lock",
@@ -134,6 +140,7 @@
   (*detections.Detection)({
     Type: (detections.DetectionType) (len=10) "dependency",
     DetectorType: (detectors.Type) (len=12) "composerlock",
+    DetectorLanguage: (detectors.Language) (len=3) "PHP",
     CommitSHA: (string) "",
     Source: (source.Source) {
       Filename: (string) (len=13) "composer.lock",

diff --git a/internal/detectors/dependencies/dependencies.go b/internal/detectors/dependencies/dependencies.go
@@ -97,19 +97,24 @@ func discoverDependency(report report.Report, file *file.FileInfo, discover func
 	for _, dep := range result.Dependencies {
 		startColumnNumber := int(dep.Column)
 		lineNumber := int(dep.Line)
-		report.AddDependency(detectors.Type(result.Provider), dependencies.Dependency{
-			Group:          dep.Group,
-			Name:           dep.Name,
-			Version:        dep.Version,
-			PackageManager: result.PackageManager,
-		}, source.Source{
-			Language:          file.Language,
-			LanguageType:      file.LanguageTypeString(),
-			Filename:          file.RelativePath,
-			StartColumnNumber: &startColumnNumber,
-			StartLineNumber:   &lineNumber,
-			EndLineNumber:     &lineNumber,
-		})
+		report.AddDependency(
+			detectors.Type(result.Provider),
+			detectors.Language(result.Language),
+			dependencies.Dependency{
+				Group:          dep.Group,
+				Name:           dep.Name,
+				Version:        dep.Version,
+				PackageManager: result.PackageManager,
+			},
+			source.Source{
+				Language:          file.Language,
+				LanguageType:      file.LanguageTypeString(),
+				Filename:          file.RelativePath,
+				StartColumnNumber: &startColumnNumber,
+				StartLineNumber:   &lineNumber,
+				EndLineNumber:     &lineNumber,
+			},
+		)
 	}
 
 	return true, nil