Undo added 'vuls scan' options

Author: shino

GNUmakefile

@@ -171,7 +171,7 @@ endif
 
 	mkdir -p ${ONE_SEC_AFTER_JSON_DIR}
 	sleep 1
-	./vuls.new scan -trivy-cachedb-dir=./integration/data/trivy-cache -trivy-skip-java-db-update -config=./integration/int-config.toml --results-dir=${BASE_DIR} ${LIBS}
+	./vuls.new scan -config=./integration/int-config.toml --results-dir=${BASE_DIR} ${LIBS}
 	cp -f ${BASE_DIR}/$(CURRENT)/*.json ${ONE_SEC_AFTER_JSON_DIR}
 	cp integration/data/results/*.json ${ONE_SEC_AFTER_JSON_DIR}
 	./vuls.new report --format-json --refresh-cve --results-dir=${BASE_DIR} -config=./integration/int-redis-config.toml ${ONE_SEC_AFTER}

config/config.go

@@ -29,10 +29,9 @@ type Config struct {
 	logging.LogOpts
 
 	// scan, report
-	HTTPProxy       string `valid:"url" json:"httpProxy,omitempty"`
-	ResultsDir      string `json:"resultsDir,omitempty"`
-	Pipe            bool   `json:"pipe,omitempty"`
-	TrivyCacheDBDir string `json:"trivyCacheDBDir,omitempty"`
+	HTTPProxy  string `valid:"url" json:"httpProxy,omitempty"`
+	ResultsDir string `json:"resultsDir,omitempty"`
+	Pipe       bool   `json:"pipe,omitempty"`
 
 	Default ServerInfo            `json:"default,omitempty"`
 	Servers map[string]ServerInfo `json:"servers,omitempty"`
@@ -79,6 +78,7 @@ type ScanOpts struct {
 type ReportOpts struct {
 	CvssScoreOver       float64 `json:"cvssScoreOver,omitempty"`
 	ConfidenceScoreOver int     `json:"confidenceScoreOver,omitempty"`
+	TrivyCacheDBDir     string  `json:"trivyCacheDBDir,omitempty"`
 	NoProgress          bool    `json:"noProgress,omitempty"`
 	RefreshCve          bool    `json:"refreshCve,omitempty"`
 	IgnoreUnfixed       bool    `json:"ignoreUnfixed,omitempty"`

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/aquasecurity/go-dep-parser v0.0.0-20231120074854-8322cc2242bf
 	github.com/aquasecurity/trivy v0.48.0
 	github.com/aquasecurity/trivy-db v0.0.0-20231005141211-4fc651f7ac8d
-	github.com/aquasecurity/trivy-java-db v0.0.0-20230209231723-7cddb1406728
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
 	github.com/aws/aws-sdk-go v1.48.4
 	github.com/c-robinson/iplib v1.0.7
@@ -108,6 +107,7 @@ require (
 	github.com/aquasecurity/go-pep440-version v0.0.0-20210121094942-22b2f8951d46 // indirect
 	github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492 // indirect
 	github.com/aquasecurity/trivy-iac v0.7.0 // indirect
+	github.com/aquasecurity/trivy-java-db v0.0.0-20230209231723-7cddb1406728 // indirect
 	github.com/aquasecurity/trivy-policies v0.6.1-0.20231120231532-f6f2330bf842 // indirect
 	github.com/aws/aws-sdk-go-v2 v1.22.1 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.18.45 // indirect

scanner/base.go

@@ -641,8 +641,7 @@ func (l *base) scanLibraries() (err error) {
 	l.log.Info("Scanning Language-specific Packages...")
 
 	if err := trivyInitOnce(); err != nil {
-		logging.Log.Errorf("Trivy init error: %+v", err)
-		return err
+		return xerrors.Errorf("Failed to initialize Trivy. err: %w", err)
 	}
 
 	found := map[string]bool{}

subcmds/scan.go

@@ -44,9 +44,6 @@ func (*ScanCmd) Usage() string {
 		[-log-to-file]
 		[-log-dir=/path/to/log]
 		[-cachedb-path=/path/to/cache.db]
-                [-trivy-cachedb-dir=/path/to/dir]
-                [-trivy-java-db-repository=ghcr.io/aquasecurity/trivy-java-db]
-                [-trivy-skip-java-db-update]
 		[-http-proxy=http://192.168.0.1:8080]
 		[-timeout=300]
 		[-timeout-scan=7200]