mirror of
https://github.com/aquasecurity/trivy.git
synced 2025-12-22 23:26:39 -08:00
Use StoreMetadata from trivy-db (#509)
* db_test: Remove cruft Signed-off-by: Simarpreet Singh <simar@linux.com> * db: Add StoreMetadata from trivy-db. Signed-off-by: Simarpreet Singh <simar@linux.com> * mod: Update trivy-db dependency Signed-off-by: Simarpreet Singh <simar@linux.com> * mod: Bump trivy-db version Signed-off-by: Simarpreet Singh <simar@linux.com> * db: Eliminate metadata.Store Signed-off-by: Simarpreet Singh <simar@linux.com> * db: Add a TODO to move things into trivy-db repo Signed-off-by: Simarpreet Singh <simar@linux.com>
This commit is contained in:
@@ -2,6 +2,7 @@ package internal
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@@ -10,7 +11,6 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
dbFile "github.com/aquasecurity/trivy/pkg/db"
|
||||
"github.com/spf13/afero"
|
||||
|
||||
"github.com/aquasecurity/trivy-db/pkg/db"
|
||||
@@ -87,17 +87,20 @@ Vulnerability DB:
|
||||
}
|
||||
|
||||
if tt.createDB {
|
||||
m := dbFile.NewMetadata(afero.NewOsFs(), cacheDir)
|
||||
fs := afero.NewOsFs()
|
||||
err := os.MkdirAll(filepath.Join(cacheDir, "db"), os.ModePerm)
|
||||
require.NoError(t, err)
|
||||
metadataFile := filepath.Join(cacheDir, "db", "metadata.json")
|
||||
|
||||
err = m.Store(db.Metadata{
|
||||
b, err := json.Marshal(db.Metadata{
|
||||
Version: 42,
|
||||
Type: 1,
|
||||
NextUpdate: time.Unix(1584403020, 0),
|
||||
UpdatedAt: time.Unix(1584402020, 0),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
err = afero.WriteFile(fs, metadataFile, b, 0600)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
fw := new(bytes.Buffer)
|
||||
|
||||
Reference in New Issue
Block a user