chore: adopt reviewer comments

vulsio · Jun 28, 2024 · 638ba0c · 638ba0c
1 parent 867f0ed
commit 638ba0c
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 27 deletions.
diff --git a/commands/fetchfortinet.go b/commands/fetchfortinet.go
@@ -7,9 +7,9 @@ import (
 	"github.com/spf13/viper"
 	"golang.org/x/xerrors"
 
-	db "github.com/vulsio/go-cve-dictionary/db"
+	"github.com/vulsio/go-cve-dictionary/db"
 	"github.com/vulsio/go-cve-dictionary/fetcher/fortinet"
-	log "github.com/vulsio/go-cve-dictionary/log"
+	"github.com/vulsio/go-cve-dictionary/log"
 	"github.com/vulsio/go-cve-dictionary/models"
 )
 

diff --git a/commands/fetchjvn.go b/commands/fetchjvn.go
@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/viper"
 	"golang.org/x/xerrors"
 
-	db "github.com/vulsio/go-cve-dictionary/db"
-	log "github.com/vulsio/go-cve-dictionary/log"
+	"github.com/vulsio/go-cve-dictionary/db"
+	"github.com/vulsio/go-cve-dictionary/log"
 	"github.com/vulsio/go-cve-dictionary/models"
 )
 

diff --git a/commands/fetchmitre.go b/commands/fetchmitre.go
@@ -5,10 +5,11 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	db "github.com/vulsio/go-cve-dictionary/db"
-	log "github.com/vulsio/go-cve-dictionary/log"
-	"github.com/vulsio/go-cve-dictionary/models"
 	"golang.org/x/xerrors"
+
+	"github.com/vulsio/go-cve-dictionary/db"
+	"github.com/vulsio/go-cve-dictionary/log"
+	"github.com/vulsio/go-cve-dictionary/models"
 )
 
 var fetchMitreCmd = &cobra.Command{

diff --git a/commands/fetchnvd.go b/commands/fetchnvd.go
@@ -5,10 +5,11 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/xerrors"
+
 	"github.com/vulsio/go-cve-dictionary/db"
-	log "github.com/vulsio/go-cve-dictionary/log"
+	"github.com/vulsio/go-cve-dictionary/log"
 	"github.com/vulsio/go-cve-dictionary/models"
-	"golang.org/x/xerrors"
 )
 
 var fetchNvdCmd = &cobra.Command{

diff --git a/commands/root.go b/commands/root.go
@@ -8,7 +8,8 @@ import (
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	log "github.com/vulsio/go-cve-dictionary/log"
+
+	"github.com/vulsio/go-cve-dictionary/log"
 )
 
 var cfgFile string

diff --git a/commands/server.go b/commands/server.go
@@ -3,11 +3,12 @@ package commands
 import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/xerrors"
+
 	"github.com/vulsio/go-cve-dictionary/db"
-	log "github.com/vulsio/go-cve-dictionary/log"
+	"github.com/vulsio/go-cve-dictionary/log"
 	"github.com/vulsio/go-cve-dictionary/models"
-	server "github.com/vulsio/go-cve-dictionary/server"
-	"golang.org/x/xerrors"
+	"github.com/vulsio/go-cve-dictionary/server"
 )
 
 // serverCmd is Subcommand for CVE dictionary HTTP Server

diff --git a/commands/version.go b/commands/version.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+
 	"github.com/vulsio/go-cve-dictionary/config"
 )
 

diff --git a/fetcher/mitre/mitre.go b/fetcher/mitre/mitre.go
@@ -95,21 +95,17 @@ func Fetch() (string, error) {
 // Convert convert <cacheDir>/<year>/CVE-<year>-\d{4,}.json to []models.Mitre
 func Convert(cacheDir, year string) ([]models.Mitre, error) {
 	var ps []string
-	if err := filepath.WalkDir(cacheDir, func(path string, d fs.DirEntry, err error) error {
+	if err := filepath.WalkDir(filepath.Join(cacheDir, year), func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 		if d.IsDir() {
 			return nil
 		}
-
-		if strings.HasPrefix(filepath.Base(path), fmt.Sprintf("CVE-%s-", year)) {
-			ps = append(ps, path)
-		}
-
+		ps = append(ps, path)
 		return nil
 	}); err != nil {
-		return nil, xerrors.Errorf("Failed to walk %s. err: %w", cacheDir, err)
+		return nil, xerrors.Errorf("Failed to walk %s. err: %w", filepath.Join(cacheDir, year), err)
 	}
 
 	reqChan := make(chan string, len(ps))

diff --git a/fetcher/nvd/nvd.go b/fetcher/nvd/nvd.go
@@ -99,21 +99,17 @@ func Fetch() (string, error) {
 // Convert convert <cacheDir>/<year>/CVE-<year>-\d{4,}.json to []models.Nvd
 func Convert(cacheDir, year string) ([]models.Nvd, error) {
 	var ps []string
-	if err := filepath.WalkDir(cacheDir, func(path string, d fs.DirEntry, err error) error {
+	if err := filepath.WalkDir(filepath.Join(cacheDir, year), func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
 		if d.IsDir() {
 			return nil
 		}
-
-		if strings.HasPrefix(filepath.Base(path), fmt.Sprintf("CVE-%s-", year)) {
-			ps = append(ps, path)
-		}
-
+		ps = append(ps, path)
 		return nil
 	}); err != nil {
-		return nil, xerrors.Errorf("Failed to walk %s. err: %w", cacheDir, err)
+		return nil, xerrors.Errorf("Failed to walk %s. err: %w", filepath.Join(cacheDir, year), err)
 	}
 
 	reqChan := make(chan string, len(ps))
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ import ( @@
     	"fmt"
     	"github.com/spf13/cobra"
     	"github.com/vulsio/go-cve-dictionary/config"
     )
@@ Expand Down @@