refactor: move result structs under types (#1696)

This commit is contained in:
Teppei Fukuda
2022-02-09 19:31:12 +02:00
committed by GitHub
parent 6db2092c72
commit 11f4f81123
26 changed files with 205 additions and 210 deletions

View File

@@ -12,7 +12,6 @@ import (
ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
dbTypes "github.com/aquasecurity/trivy-db/pkg/types"
"github.com/aquasecurity/trivy-db/pkg/vulnsrc/vulnerability"
"github.com/aquasecurity/trivy/pkg/report"
"github.com/aquasecurity/trivy/pkg/types"
"github.com/aquasecurity/trivy/rpc/common"
"github.com/aquasecurity/trivy/rpc/scanner"
@@ -345,7 +344,7 @@ func TestConvertFromRPCResults(t *testing.T) {
tests := []struct {
name string
args args
want []report.Result
want []types.Result
}{
{
name: "happy path",
@@ -388,7 +387,7 @@ func TestConvertFromRPCResults(t *testing.T) {
},
}},
},
want: []report.Result{
want: []types.Result{
{
Target: "alpine:3.10",
Type: fos.Alpine,
@@ -468,7 +467,7 @@ func TestConvertFromRPCResults(t *testing.T) {
},
}},
},
want: []report.Result{
want: []types.Result{
{
Target: "alpine:3.10",
Type: fos.Alpine,