From 11bc00d629d513ad29b8cf8e79b0dfafe4352200 Mon Sep 17 00:00:00 2001
From: Teppei Fukuda <knqyf263@gmail.com>
Date: Mon, 12 Aug 2019 20:33:26 -1000
Subject: [PATCH] Revert "Allow user specified cache directory (#12)" (#111)

This reverts commit 2d512c5e47562ba2a12c277d75d9fe177e32ce16.
---
 cmd/trivy/main.go  |  4 ----
 pkg/db/db.go       |  5 ++---
 pkg/run.go         |  6 ------
 pkg/utils/utils.go | 15 +++------------
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/cmd/trivy/main.go b/cmd/trivy/main.go
index 529f34f1ac..a51ad37042 100644
--- a/cmd/trivy/main.go
+++ b/cmd/trivy/main.go
@@ -101,10 +101,6 @@ OPTIONS:
 			Name:  "debug, d",
 			Usage: "debug mode",
 		},
-		cli.StringFlag{
-			Name:  "cache-dir",
-			Usage: "cache directory",
-		},
 		cli.StringFlag{
 			Name:  "vuln-type",
 			Value: "os,library",
diff --git a/pkg/db/db.go b/pkg/db/db.go
index 00554355ed..1137af0b25 100644
--- a/pkg/db/db.go
+++ b/pkg/db/db.go
@@ -15,11 +15,11 @@ import (
 )
 
 var (
-	db *bolt.DB
+	db    *bolt.DB
+	dbDir = filepath.Join(utils.CacheDir(), "db")
 )
 
 func Init() (err error) {
-	dbDir := filepath.Join(utils.CacheDir(), "db")
 	if err = os.MkdirAll(dbDir, 0700); err != nil {
 		return xerrors.Errorf("failed to mkdir: %w", err)
 	}
@@ -45,7 +45,6 @@ func Reset() error {
 		return xerrors.Errorf("failed to reset DB: %w", err)
 	}
 
-	dbDir := filepath.Join(utils.CacheDir(), "db")
 	if err := os.RemoveAll(dbDir); err != nil {
 		return xerrors.Errorf("failed to reset DB: %w", err)
 	}
diff --git a/pkg/run.go b/pkg/run.go
index 4255799900..92e0af66ff 100644
--- a/pkg/run.go
+++ b/pkg/run.go
@@ -27,12 +27,6 @@ func Run(c *cli.Context) (err error) {
 	if err = log.InitLogger(debug); err != nil {
 		l.Fatal(err)
 	}
-
-	cacheDir := c.String("cache-dir")
-	if cacheDir != "" {
-		utils.SetCacheDir(cacheDir)
-	}
-
 	log.Logger.Debugf("cache dir:  %s", utils.CacheDir())
 
 	reset := c.Bool("reset")
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index 2e31e926c5..0ff3d57f84 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -12,24 +12,15 @@ import (
 	"golang.org/x/xerrors"
 )
 
-var cacheDir string
-
 func CacheDir() string {
-	if cacheDir == "" {
-		var err error
-		cacheDir, err = os.UserCacheDir()
-		if err != nil {
-			cacheDir = os.TempDir()
-		}
+	cacheDir, err := os.UserCacheDir()
+	if err != nil {
+		cacheDir = os.TempDir()
 	}
 	dir := filepath.Join(cacheDir, "trivy")
 	return dir
 }
 
-func SetCacheDir(cd string) {
-	cacheDir = cd
-}
-
 func FileWalk(root string, targetFiles map[string]struct{}, walkFn func(r io.Reader, path string) error) error {
 	err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
 		if info.IsDir() {