continue package if no files found

Author: tomoyamachi

analyzer/pkg/apk/apk.go

@@ -5,6 +5,8 @@ import (
 	"bytes"
 	"log"
 
+	"github.com/pkg/errors"
+
 	"github.com/coreos/clair/ext/versionfmt"
 	clairDpkg "github.com/coreos/clair/ext/versionfmt/dpkg"
 
@@ -20,6 +22,7 @@ type alpinePkgAnalyzer struct{}
 
 func (a alpinePkgAnalyzer) Analyze(fileMap extractor.FileMap) (pkgs []analyzer.Package, err error) {
 	var parsedPkgs []analyzer.Package
+	detected := false
 	for _, filename := range a.RequiredFiles() {
 		file, ok := fileMap[filename]
 		if !ok {
@@ -28,8 +31,12 @@ func (a alpinePkgAnalyzer) Analyze(fileMap extractor.FileMap) (pkgs []analyzer.P
 		scanner := bufio.NewScanner(bytes.NewBuffer(file))
 		parsedPkgs, err = a.parseApkInfo(scanner)
 		pkgs = append(pkgs, parsedPkgs...)
+		detected = true
+	}
+	if !detected {
+		return pkgs, errors.New("No package detected")
 	}
-	return pkgs, err
+	return pkgs, nil
 }
 
 func (a alpinePkgAnalyzer) parseApkInfo(scanner *bufio.Scanner) (pkgs []analyzer.Package, err error) {

analyzer/pkg/dpkg/dpkg.go

@@ -3,6 +3,8 @@ package dpkg
 import (
 	"bufio"
 	"bytes"
+	"errors"
+	"fmt"
 	"log"
 	"regexp"
 	"strings"
@@ -28,15 +30,21 @@ func init() {
 type debianPkgAnalyzer struct{}
 
 func (a debianPkgAnalyzer) Analyze(fileMap extractor.FileMap) (pkgs []analyzer.Package, err error) {
+	detected := false
 	for _, filename := range a.RequiredFiles() {
 		file, ok := fileMap[filename]
+		fmt.Println(filename)
 		if !ok {
 			continue
 		}
 		scanner := bufio.NewScanner(bytes.NewBuffer(file))
 		pkgs = a.parseDpkginfo(scanner)
+		detected = true
 	}
-	return pkgs, err
+	if !detected {
+		return pkgs, errors.New("No package detected")
+	}
+	return pkgs, nil
 }
 
 func (a debianPkgAnalyzer) parseDpkginfo(scanner *bufio.Scanner) (pkgs []analyzer.Package) {
@@ -88,6 +96,7 @@ func (a debianPkgAnalyzer) parseDpkgPkg(scanner *bufio.Scanner) (binPkg *analyze
 		if line == "" {
 			break
 		}
+		fmt.Println(line)
 
 		if strings.HasPrefix(line, "Package: ") {
 			name = strings.TrimSpace(strings.TrimPrefix(line, "Package: "))

analyzer/pkg/rpm/rpm.go

@@ -2,6 +2,7 @@ package rpm
 
 import (
 	"bufio"
+	"errors"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -22,13 +23,18 @@ type rpmPkgAnalyzer struct{}
 
 func (a rpmPkgAnalyzer) Analyze(fileMap extractor.FileMap) (pkgs []analyzer.Package, err error) {
 	var parsedPkgs []analyzer.Package
+	detected := false
 	for _, filename := range a.RequiredFiles() {
 		file, ok := fileMap[filename]
 		if !ok {
 			continue
 		}
 		parsedPkgs, err = a.parsePkgInfo(file)
 		pkgs = append(pkgs, parsedPkgs...)
+		detected = true
+	}
+	if !detected {
+		return pkgs, errors.New("No package detected")
 	}
 	return pkgs, err
 }