From ead8d89d2db99c4de7b9e038e67842b64b076498 Mon Sep 17 00:00:00 2001 From: liruichen Date: Mon, 28 Aug 2023 10:31:52 +0800 Subject: [PATCH] feat: go module change --- cmd/build.go | 2 +- cmd/install.go | 2 +- cmd/merge.go | 2 +- cmd/profile.go | 2 +- cmd/root.go | 2 +- cmd/run.go | 2 +- cmd/server.go | 6 +++--- cmd/service.go | 2 +- cmd/watch.go | 2 +- go.mod | 2 +- main.go | 2 +- pkg/build/build.go | 3 +-- pkg/build/build_flags.go | 2 +- pkg/build/goenv.go | 2 +- pkg/build/inject.go | 22 +++++++++++----------- pkg/build/install.go | 2 +- pkg/build/internal/tool/cover.go | 4 ++-- pkg/build/internal/websocket/wsdep.go | 2 +- pkg/build/run.go | 6 +++--- pkg/build/tmpfolder.go | 2 +- pkg/client/agent.go | 4 ++-- pkg/client/client.go | 2 +- pkg/client/profie.go | 6 +++--- pkg/client/rest/client.go | 4 ++-- pkg/server/api.go | 2 +- pkg/server/rpcstream.go | 2 +- pkg/server/server.go | 4 ++-- pkg/server/watchstream.go | 2 +- pkg/watch/watch.go | 2 +- 29 files changed, 49 insertions(+), 50 deletions(-) diff --git a/cmd/build.go b/cmd/build.go index 0b0d72d..88f2aa7 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/build" + "github.com/RickLeee/goc/v2/pkg/build" "github.com/spf13/cobra" ) diff --git a/cmd/install.go b/cmd/install.go index 662d744..4bb878b 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/build" + "github.com/RickLeee/goc/v2/pkg/build" "github.com/spf13/cobra" ) diff --git a/cmd/merge.go b/cmd/merge.go index 323b7c6..1431506 100644 --- a/cmd/merge.go +++ b/cmd/merge.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/spf13/cobra" "golang.org/x/tools/cover" "k8s.io/test-infra/gopherage/pkg/cov" diff --git a/cmd/profile.go b/cmd/profile.go index aac0092..5c61eeb 100644 --- a/cmd/profile.go +++ b/cmd/profile.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/client" + "github.com/RickLeee/goc/v2/pkg/client" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/root.go b/cmd/root.go index 56ba899..d7d972c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/run.go b/cmd/run.go index 68009d7..85f9bf2 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/build" + "github.com/RickLeee/goc/v2/pkg/build" "github.com/spf13/cobra" ) diff --git a/cmd/server.go b/cmd/server.go index 1d575ee..811e40a 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -14,9 +14,9 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/log" - "github.com/qiniu/goc/v2/pkg/server" - "github.com/qiniu/goc/v2/pkg/server/store" + "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/server" + "github.com/RickLeee/goc/v2/pkg/server/store" "github.com/spf13/cobra" ) diff --git a/cmd/service.go b/cmd/service.go index 677cd87..b54ffc1 100644 --- a/cmd/service.go +++ b/cmd/service.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/qiniu/goc/v2/pkg/client" + "github.com/RickLeee/goc/v2/pkg/client" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/watch.go b/cmd/watch.go index 0138900..3d2613a 100644 --- a/cmd/watch.go +++ b/cmd/watch.go @@ -14,7 +14,7 @@ package cmd import ( - cli "github.com/qiniu/goc/v2/pkg/watch" + cli "github.com/RickLeee/goc/v2/pkg/watch" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 60f5f4f..8a638da 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/qiniu/goc/v2 +module github.com/RickLeee/goc/v2 go 1.16 diff --git a/main.go b/main.go index 252d2e6..b0b06b0 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ package main import ( - "github.com/qiniu/goc/v2/cmd" + "github.com/RickLeee/goc/v2/cmd" ) func main() { diff --git a/pkg/build/build.go b/pkg/build/build.go index eece0d2..ea48214 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -18,7 +18,7 @@ import ( "os/exec" "strings" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/spf13/pflag" ) @@ -53,7 +53,6 @@ type Build struct { } // NewBuild creates a Build struct -// func NewBuild(opts ...gocOption) *Build { b := &Build{} diff --git a/pkg/build/build_flags.go b/pkg/build/build_flags.go index 3f41940..d53fea1 100644 --- a/pkg/build/build_flags.go +++ b/pkg/build/build_flags.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/build/goenv.go b/pkg/build/goenv.go index 8ad16a3..61a0d9e 100644 --- a/pkg/build/goenv.go +++ b/pkg/build/goenv.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" ) // readProjectMetaInfo reads all meta informations of the corresponding project diff --git a/pkg/build/inject.go b/pkg/build/inject.go index 8c00b30..8d60de4 100644 --- a/pkg/build/inject.go +++ b/pkg/build/inject.go @@ -19,9 +19,9 @@ import ( "path" "path/filepath" - "github.com/qiniu/goc/v2/pkg/build/internal/tool" - "github.com/qiniu/goc/v2/pkg/build/internal/websocket" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/build/internal/tool" + "github.com/RickLeee/goc/v2/pkg/build/internal/websocket" + "github.com/RickLeee/goc/v2/pkg/log" ) // Inject injects cover variables for all the .go files in the target directory @@ -127,14 +127,14 @@ func (b *Build) getPkgTmpDir(pkgDir string) string { // injectGocAgent inject handlers like following // -// - xxx.go -// - yyy_package -// - main.go -// - goc-cover-agent-apis-auto-generated-11111-22222-bridge.go -// - goc-cover-agent-apis-auto-generated-11111-22222-package -// | -// -- rpcagent.go -// -- watchagent.go +// - xxx.go +// - yyy_package +// - main.go +// - goc-cover-agent-apis-auto-generated-11111-22222-bridge.go +// - goc-cover-agent-apis-auto-generated-11111-22222-package +// | +// -- rpcagent.go +// -- watchagent.go // // 11111_22222_bridge.go 仅仅用于引用 11111_22222_package, where package contains ws agent main logic. // 使用 bridge.go 文件是为了避免插桩逻辑中的变量名污染 main 包 diff --git a/pkg/build/install.go b/pkg/build/install.go index 9a81729..2380749 100644 --- a/pkg/build/install.go +++ b/pkg/build/install.go @@ -17,7 +17,7 @@ import ( "os" "os/exec" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" ) func NewInstall(opts ...gocOption) *Build { diff --git a/pkg/build/internal/tool/cover.go b/pkg/build/internal/tool/cover.go index 53a186a..5ae6917 100644 --- a/pkg/build/internal/tool/cover.go +++ b/pkg/build/internal/tool/cover.go @@ -18,7 +18,7 @@ import ( "os" "sort" - "github.com/qiniu/goc/v2/pkg/log" // QINIU + "github.com/RickLeee/goc/v2/pkg/log" // QINIU // "cmd/internal/edit" // "cmd/internal/objabi" ) @@ -437,7 +437,7 @@ func (f *File) newCounter(start, end token.Pos, numStmt int) string { // S1 // if cond { // S2 -// } +// } // S3 // // counters will be added before S1 and before S3. The block containing S2 diff --git a/pkg/build/internal/websocket/wsdep.go b/pkg/build/internal/websocket/wsdep.go index ff8734b..d856f22 100644 --- a/pkg/build/internal/websocket/wsdep.go +++ b/pkg/build/internal/websocket/wsdep.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" ) //go:embed websocket.tar diff --git a/pkg/build/run.go b/pkg/build/run.go index 7bcf898..c61bc6e 100644 --- a/pkg/build/run.go +++ b/pkg/build/run.go @@ -18,10 +18,10 @@ import ( "os/exec" "os/signal" + "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/server" + "github.com/RickLeee/goc/v2/pkg/server/store" "github.com/gin-gonic/gin" - "github.com/qiniu/goc/v2/pkg/log" - "github.com/qiniu/goc/v2/pkg/server" - "github.com/qiniu/goc/v2/pkg/server/store" ) func NewRun(opts ...gocOption) *Build { diff --git a/pkg/build/tmpfolder.go b/pkg/build/tmpfolder.go index 4f4d137..6f04e46 100644 --- a/pkg/build/tmpfolder.go +++ b/pkg/build/tmpfolder.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/tongjingran/copy" "golang.org/x/mod/modfile" ) diff --git a/pkg/client/agent.go b/pkg/client/agent.go index 58c3dfe..23414a4 100644 --- a/pkg/client/agent.go +++ b/pkg/client/agent.go @@ -16,9 +16,9 @@ package client import ( "os" + "github.com/RickLeee/goc/v2/pkg/client/rest" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/olekukonko/tablewriter" - "github.com/qiniu/goc/v2/pkg/client/rest" - "github.com/qiniu/goc/v2/pkg/log" ) const ( diff --git a/pkg/client/client.go b/pkg/client/client.go index 7deafb0..9a327fa 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -27,8 +27,8 @@ import ( "golang.org/x/term" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/olekukonko/tablewriter" - "github.com/qiniu/goc/v2/pkg/log" ) // Action provides methods to contact with the covered agent under test diff --git a/pkg/client/profie.go b/pkg/client/profie.go index 3c9eccd..ede2130 100644 --- a/pkg/client/profie.go +++ b/pkg/client/profie.go @@ -20,9 +20,9 @@ import ( "os" "path/filepath" - "github.com/qiniu/goc/v2/pkg/client/rest" - "github.com/qiniu/goc/v2/pkg/client/rest/profile" - "github.com/qiniu/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/client/rest" + "github.com/RickLeee/goc/v2/pkg/client/rest/profile" + "github.com/RickLeee/goc/v2/pkg/log" ) func GetProfile(host string, ids []string, skips []string, extra string, output string, need []string) { diff --git a/pkg/client/rest/client.go b/pkg/client/rest/client.go index 8f676d3..e3bf5a1 100644 --- a/pkg/client/rest/client.go +++ b/pkg/client/rest/client.go @@ -14,9 +14,9 @@ package rest import ( + "github.com/RickLeee/goc/v2/pkg/client/rest/agent" + "github.com/RickLeee/goc/v2/pkg/client/rest/profile" "github.com/go-resty/resty/v2" - "github.com/qiniu/goc/v2/pkg/client/rest/agent" - "github.com/qiniu/goc/v2/pkg/client/rest/profile" ) // V2Client provides methods contact with the covered agent under test diff --git a/pkg/server/api.go b/pkg/server/api.go index 13d3312..8cd2d31 100644 --- a/pkg/server/api.go +++ b/pkg/server/api.go @@ -22,8 +22,8 @@ import ( "sync" "time" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/gin-gonic/gin" - "github.com/qiniu/goc/v2/pkg/log" "golang.org/x/tools/cover" "k8s.io/test-infra/gopherage/pkg/cov" ) diff --git a/pkg/server/rpcstream.go b/pkg/server/rpcstream.go index f916cc0..3827914 100644 --- a/pkg/server/rpcstream.go +++ b/pkg/server/rpcstream.go @@ -22,8 +22,8 @@ import ( "sync" "time" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/gin-gonic/gin" - "github.com/qiniu/goc/v2/pkg/log" ) // serveRpcStream holds connection between goc server and agent. diff --git a/pkg/server/server.go b/pkg/server/server.go index 0fec04b..b8a635e 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" + "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc/v2/pkg/server/store" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/qiniu/goc/v2/pkg/log" - "github.com/qiniu/goc/v2/pkg/server/store" ) // gocServer represents a goc server diff --git a/pkg/server/watchstream.go b/pkg/server/watchstream.go index 5af9ee1..1084925 100644 --- a/pkg/server/watchstream.go +++ b/pkg/server/watchstream.go @@ -18,9 +18,9 @@ import ( "sync" "time" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/qiniu/goc/v2/pkg/log" ) func (gs *gocServer) serveWatchInternalStream(c *gin.Context) { diff --git a/pkg/watch/watch.go b/pkg/watch/watch.go index 07318e2..e306993 100644 --- a/pkg/watch/watch.go +++ b/pkg/watch/watch.go @@ -16,8 +16,8 @@ package watch import ( "fmt" + "github.com/RickLeee/goc/v2/pkg/log" "github.com/gorilla/websocket" - "github.com/qiniu/goc/v2/pkg/log" ) func Watch(host string) {