更改trivy工具包结构

TencentBlueKing · Mar 22, 2023 · 4108f94 · 4108f94
1 parent 80e02cf
commit 4108f94
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@
 
 [trivy使用文档](https://github.com/TencentBlueKing/ci-repoAnalysis/tree/master/trivy)
 
+[dependency-check使用文档](https://github.com/TencentBlueKing/ci-repoAnalysis/tree/master/dependency-check)
+
 ### 接入新的工具
 
 工具接入参考[开发文档](https://github.com/TencentBlueKing/ci-repoAnalysis/tree/master/docs/development.md)

diff --git a/trivy/cmd/main.go b/trivy/cmd/main.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang/framework"
-	"github.com/TencentBlueKing/ci-repoAnalysis/trivy/cmd"
+	"github.com/TencentBlueKing/ci-repoAnalysis/trivy/pkg"
 )
 
 func main() {
-	framework.Analyze(cmd.TrivyExecutor{})
+	framework.Analyze(pkg.TrivyExecutor{})
 }
diff --git a/trivy/go.mod b/trivy/go.mod
@@ -2,4 +2,4 @@ module github.com/TencentBlueKing/ci-repoAnalysis/trivy
 
 go 1.18
 
-require github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.11
+require github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.12
diff --git a/trivy/go.sum b/trivy/go.sum
@@ -1,2 +1,2 @@
-github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.11 h1:Y1kw75IWG/cLgx154SRSnZ6sWUlpQTnr4bUqMV/YeqI=
-github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.11/go.mod h1:8fgb+y0YWqULX/oVg4dsWAq6ftsVZfFrXQjCKXwAE1Q=
+github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.12 h1:Pb8Y0QqLJ2Z0ZI4oN7hdh3yXROdIOD6ZXTwuIB+IOZ8=
+github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.12/go.mod h1:8fgb+y0YWqULX/oVg4dsWAq6ftsVZfFrXQjCKXwAE1Q=
diff --git a/trivy/constant/trivy.go → trivy/pkg/constant/trivy.go b/trivy/constant/trivy.go → trivy/pkg/constant/trivy.go
diff --git a/trivy/cmd/output.go → trivy/pkg/output.go b/trivy/cmd/output.go → trivy/pkg/output.go
@@ -1,8 +1,8 @@
-package cmd
+package pkg
 
 import (
 	"github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang/object"
-	"github.com/TencentBlueKing/ci-repoAnalysis/trivy/constant"
+	"github.com/TencentBlueKing/ci-repoAnalysis/trivy/pkg/constant"
 	"strings"
 	"time"
 )

diff --git a/trivy/cmd/scan_executor.go → trivy/pkg/scan_executor.go b/trivy/cmd/scan_executor.go → trivy/pkg/scan_executor.go
@@ -1,4 +1,4 @@
-package cmd
+package pkg
 
 import (
 	"archive/tar"
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang/object"
 	"github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang/util"
-	"github.com/TencentBlueKing/ci-repoAnalysis/trivy/constant"
+	"github.com/TencentBlueKing/ci-repoAnalysis/trivy/pkg/constant"
 	"io"
 	"net/http"
 	"os"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module github.com/TencentBlueKing/ci-repoAnalysis/trivy

		go 1.18

		require github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.11
		require github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.12