gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-23 07:29:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

feat: prepare for config scanning (#1005)

Browse Source 
* temp: disable config scanning
This commit is contained in:
Teppei Fukuda
2021-05-20 09:05:36 +03:00
committed by GitHub
parent 8fc6ea6489
commit 1b66b77f69
77 changed files with 2212 additions and 2341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/commands/server/config_test.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
"github.com/aquasecurity/trivy/pkg/commands/config"
"github.com/aquasecurity/trivy/pkg/commands/option"
"github.com/aquasecurity/trivy/pkg/commands/server"
)
@@ -22,10 +22,10 @@ func TestNew(t *testing.T) {
name: "happy path",
args: []string{"-quiet", "--no-progress", "--reset", "--skip-update", "--listen", "localhost:8080"},
want: server.Config{
GlobalConfig: config.GlobalConfig{
GlobalOption: option.GlobalOption{
Quiet: true,
},
DBConfig: config.DBConfig{
DBOption: option.DBOption{
Reset: true,
SkipUpdate: true,
NoProgress: true,
@@ -47,11 +47,11 @@ func TestNew(t *testing.T) {
ctx := cli.NewContext(app, set, nil)
_ = set.Parse(tt.args)
tt.want.GlobalConfig.Context = ctx
tt.want.GlobalOption.Context = ctx
got := server.NewConfig(ctx)
assert.Equal(t, tt.want.GlobalConfig.Quiet, got.Quiet, tt.name)
assert.Equal(t, tt.want.DBConfig, got.DBConfig, tt.name)
assert.Equal(t, tt.want.GlobalOption.Quiet, got.Quiet, tt.name)
assert.Equal(t, tt.want.DBOption, got.DBOption, tt.name)
assert.Equal(t, tt.want.Listen, got.Listen, tt.name)
})
}
@@ -60,8 +60,8 @@ func TestNew(t *testing.T) {
func TestConfig_Init(t *testing.T) {
tests := []struct {
name string
globalConfig config.GlobalConfig
dbConfig config.DBConfig
globalConfig option.GlobalOption
dbConfig option.DBOption
args []string
wantErr string
}{
@@ -71,14 +71,14 @@ func TestConfig_Init(t *testing.T) {
},
{
name: "happy path: reset",
dbConfig: config.DBConfig{
dbConfig: option.DBOption{
Reset: true,
},
args: []string{"alpine:3.10"},
},
{
name: "sad: skip and download db",
dbConfig: config.DBConfig{
dbConfig: option.DBOption{
SkipUpdate: true,
DownloadDBOnly: true,
},
@@ -89,7 +89,7 @@ func TestConfig_Init(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := &server.Config{
DBConfig: tt.dbConfig,
DBOption: tt.dbConfig,
}
err := c.Init()