更新standard-adapter工具框架版本到0.0.29

TencentBlueKing · Dec 1, 2023 · f7e7a46 · f7e7a46
1 parent 6f0217c
commit f7e7a46
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/standard-adapter/go.mod b/standard-adapter/go.mod
@@ -2,7 +2,7 @@ module github.com/TencentBlueKing/ci-repoAnalysis/standard-adapter
 
 go 1.21.0
 
-require github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.28
+require github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.29
 
 require (
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

diff --git a/standard-adapter/go.sum b/standard-adapter/go.sum
@@ -1,5 +1,5 @@
-github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.28 h1:XLPkvJYWpLExlLowXdlY1SAYsiGmqEqb21MfXHF57tg=
-github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.28/go.mod h1:gaNOplWKoBM1MBtwllE4y/x1UfXdvlBgLUrECkdnLPE=
+github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.29 h1:ElglKqgntisGcj+RKJkNIdT25p9wjMmFB1d+C0O31xk=
+github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang v0.0.29/go.mod h1:gaNOplWKoBM1MBtwllE4y/x1UfXdvlBgLUrECkdnLPE=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=

diff --git a/standard-adapter/pkg/adapter.go b/standard-adapter/pkg/adapter.go
@@ -1,6 +1,7 @@
 package pkg
 
 import (
+	"context"
 	"encoding/json"
 	"github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang/api"
 	"github.com/TencentBlueKing/ci-repoAnalysis/analysis-tool-sdk-golang/object"
@@ -16,7 +17,11 @@ type StandardAdapterExecutor struct {
 }
 
 // Execute 执行扫描
-func (e StandardAdapterExecutor) Execute(_ *object.ToolConfig, file *os.File) (*object.ToolOutput, error) {
+func (e StandardAdapterExecutor) Execute(
+	ctx context.Context,
+	_ *object.ToolConfig,
+	file *os.File,
+) (*object.ToolOutput, error) {
 	// 将toolInput写入/bkrepo/workspace/input.json
 	toolInput := api.GetClient(object.GetArgs()).ToolInput
 	newToolInput := &object.ToolInput{
@@ -41,7 +46,7 @@ func (e StandardAdapterExecutor) Execute(_ *object.ToolConfig, file *os.File) (*
 		args = append(args, splitCmd[1:]...)
 	}
 	args = append(args, "--input", toolInputFile, "--output", toolOutputFile)
-	err := util.ExecAndLog(cmd, args, e.WorkDir)
+	err := util.ExecAndLog(ctx, cmd, args, e.WorkDir)
 	if err != nil {
 		return nil, err
 	}